lazy extractors: Style fixes

* Sort extractors alphabetically
* Add newlines when needed (youtube_dl/extractors/lazy_extractors.py pass the flake8 test now)

diff --git a/devscripts/lazy_load_template.py b/devscripts/lazy_load_template.py
index 563d629f8c582889ee3b54bd131d8220dc6f2536..b984aab9b1e34cee7895f3655502ffeff66e3c29 100644 (file)
--- a/devscripts/lazy_load_template.py
+++ b/devscripts/lazy_load_template.py
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# flake8: noqa
 from __future__ import unicode_literals
 
 import re

diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py
index 5d0ddb40180715c5e2d5db17075190e7909708d1..b5a8b9190bd5c84b7c0a695cb09ae78014750cbd 100644 (file)
--- a/devscripts/make_lazy_extractors.py
+++ b/devscripts/make_lazy_extractors.py
@@ -41,14 +41,14 @@ def build_lazy_ie(ie, name):
         valid_url=valid_url,
         module=ie.__module__)
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
-        s += getsource(ie.suitable)
+        s += '\n' + getsource(ie.suitable)
     if hasattr(ie, '_make_valid_url'):
         # search extractors
         s += make_valid_template.format(valid_url=ie._make_valid_url())
     return s
 
 names = []
-for ie in _ALL_CLASSES:
+for ie in list(sorted(_ALL_CLASSES[:-1], key=lambda cls: cls.ie_key())) + _ALL_CLASSES[-1:]:
     name = ie.ie_key() + 'IE'
     src = build_lazy_ie(ie, name)
     module_contents.append(src)
@@ -57,7 +57,7 @@ for ie in _ALL_CLASSES:
 module_contents.append(
     '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
-module_src = '\n'.join(module_contents)
+module_src = '\n'.join(module_contents) + '\n'
 
 with open(lazy_extractors_filename, 'wt') as f:
     f.write(module_src)

diff --git a/setup.cfg b/setup.cfg
index 5760112d4564bb4fe8389b9c134ef6ef406a81b3..2dc06ffe413f76f4d776fe44780f327a170d7801 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,5 +2,5 @@
 universal = True
 
 [flake8]
-exclude = youtube_dl/extractor/__init__.py,devscripts/buildserver.py,devscripts/make_issue_template.py,setup.py,build,.git
+exclude = youtube_dl/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git
 ignore = E402,E501,E731