Merge tag 'upstream/2017.03.07'

[youtubedl] / devscripts / gh-pages / update-sites.py

diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py
index 33f242480e7c967ec0ca89fe57b5392dda0a524f..531c93c7089c1847a7e9018fcda5ca177f68547e 100755 (executable)
--- a/devscripts/gh-pages/update-sites.py
+++ b/devscripts/gh-pages/update-sites.py
@@ -1,26 +1,29 @@
 #!/usr/bin/env python3
 #!/usr/bin/env python3

+from __future__ import unicode_literals

 
 import sys
 import os
 import textwrap
 
 # We must be able to import youtube_dl
 
 import sys
 import os
 import textwrap
 
 # We must be able to import youtube_dl

-sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))

 
 import youtube_dl
 
 
 import youtube_dl
 

+

 def main():
     with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
         template = tmplf.read()
 
     ie_htmls = []
 def main():
     with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
         template = tmplf.read()
 
     ie_htmls = []

-    for ie in sorted(youtube_dl.gen_extractors(), key=lambda i: i.IE_NAME.lower()):
+    for ie in youtube_dl.list_extractors(age_limit=None):

         ie_html = '<b>{}</b>'.format(ie.IE_NAME)
         ie_html = '<b>{}</b>'.format(ie.IE_NAME)

-        try:
+        ie_desc = getattr(ie, 'IE_DESC', None)
+        if ie_desc is False:
+            continue
+        elif ie_desc is not None:

             ie_html += ': {}'.format(ie.IE_DESC)
             ie_html += ': {}'.format(ie.IE_DESC)

-        except AttributeError:
-            pass
-        if ie.working() == False:
+        if not ie.working():

             ie_html += ' (Currently broken)'
         ie_htmls.append('<li>{}</li>'.format(ie_html))
 
             ie_html += ' (Currently broken)'
         ie_htmls.append('<li>{}</li>'.format(ie_html))
 


@@ -29,5 +32,6 @@ def main():
     with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
         sitesf.write(template)
 
     with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
         sitesf.write(template)
 

+

 if __name__ == '__main__':
     main()
 if __name__ == '__main__':
     main()