Merge remote-tracking branch 'jtwaleson/master'

devscripts/fish-completion.py

@@ -30,7 +30,6 @@ def build_completion(opt_parser):
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')
-            help_msg = shell_quote([option.help])
             complete_cmd = ['complete', '--command', 'youtube-dl', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]

setup.py

@@ -4,7 +4,6 @@
 from __future__ import print_function
 
 import os.path
-import pkg_resources
 import warnings
 import sys
 

youtube_dl/YoutubeDL.py

@@ -701,13 +701,15 @@ class YoutubeDL(object):
                 'It needs to be updated.' % ie_result.get('extractor'))
 
             def _fixup(r):
-                self.add_extra_info(r,
+                self.add_extra_info(
+                    r,
                     {
                         'extractor': ie_result['extractor'],
                         'webpage_url': ie_result['webpage_url'],
                         'webpage_url_basename': url_basename(ie_result['webpage_url']),
                         'extractor_key': ie_result['extractor_key'],
-                    })
+                    }
+                )
                 return r
             ie_result['entries'] = [
                 self.process_ie_result(_fixup(r), download, extra_info)

youtube_dl/downloader/f4m.py

@@ -225,13 +225,15 @@ class F4mFD(FileDownloader):
         self.to_screen('[download] Downloading f4m manifest')
         manifest = self.ydl.urlopen(man_url).read()
         self.report_destination(filename)
-        http_dl = HttpQuietDownloader(self.ydl,
+        http_dl = HttpQuietDownloader(
+            self.ydl,
             {
                 'continuedl': True,
                 'quiet': True,
                 'noprogress': True,
                 'test': self.params.get('test', False),
-            })
+            }
+        )
 
         doc = etree.fromstring(manifest)
         formats = [(int(f.attrib.get('bitrate', -1)), f) for f in doc.findall(_add_ns('media'))]

youtube_dl/extractor/cnn.py

@@ -25,8 +25,7 @@ class CNNIE(InfoExtractor):
             'duration': 135,
             'upload_date': '20130609',
         },
-    },
+    }, {
-    {
         "url": "http://edition.cnn.com/video/?/video/us/2013/08/21/sot-student-gives-epic-speech.georgia-institute-of-technology&utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+rss%2Fcnn_topstories+%28RSS%3A+Top+Stories%29",
         "md5": "b5cc60c60a3477d185af8f19a2a26f4e",
         "info_dict": {

youtube_dl/extractor/collegehumor.py

@@ -10,7 +10,8 @@ from ..utils import int_or_none
 class CollegeHumorIE(InfoExtractor):
     _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed|e)/(?P<videoid>[0-9]+)/?(?P<shorttitle>.*)$'
 
-    _TESTS = [{
+    _TESTS = [
+        {
             'url': 'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',
             'md5': 'dcc0f5c1c8be98dc33889a191f4c26bd',
             'info_dict': {
@@ -21,8 +22,7 @@ class CollegeHumorIE(InfoExtractor):
                 'age_limit': 13,
                 'duration': 187,
             },
-    },
+        }, {
-    {
             'url': 'http://www.collegehumor.com/video/3505939/font-conference',
             'md5': '72fa701d8ef38664a4dbb9e2ab721816',
             'info_dict': {
@@ -33,9 +33,8 @@ class CollegeHumorIE(InfoExtractor):
                 'age_limit': 10,
                 'duration': 179,
             },
-    },
+        }, {
             # embedded youtube video
-    {
             'url': 'http://www.collegehumor.com/embed/6950306',
             'info_dict': {
                 'id': 'Z-bao9fg6Yc',

youtube_dl/extractor/dropbox.py

@@ -11,15 +11,15 @@ from ..utils import url_basename
 
 class DropboxIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*'
-    _TESTS = [{
+    _TESTS = [
+        {
             'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',
                 'title': 'youtube-dl test video \'ä"BaW_jenozKc'
             }
-    },
+        }, {
-    {
             'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
             'only_matching': True,
         },

youtube_dl/extractor/internetvideoarchive.py

@@ -58,9 +58,13 @@ class InternetVideoArchiveIE(InfoExtractor):
         item = info.find('channel/item')
 
         def _bp(p):
-            return xpath_with_ns(p,
+            return xpath_with_ns(
-                {'media': 'http://search.yahoo.com/mrss/',
+                p,
-                'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats'})
+                {
+                    'media': 'http://search.yahoo.com/mrss/',
+                    'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats',
+                }
+            )
         formats = []
         for content in item.findall(_bp('media:group/media:content')):
             attr = content.attrib

youtube_dl/extractor/kickstarter.py

@@ -13,8 +13,10 @@ class KickStarterIE(InfoExtractor):
             'id': '1404461844',
             'ext': 'mp4',
             'title': 'Intersection: The Story of Josh Grant by Kyle Cowling',
-            'description': 'A unique motocross documentary that examines the '
+            'description': (
-                'life and mind of one of sports most elite athletes: Josh Grant.',
+                'A unique motocross documentary that examines the '
+                'life and mind of one of sports most elite athletes: Josh Grant.'
+            ),
         },
     }, {
         'note': 'Embedded video (not using the native kickstarter video service)',

youtube_dl/extractor/ninegag.py

@@ -27,8 +27,7 @@ class NineGagIE(InfoExtractor):
             "thumbnail": "re:^https?://",
         },
         'add_ie': ['Youtube']
-    },
+    }, {
-    {
         'url': 'http://9gag.tv/p/KklwM/alternate-banned-opening-scene-of-gravity?ref=fsidebar',
         'info_dict': {
             'id': 'KklwM',

youtube_dl/extractor/sbs.py

@@ -27,8 +27,7 @@ class SBSIE(InfoExtractor):
             'thumbnail': 're:http://.*\.jpg',
         },
         'add_ies': ['generic'],
-    },
+    }, {
-    {
         'url': 'http://www.sbs.com.au/ondemand/video/320403011771/Dingo-Conservation-The-Feed',
         'only_matching': True,
     }]

youtube_dl/extractor/teamcoco.py

@@ -16,8 +16,7 @@ class TeamcocoIE(InfoExtractor):
                 'title': 'Conan Becomes A Mary Kay Beauty Consultant',
                 'description': 'Mary Kay is perhaps the most trusted name in female beauty, so of course Conan is a natural choice to sell their products.'
             }
-    },
+        }, {
-    {
             'url': 'http://teamcoco.com/video/louis-ck-interview-george-w-bush',
             'file': '19705.mp4',
             'md5': 'cde9ba0fa3506f5f017ce11ead928f9a',

youtube_dl/extractor/vk.py

@@ -175,7 +175,7 @@ class VKIE(InfoExtractor):
         upload_date = None
         mobj = re.search(r'id="mv_date_wrap".*?Added ([a-zA-Z]+ [0-9]+), ([0-9]+) at', info_page)
         if mobj is not None:
-            x = mobj.group(1) + ' ' + mobj.group(2)
+            mobj.group(1) + ' ' + mobj.group(2)
             upload_date = unified_strdate(mobj.group(1) + ' ' + mobj.group(2))
 
         formats = [{