w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

lazy extractors: Style fixes

Browse source 
* Sort extractors alphabetically
* Add newlines when needed (youtube_dl/extractors/lazy_extractors.py pass the flake8 test now)
This commit is contained in:
Jaime Marquínez Ferrándiz 2016-02-21 12:22:12 +01:00
parent c1ce6acdd7
commit 6b97ca96fc
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
devscripts/lazy_load_template.py
View file

@ -1,5 +1,4 @@
# encoding: utf-8 # encoding: utf-8
# flake8: noqa
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re

6
devscripts/make_lazy_extractors.py
View file

@ -41,14 +41,14 @@ def build_lazy_ie(ie, name):
valid_url=valid_url, valid_url=valid_url,
module=ie.__module__) module=ie.__module__)
if ie.suitable.__func__ is not InfoExtractor.suitable.__func__: if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
s += getsource(ie.suitable) s += '\n' + getsource(ie.suitable)
if hasattr(ie, '_make_valid_url'): if hasattr(ie, '_make_valid_url'):
# search extractors # search extractors
s += make_valid_template.format(valid_url=ie._make_valid_url()) s += make_valid_template.format(valid_url=ie._make_valid_url())
return s return s
names = [] 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' name = ie.ie_key() + 'IE'
src = build_lazy_ie(ie, name) src = build_lazy_ie(ie, name)
module_contents.append(src) module_contents.append(src)
@ -57,7 +57,7 @@ for ie in _ALL_CLASSES:
module_contents.append( module_contents.append(
'_ALL_CLASSES = [{0}]'.format(', '.join(names))) '_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: with open(lazy_extractors_filename, 'wt') as f:
f.write(module_src) f.write(module_src)

2
setup.cfg
View file

@ -2,5 +2,5 @@
universal = True universal = True
[flake8] [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 ignore = E402,E501,E731