From 6b97ca96fc242c1d7639d080e2c8e3ee9f9d0bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Sun, 21 Feb 2016 12:22:12 +0100
Subject: [PATCH] lazy extractors: Style fixes
* Sort extractors alphabetically
* Add newlines when needed (youtube_dl/extractors/lazy_extractors.py pass the flake8 test now)
---
devscripts/lazy_load_template.py | 1 -
devscripts/make_lazy_extractors.py | 6 +++---
setup.cfg | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/devscripts/lazy_load_template.py b/devscripts/lazy_load_template.py
index 563d629f8..b984aab9b 100644
--- 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 5d0ddb401..b5a8b9190 100644
--- 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 5760112d4..2dc06ffe4 100644
--- 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