Explorar el Código

Move postprocessor into its own package

Philipp Hagemeister hace 11 años
padre
commit
56327689a2
Se han modificado 4 ficheros con 9 adiciones y 7 borrados
  1. 4 1
      setup.py
  2. 1 1
      youtube_dl/YoutubeDL.py
  3. 1 1
      youtube_dl/__init__.py
  4. 3 4
      youtube_dl/postprocessor/__init__.py

+ 4 - 1
setup.py

@@ -71,7 +71,10 @@ setup(
     author_email='ytdl@yt-dl.org',
     maintainer='Philipp Hagemeister',
     maintainer_email='phihag@phihag.de',
-    packages=['youtube_dl', 'youtube_dl.extractor', 'youtube_dl.downloader'],
+    packages=[
+        'youtube_dl',
+        'youtube_dl.extractor', 'youtube_dl.downloader',
+        'youtube_dl.postprocessor'],
 
     # Provokes warning on most systems (why?!)
     # test_suite = 'nose.collector',

+ 1 - 1
youtube_dl/YoutubeDL.py

@@ -55,7 +55,7 @@ from .utils import (
 )
 from .extractor import get_info_extractor, gen_extractors
 from .downloader import get_suitable_downloader
-from .PostProcessor import FFmpegMergerPP
+from .postprocessor import FFmpegMergerPP
 from .version import __version__
 
 

+ 1 - 1
youtube_dl/__init__.py

@@ -75,7 +75,7 @@ from .FileDownloader import (
 from .extractor import gen_extractors
 from .version import __version__
 from .YoutubeDL import YoutubeDL
-from .PostProcessor import (
+from .postprocessor import (
     FFmpegMetadataPP,
     FFmpegVideoConvertor,
     FFmpegExtractAudioPP,

+ 3 - 4
youtube_dl/PostProcessor.py → youtube_dl/postprocessor/__init__.py

@@ -4,13 +4,14 @@ import sys
 import time
 
 
-from .utils import (
+from ..utils import (
     compat_subprocess_get_DEVNULL,
     encodeFilename,
+    hyphenate_date,
     PostProcessingError,
+    prepend_extension,
     shell_quote,
     subtitles_filename,
-    prepend_extension,
 )
 
 
@@ -540,8 +541,6 @@ class XAttrMetadataPP(PostProcessor):
     def run(self, info):
         """ Set extended attributes on downloaded file (if xattr support is found). """
 
-        from .utils import hyphenate_date
-
         # This mess below finds the best xattr tool for the job and creates a
         # "write_xattr" function.
         try: