Run isort

* In `extractors/extractor.py`, youtube extractors are moved to top

Author: pukkandan

devscripts/bash-completion.py

@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 import os
-from os.path import dirname as dirn
 import sys
+from os.path import dirname as dirn
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl

devscripts/buildserver.py

@@ -3,18 +3,18 @@
 import argparse
 import ctypes
 import functools
+import os.path
 import shutil
 import subprocess
 import sys
 import tempfile
 import threading
 import traceback
-import os.path
 
 sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
 from youtube_dl.compat import (
-    compat_input,
     compat_http_server,
+    compat_input,
     compat_str,
     compat_urlparse,
 )

devscripts/check-porn.py

@@ -12,11 +12,11 @@
 # Allow direct execution
 import os
 import sys
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases
-from youtube_dl.utils import compat_urllib_parse_urlparse
-from youtube_dl.utils import compat_urllib_request
+from youtube_dl.utils import compat_urllib_parse_urlparse, compat_urllib_request
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'

devscripts/create-github-release.py

@@ -18,10 +18,7 @@
     compat_print,
     compat_urllib_request,
 )
-from youtube_dl.utils import (
-    make_HTTPS_handler,
-    sanitized_Request,
-)
+from youtube_dl.utils import make_HTTPS_handler, sanitized_Request
 
 
 class GitHubReleaser(object):

devscripts/fish-completion.py

@@ -3,8 +3,8 @@
 
 import optparse
 import os
-from os.path import dirname as dirn
 import sys
+from os.path import dirname as dirn
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl

devscripts/generate_aes_testdata.py

@@ -1,14 +1,14 @@
 from __future__ import unicode_literals
 
 import codecs
-import subprocess
-
 import os
+import subprocess
 import sys
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.utils import intlist_to_bytes
 from youtube_dl.aes import aes_encrypt, key_expansion
+from youtube_dl.utils import intlist_to_bytes
 
 secret_msg = b'Secret message goes here'
 

devscripts/gh-pages/add-version.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 from __future__ import unicode_literals
 
-import json
-import sys
 import hashlib
+import json
 import os.path
-
+import sys
 
 if len(sys.argv) <= 1:
     print('Specify the version number as parameter')

devscripts/gh-pages/sign-versions.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 from __future__ import unicode_literals, with_statement
 
-import rsa
 import json
 from binascii import hexlify
 
+import rsa
+
 try:
     input = raw_input
 except NameError:

devscripts/gh-pages/update-copyright.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from __future__ import with_statement, unicode_literals
+from __future__ import unicode_literals, with_statement
 
 import datetime
 import glob

devscripts/gh-pages/update-feed.py

@@ -6,7 +6,6 @@
 import json
 import textwrap
 
-
 atom_template = textwrap.dedent("""\
     <?xml version="1.0" encoding="utf-8"?>
     <feed xmlns="http://www.w3.org/2005/Atom">

devscripts/gh-pages/update-sites.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 from __future__ import unicode_literals
 
-import sys
 import os
+import sys
 import textwrap
 
 # We must be able to import youtube_dl

devscripts/make_lazy_extractors.py

@@ -1,10 +1,10 @@
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 
-from inspect import getsource
 import io
 import os
-from os.path import dirname as dirn
 import sys
+from inspect import getsource
+from os.path import dirname as dirn
 
 print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr)
 

devscripts/make_readme.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
 import io
-import sys
 import re
+import sys
 
 README_FILE = 'README.md'
 helptext = sys.stdin.read()

devscripts/make_supportedsites.py

@@ -6,7 +6,6 @@
 import os
 import sys
 
-
 # Import youtube_dl
 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)

devscripts/show-downloads-statistics.py

@@ -9,10 +9,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.compat import (
-    compat_print,
-    compat_urllib_request,
-)
+from youtube_dl.compat import compat_print, compat_urllib_request
 from youtube_dl.utils import format_bytes
 
 

devscripts/zsh-completion.py

@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 import os
-from os.path import dirname as dirn
 import sys
+from os.path import dirname as dirn
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl

docs/conf.py

@@ -12,8 +12,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
+
 # Allows to import youtube_dl
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -45,6 +46,7 @@
 #
 # The short X.Y version.
 from youtube_dl.version import __version__
+
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version

setup.py

@@ -4,14 +4,14 @@
 from __future__ import print_function
 
 import os.path
-import warnings
 import sys
+import warnings
 
 try:
-    from setuptools import setup, Command
+    from setuptools import Command, setup
     setuptools_available = True
 except ImportError:
-    from distutils.core import setup, Command
+    from distutils.core import Command, setup
     setuptools_available = False
 from distutils.spawn import spawn
 

test/helper.py

@@ -1,25 +1,19 @@
 from __future__ import unicode_literals
 
 import errno
-import io
 import hashlib
+import io
 import json
 import os.path
 import re
-import types
 import ssl
 import sys
+import types
 
 import youtube_dl.extractor
 from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
-    compat_os_name,
-    compat_str,
-)
-from youtube_dl.utils import (
-    preferredencoding,
-    write_string,
-)
+from youtube_dl.compat import compat_os_name, compat_str
+from youtube_dl.utils import preferredencoding, write_string
 
 
 def get_params(override=None):

test/test_InfoExtractor.py

@@ -7,15 +7,21 @@
 import os
 import sys
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+import threading
+
 from test.helper import FakeYDL, expect_dict, expect_value, http_server_port
 from youtube_dl.compat import compat_etree_fromstring, compat_http_server
-from youtube_dl.extractor.common import InfoExtractor
 from youtube_dl.extractor import YoutubeIE, get_info_extractor
-from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
-import threading
-
+from youtube_dl.extractor.common import InfoExtractor
+from youtube_dl.utils import (
+    ExtractorError,
+    RegexNotFoundError,
+    encode_data_uri,
+    strip_jsonp,
+)
 
 TEAPOT_RESPONSE_STATUS = 418
 TEAPOT_RESPONSE_BODY = "<h1>418 I'm a teapot</h1>"

test/test_YoutubeDL.py

@@ -7,6 +7,7 @@
 import os
 import sys
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import copy

test/test_YoutubeDLCookieJar.py

@@ -8,6 +8,7 @@
 import sys
 import tempfile
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.utils import YoutubeDLCookieJar

test/test_aes.py

@@ -6,12 +6,21 @@
 import os
 import sys
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text, aes_ecb_encrypt
-from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
 import base64
 
+from youtube_dl.aes import (
+    aes_cbc_decrypt,
+    aes_cbc_encrypt,
+    aes_decrypt,
+    aes_decrypt_text,
+    aes_ecb_encrypt,
+    aes_encrypt,
+)
+from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
+
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'
 
 

test/test_age_restriction.py

@@ -5,11 +5,10 @@
 import os
 import sys
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import try_rm
-
-
 from youtube_dl import YoutubeDL
 
 

test/test_all_urls.py

@@ -2,21 +2,18 @@
 
 from __future__ import unicode_literals
 
+import collections
+
 # Allow direct execution
 import os
 import sys
 import unittest
-import collections
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from test.helper import gettestcases
-
-from youtube_dl.extractor import (
-    FacebookIE,
-    gen_extractors,
-    YoutubeIE,
-)
+from youtube_dl.extractor import FacebookIE, YoutubeIE, gen_extractors
 
 
 class TestAllURLsMatching(unittest.TestCase):

test/test_cache.py

@@ -7,6 +7,7 @@
 import os
 import sys
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import shutil

test/test_compat.py

@@ -7,16 +7,17 @@
 import os
 import sys
 import unittest
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from youtube_dl.compat import (
     compat_casefold,
-    compat_getenv,
-    compat_setenv,
     compat_etree_Element,
     compat_etree_fromstring,
     compat_expanduser,
+    compat_getenv,
+    compat_setenv,
     compat_shlex_split,
     compat_str,
     compat_struct_unpack,