X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=setup.py;h=42cbaf8588381f1f2a6fb9c42c523541e884f4da;hb=d055fe4cb09dc18a368f40f73e77081e7b0127bf;hp=1d2e71e15fb24d6ae5a79d8cee2ebfcbfad6c3fb;hpb=a3522dfddd333ce14f9603ab43c58e9ae204adbb;p=youtube-dl

diff --git a/setup.py b/setup.py
index 1d2e71e15..42cbaf858 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
 
 from __future__ import print_function
 
-from glob import glob
 import pkg_resources
 import sys
 
@@ -13,8 +12,9 @@ except ImportError:
     from distutils.core import setup
 
 try:
+    # This will create an exe that needs Microsoft Visual C++ 2008
+    # Redistributable Package
     import py2exe
-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)
@@ -26,16 +26,16 @@ py2exe_options = {
     "optimize": 2,
     "dist_dir": '.',
     "dll_excludes": ['w9xpopen.exe'],
-    "includes": [m.replace('\\', '.').replace('/', '.')[:-3]
-                 for m in glob('youtube_dl/*/*.py')]
 }
+
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
+
 py2exe_params = {
     'console': py2exe_console,
-    'options': { "py2exe": py2exe_options },
+    'options': {"py2exe": py2exe_options},
     'zipfile': None
 }
 
@@ -44,13 +44,16 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
 else:
     params = {
         'scripts': ['bin/youtube-dl'],
-        'data_files': [('etc/bash_completion.d', ['youtube-dl.bash-completion']), # Installing system-wide would require sudo...
-                       ('share/doc/youtube_dl', ['README.txt']),
-                       ('share/man/man1/', ['youtube-dl.1'])]
+        'data_files': [  # Installing system-wide would require sudo...
+            ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
+            ('share/doc/youtube_dl', ['README.txt']),
+            ('share/man/man1/', ['youtube-dl.1'])
+        ]
     }
 
 # Get the version from youtube_dl/version.py without importing the package
-exec(compile(open('youtube_dl/version.py').read(), 'youtube_dl/version.py', 'exec'))
+exec(compile(open('youtube_dl/version.py').read(),
+             'youtube_dl/version.py', 'exec'))
 
 setup(
     name = 'youtube_dl',