linting

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    sha: v0.8.0
+    hooks:
+    -   id: autopep8-wrapper
+    -   id: check-ast
+    -   id: check-case-conflict
+    -   id: check-merge-conflict
+    -   id: detect-private-key
+    -   id: double-quote-string-fixer
+    -   id: end-of-file-fixer
+    -   id: flake8
+    -   id: requirements-txt-fixer
+    -   id: trailing-whitespace
+-   repo: https://github.com/asottile/reorder_python_imports
+    sha: v0.3.4
+    hooks:
+    -   id: reorder-python-imports
+        language_version: python3.6
+-   repo: https://github.com/Lucas-C/pre-commit-hooks-safety
+    sha: v1.1.0
+    hooks:
+    -   id: python-safety-dependencies-check

pytube/__main__.py

@@ -1,30 +1,57 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
-import sys
-import os
+
 import argparse
+import os
+import sys
+from pprint import pprint
 
 from . import YouTube
-from .utils import print_status, FullPaths
 from .exceptions import PytubeError
-from pprint import pprint
+from .utils import FullPaths
+from .utils import print_status
 
 
 def main():
     parser = argparse.ArgumentParser(description='YouTube video downloader')
-    parser.add_argument("url", help=(
-        "The URL of the Video to be downloaded"))
-    parser.add_argument("--extension", "-e", dest="ext", help=(
-        "The requested format of the video"))
-    parser.add_argument("--resolution", "-r", dest="res", help=(
-        "The requested resolution"))
-    parser.add_argument("--path", "-p", action=FullPaths, default=os.getcwd(),
-                        dest="path", help=("The path to save the video to."))
-    parser.add_argument("--filename", "-f", dest="filename", help=(
-        "The filename, without extension, to save the video in."))
-    parser.add_argument("--show_available", "-s", action='store_true',
-            dest='show_available', help=("Prints a list of available formats for download."))
+    parser.add_argument(
+        'url',
+        help='The URL of the Video to be downloaded'
+    )
+    parser.add_argument(
+        '--extension',
+        '-e',
+        dest='ext',
+        help='The requested format of the video'
+    )
+    parser.add_argument(
+        '--resolution',
+        '-r',
+        dest='res',
+        help='The requested resolution'
+    )
+    parser.add_argument(
+        '--path',
+        '-p',
+        action=FullPaths,
+        default=os.getcwd(),
+        dest='path',
+        help='The path to save the video to.'
+    )
+    parser.add_argument(
+        '--filename',
+        '-f',
+        dest='filename',
+        help='The filename, without extension, to save the video in.',
+    )
+    parser.add_argument(
+        '--show_available',
+        '-s',
+        action='store_true',
+        dest='show_available',
+        help='Prints a list of available formats for download.'
+    )
 
     args = parser.parse_args()
 
@@ -36,7 +63,7 @@ def main():
             res = video.resolution
             videos.append((ext, res))
     except PytubeError:
-        print("Incorrect video URL.")
+        print('Incorrect video URL.')
         sys.exit(1)
 
     if args.show_available:
@@ -48,8 +75,8 @@ def main():
 
     if args.ext or args.res:
         if not all([args.ext, args.res]):
-            print("Make sure you give either of the below specified "
-                  "format/resolution combination.")
+            print('Make sure you give either of the below specified '
+                  'format/resolution combination.')
             print_available_vids(videos)
             sys.exit(1)
 
@@ -59,7 +86,7 @@ def main():
         # Check if there's a video returned
         if not vid:
             print("There's no video with the specified format/resolution "
-                  "combination.")
+                  'combination.')
             pprint(videos)
             sys.exit(1)
 
@@ -68,7 +95,7 @@ def main():
         videos = yt.filter(extension=args.ext)
         # Check if we have a video
         if not videos:
-            print("There are no videos in the specified format.")
+            print('There are no videos in the specified format.')
             sys.exit(1)
         # Select the highest resolution one
         vid = max(videos)
@@ -77,8 +104,8 @@ def main():
         videos = yt.filter(resolution=args.res)
         # Check if we have a video
         if not videos:
-            print("There are no videos in the specified in the specified "
-                  "resolution.")
+            print('There are no videos in the specified in the specified '
+                  'resolution.')
             sys.exit(1)
         # Select the highest resolution one
         vid = max(videos)
@@ -87,25 +114,29 @@ def main():
         print_available_vids(videos)
         while True:
             try:
-                choice = int(input("Enter choice: "))
+                choice = int(input('Enter choice: '))
                 vid = yt.get(*videos[choice])
                 break
             except (ValueError, IndexError):
-                print("Requires an integer in range 0-{}".format(len(videos) - 1))
+                print('Requires an integer in range 0-{}'
+                      .format(len(videos) - 1))
             except KeyboardInterrupt:
                 sys.exit(2)
 
     try:
         vid.download(path=args.path, on_progress=print_status)
     except KeyboardInterrupt:
-        print("Download interrupted.")
+        print('Download interrupted.')
         sys.exit(1)
 
+
 def print_available_vids(videos):
-    formatString = "{:<2} {:<15} {:<15}"
-    print(formatString.format("", "Resolution", "Extension"))
-    print("-"*28)
-    print("\n".join([formatString.format(index, *formatTuple) for index, formatTuple in enumerate(videos)]))
+    formatString = '{:<2} {:<15} {:<15}'
+    print(formatString.format('', 'Resolution', 'Extension'))
+    print('-' * 28)
+    print('\n'.join([formatString.format(index, *formatTuple)
+                     for index, formatTuple in enumerate(videos)]))
+
 
 if __name__ == '__main__':
     main()

pytube/api.py

@@ -1,14 +1,22 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from collections import defaultdict
+
 import json
 import logging
 import re
 import warnings
-from .compat import urlopen, urlparse, parse_qs, unquote
-from .exceptions import MultipleObjectsReturned, PytubeError, CipherError, \
-    DoesNotExist, AgeRestricted
+from collections import defaultdict
+
+from .compat import parse_qs
+from .compat import unquote
+from .compat import urlopen
+from .compat import urlparse
+from .exceptions import AgeRestricted
+from .exceptions import CipherError
+from .exceptions import DoesNotExist
+from .exceptions import MultipleObjectsReturned
+from .exceptions import PytubeError
 from .jsinterp import JSInterpreter
 from .models import Video
 from .utils import safe_filename
@@ -18,65 +26,66 @@ log = logging.getLogger(__name__)
 # YouTube quality and codecs id map.
 QUALITY_PROFILES = {
     # flash
-    5: ("flv", "240p", "Sorenson H.263", "N/A", "0.25", "MP3", "64"),
+    5: ('flv', '240p', 'Sorenson H.263', 'N/A', '0.25', 'MP3', '64'),
 
     # 3gp
-    17: ("3gp", "144p", "MPEG-4 Visual", "Simple", "0.05", "AAC", "24"),
-    36: ("3gp", "240p", "MPEG-4 Visual", "Simple", "0.17", "AAC", "38"),
+    17: ('3gp', '144p', 'MPEG-4 Visual', 'Simple', '0.05', 'AAC', '24'),
+    36: ('3gp', '240p', 'MPEG-4 Visual', 'Simple', '0.17', 'AAC', '38'),
 
     # webm
-    43: ("webm", "360p", "VP8", "N/A", "0.5", "Vorbis", "128"),
-    100: ("webm", "360p", "VP8", "3D", "N/A", "Vorbis", "128"),
+    43: ('webm', '360p', 'VP8', 'N/A', '0.5', 'Vorbis', '128'),
+    100: ('webm', '360p', 'VP8', '3D', 'N/A', 'Vorbis', '128'),
 
     # mpeg4
-    18: ("mp4", "360p", "H.264", "Baseline", "0.5", "AAC", "96"),
-    22: ("mp4", "720p", "H.264", "High", "2-2.9", "AAC", "192"),
-    82: ("mp4", "360p", "H.264", "3D", "0.5", "AAC", "96"),
-    83: ("mp4", "240p", "H.264", "3D", "0.5", "AAC", "96"),
-    84: ("mp4", "720p", "H.264", "3D", "2-2.9", "AAC", "152"),
-    85: ("mp4", "1080p", "H.264", "3D", "2-2.9", "AAC", "152"),
-
-    160: ("mp4", "144p", "H.264", "Main", "0.1", "", ""),
-    133: ("mp4", "240p", "H.264", "Main", "0.2-0.3", "", ""),
-    134: ("mp4", "360p", "H.264", "Main", "0.3-0.4", "", ""),
-    135: ("mp4", "480p", "H.264", "Main", "0.5-1", "", ""),
-    136: ("mp4", "720p", "H.264", "Main", "1-1.5", "", ""),
-    298: ("mp4", "720p HFR", "H.264", "Main", "3-3.5", "", ""),
-
-    137: ("mp4", "1080p", "H.264", "High", "2.5-3", "", ""),
-    299: ("mp4", "1080p HFR", "H.264", "High", "5.5", "", ""),
-    264: ("mp4", "2160p-2304p", "H.264", "High", "12.5-16", "", ""),
-    266: ("mp4", "2160p-4320p", "H.264", "High", "13.5-25", "", ""),
-
-    242: ("webm", "240p", "vp9", "n/a", "0.1-0.2", "", ""),
-    243: ("webm", "360p", "vp9", "n/a", "0.25", "", ""),
-    244: ("webm", "480p", "vp9", "n/a", "0.5", "", ""),
-    247: ("webm", "720p", "vp9", "n/a", "0.7-0.8", "", ""),
-    248: ("webm", "1080p", "vp9", "n/a", "1.5", "", ""),
-    271: ("webm", "1440p", "vp9", "n/a", "9", "", ""),
-    278: ("webm", "144p 15 fps", "vp9", "n/a", "0.08", "", ""),
-    302: ("webm", "720p HFR", "vp9", "n/a", "2.5", "", ""),
-    303: ("webm", "1080p HFR", "vp9", "n/a", "5", "", ""),
-    308: ("webm", "1440p HFR", "vp9", "n/a", "10", "", ""),
-    313: ("webm", "2160p", "vp9", "n/a", "13-15", "", ""),
-    315: ("webm", "2160p HFR", "vp9", "n/a", "20-25", "", "")
+    18: ('mp4', '360p', 'H.264', 'Baseline', '0.5', 'AAC', '96'),
+    22: ('mp4', '720p', 'H.264', 'High', '2-2.9', 'AAC', '192'),
+    82: ('mp4', '360p', 'H.264', '3D', '0.5', 'AAC', '96'),
+    83: ('mp4', '240p', 'H.264', '3D', '0.5', 'AAC', '96'),
+    84: ('mp4', '720p', 'H.264', '3D', '2-2.9', 'AAC', '152'),
+    85: ('mp4', '1080p', 'H.264', '3D', '2-2.9', 'AAC', '152'),
+
+    160: ('mp4', '144p', 'H.264', 'Main', '0.1', '', ''),
+    133: ('mp4', '240p', 'H.264', 'Main', '0.2-0.3', '', ''),
+    134: ('mp4', '360p', 'H.264', 'Main', '0.3-0.4', '', ''),
+    135: ('mp4', '480p', 'H.264', 'Main', '0.5-1', '', ''),
+    136: ('mp4', '720p', 'H.264', 'Main', '1-1.5', '', ''),
+    298: ('mp4', '720p HFR', 'H.264', 'Main', '3-3.5', '', ''),
+
+    137: ('mp4', '1080p', 'H.264', 'High', '2.5-3', '', ''),
+    299: ('mp4', '1080p HFR', 'H.264', 'High', '5.5', '', ''),
+    264: ('mp4', '2160p-2304p', 'H.264', 'High', '12.5-16', '', ''),
+    266: ('mp4', '2160p-4320p', 'H.264', 'High', '13.5-25', '', ''),
+
+    242: ('webm', '240p', 'vp9', 'n/a', '0.1-0.2', '', ''),
+    243: ('webm', '360p', 'vp9', 'n/a', '0.25', '', ''),
+    244: ('webm', '480p', 'vp9', 'n/a', '0.5', '', ''),
+    247: ('webm', '720p', 'vp9', 'n/a', '0.7-0.8', '', ''),
+    248: ('webm', '1080p', 'vp9', 'n/a', '1.5', '', ''),
+    271: ('webm', '1440p', 'vp9', 'n/a', '9', '', ''),
+    278: ('webm', '144p 15 fps', 'vp9', 'n/a', '0.08', '', ''),
+    302: ('webm', '720p HFR', 'vp9', 'n/a', '2.5', '', ''),
+    303: ('webm', '1080p HFR', 'vp9', 'n/a', '5', '', ''),
+    308: ('webm', '1440p HFR', 'vp9', 'n/a', '10', '', ''),
+    313: ('webm', '2160p', 'vp9', 'n/a', '13-15', '', ''),
+    315: ('webm', '2160p HFR', 'vp9', 'n/a', '20-25', '', '')
 }
 
 # The keys corresponding to the quality/codec map above.
 QUALITY_PROFILE_KEYS = (
-    "extension",
-    "resolution",
-    "video_codec",
-    "profile",
-    "video_bitrate",
-    "audio_codec",
-    "audio_bitrate"
+    'extension',
+    'resolution',
+    'video_codec',
+    'profile',
+    'video_bitrate',
+    'audio_codec',
+    'audio_bitrate'
 )
 
 
 class YouTube(object):
     """Class representation of a single instance of a YouTube session.
     """
+
     def __init__(self, url=None):
         """Initializes YouTube API wrapper.
 
@@ -103,17 +112,17 @@ class YouTube(object):
         :param str url:
             The url to the YouTube video.
         """
-        warnings.warn("url setter deprecated, use `from_url()` "
-                      "instead.", DeprecationWarning)
+        warnings.warn('url setter deprecated, use `from_url()` '
+                      'instead.', DeprecationWarning)
         self.from_url(url)
 
     @property
     def video_id(self):
         """Gets the video id by parsing and extracting it from the url."""
         parts = urlparse(self._video_url)
-        qs = getattr(parts, "query")
+        qs = getattr(parts, 'query')
         if qs:
-            video_id = parse_qs(qs).get("v")
+            video_id = parse_qs(qs).get('v')
             if video_id:
                 return video_id.pop()
 
@@ -135,8 +144,8 @@ class YouTube(object):
         :param str filename:
             The filename of the video.
         """
-        warnings.warn("filename setter deprecated. Use `set_filename()` "
-                      "instead.", DeprecationWarning)
+        warnings.warn('filename setter deprecated. Use `set_filename()` '
+                      'instead.', DeprecationWarning)
         self.set_filename(filename)
 
     def set_filename(self, filename):
@@ -162,8 +171,8 @@ class YouTube(object):
         """Gets all videos. (This method is deprecated. Use `get_videos()`
         instead.
         """
-        warnings.warn("videos property deprecated. Use `get_videos()` "
-                      "instead.", DeprecationWarning)
+        warnings.warn('videos property deprecated. Use `get_videos()` '
+                      'instead.', DeprecationWarning)
         return self._videos
 
     def from_url(self, url):
@@ -183,40 +192,40 @@ class YouTube(object):
         video_data = self.get_video_data()
 
         # Set the title from the title.
-        self.title = video_data.get("args", {}).get("title")
+        self.title = video_data.get('args', {}).get('title')
 
         # Rewrite and add the url to the javascript file, we'll need to fetch
         # this if YouTube doesn't provide us with the signature.
-        js_partial_url = video_data.get("assets", {}).get("js")
+        js_partial_url = video_data.get('assets', {}).get('js')
         if js_partial_url.startswith('//'):
             js_url = 'http:' + js_partial_url
         elif js_partial_url.startswith('/'):
             js_url = 'https://youtube.com' + js_partial_url
 
         # Just make these easily accessible as variables.
-        stream_map = video_data.get("args", {}).get("stream_map")
-        video_urls = stream_map.get("url")
+        stream_map = video_data.get('args', {}).get('stream_map')
+        video_urls = stream_map.get('url')
 
         # For each video url, identify the quality profile and add it to list
         # of available videos.
         for i, url in enumerate(video_urls):
-            log.debug("attempting to get quality profile from url: %s", url)
+            log.debug('attempting to get quality profile from url: %s', url)
             try:
                 itag, quality_profile = self._get_quality_profile_from_url(url)
                 if not quality_profile:
-                    log.warn("unable to identify profile for itag=%s", itag)
+                    log.warn('unable to identify profile for itag=%s', itag)
                     continue
             except (TypeError, KeyError) as e:
-                log.exception("passing on exception %s", e)
+                log.exception('passing on exception %s', e)
                 continue
 
             # Check if we have the signature, otherwise we'll need to get the
             # cipher from the js.
-            if "signature=" not in url:
-                log.debug("signature not in url, attempting to resolve the "
-                          "cipher.")
-                signature = self._get_cipher(stream_map["s"][i], js_url)
-                url = "{0}&signature={1}".format(url, signature)
+            if 'signature=' not in url:
+                log.debug('signature not in url, attempting to resolve the '
+                          'cipher.')
+                signature = self._get_cipher(stream_map['s'][i], js_url)
+                url = '{0}&signature={1}'.format(url, signature)
             self._add_video(url, self.filename, **quality_profile)
         # Clear the cached js. Make sure to keep this at the end of
         # `from_url()` so we can mock inject the js in unit tests.
@@ -246,11 +255,11 @@ class YouTube(object):
                 result.append(v)
         matches = len(result)
         if matches <= 0:
-            raise DoesNotExist("No videos met this criteria.")
+            raise DoesNotExist('No videos met this criteria.')
         elif matches == 1:
             return result[0]
         else:
-            raise MultipleObjectsReturned("Multiple videos met this criteria.")
+            raise MultipleObjectsReturned('Multiple videos met this criteria.')
 
     def filter(self, extension=None, resolution=None, profile=None):
         """Gets a filtered list of videos given a file extention and/or
@@ -282,26 +291,26 @@ class YouTube(object):
         self.title = None
         response = urlopen(self.url)
         if not response:
-            raise PytubeError("Unable to open url: {0}".format(self.url))
+            raise PytubeError('Unable to open url: {0}'.format(self.url))
 
         html = response.read()
         if isinstance(html, str):
-            restriction_pattern = "og:restrictions:age"
+            restriction_pattern = 'og:restrictions:age'
         else:
-            restriction_pattern = bytes("og:restrictions:age", "utf-8")
+            restriction_pattern = bytes('og:restrictions:age', 'utf-8')
 
         if restriction_pattern in html:
-            raise AgeRestricted("Age restricted video. Unable to download "
-                                "without being signed in.")
+            raise AgeRestricted('Age restricted video. Unable to download '
+                                'without being signed in.')
 
         # Extract out the json data from the html response body.
         json_object = self._get_json_data(html)
 
         # Here we decode the stream map and bundle it into the json object. We
         # do this just so we just can return one object for the video data.
-        encoded_stream_map = json_object.get("args", {}).get(
-            "url_encoded_fmt_stream_map")
-        json_object["args"]["stream_map"] = self._parse_stream_map(
+        encoded_stream_map = json_object.get('args', {}).get(
+            'url_encoded_fmt_stream_map')
+        json_object['args']['stream_map'] = self._parse_stream_map(
             encoded_stream_map)
         return json_object
 
@@ -315,18 +324,18 @@ class YouTube(object):
         dct = defaultdict(list)
 
         # Split the comma separated videos.
-        videos = blob.split(",")
+        videos = blob.split(',')
 
         # Unquote the characters and split to parameters.
-        videos = [video.split("&") for video in videos]
+        videos = [video.split('&') for video in videos]
 
         # Split at the equals sign so we can break this key value pairs and
         # toss it into a dictionary.
         for video in videos:
             for kv in video:
-                key, value = kv.split("=")
+                key, value = kv.split('=')
                 dct[key].append(unquote(value))
-        log.debug("decoded stream map: %s", dct)
+        log.debug('decoded stream map: %s', dct)
         return dct
 
     def _get_json_data(self, html):
@@ -337,23 +346,23 @@ class YouTube(object):
         """
         # 18 represents the length of "ytplayer.config = ".
         if isinstance(html, str):
-            json_start_pattern = "ytplayer.config = "
+            json_start_pattern = 'ytplayer.config = '
         else:
-            json_start_pattern = bytes("ytplayer.config = ", "utf-8")
+            json_start_pattern = bytes('ytplayer.config = ', 'utf-8')
         pattern_idx = html.find(json_start_pattern)
         # In case video is unable to play
         if(pattern_idx == -1):
-            raise PytubeError("Unable to find start pattern.")
+            raise PytubeError('Unable to find start pattern.')
         start = pattern_idx + 18
         html = html[start:]
 
         offset = self._get_json_offset(html)
         if not offset:
-            raise PytubeError("Unable to extract json.")
+            raise PytubeError('Unable to extract json.')
         if isinstance(html, str):
             json_content = json.loads(html[:offset])
         else:
-            json_content = json.loads(html[:offset].decode("utf-8"))
+            json_content = json.loads(html[:offset].decode('utf-8'))
 
         return json_content
 
@@ -368,14 +377,14 @@ class YouTube(object):
         for i, ch in enumerate(html):
             if isinstance(ch, int):
                 ch = chr(ch)
-            if ch == "{":
+            if ch == '{':
                 unmatched_brackets_num += 1
-            elif ch == "}":
+            elif ch == '}':
                 unmatched_brackets_num -= 1
                 if unmatched_brackets_num == 0:
                     break
         else:
-            raise PytubeError("Unable to determine json offset.")
+            raise PytubeError('Unable to determine json offset.')
         return index + i
 
     def _get_cipher(self, signature, url):
@@ -391,7 +400,7 @@ class YouTube(object):
         if not self._js_cache:
             response = urlopen(url)
             if not response:
-                raise PytubeError("Unable to open url: {0}".format(self.url))
+                raise PytubeError('Unable to open url: {0}'.format(self.url))
             self._js_cache = response.read().decode()
         try:
             matches = reg_exp.search(self._js_cache)
@@ -404,8 +413,8 @@ class YouTube(object):
             return initial_function([signature])
         except Exception as e:
             raise CipherError("Couldn't cipher the signature. Maybe YouTube "
-                              "has changed the cipher algorithm. Notify this "
-                              "issue on GitHub: {0}".format(e))
+                              'has changed the cipher algorithm. Notify this '
+                              'issue on GitHub: {0}'.format(e))
         return False
 
     def _get_quality_profile_from_url(self, video_url):
@@ -429,11 +438,11 @@ class YouTube(object):
             # corresponding quality profile, referenced by the itag.
             return itag, dict(list(zip(QUALITY_PROFILE_KEYS, quality_profile)))
         if not itag:
-            raise PytubeError("Unable to get encoding profile, no itag found.")
+            raise PytubeError('Unable to get encoding profile, no itag found.')
         elif len(itag) > 1:
-            log.warn("Multiple itags found: %s", itag)
-            raise PytubeError("Unable to get encoding profile, multiple itags "
-                              "found.")
+            log.warn('Multiple itags found: %s', itag)
+            raise PytubeError('Unable to get encoding profile, multiple itags '
+                              'found.')
         return False
 
     def _add_video(self, url, filename, **kwargs):

pytube/jsinterp.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import json
 import operator
 import re
+
 from .exceptions import ExtractorError
 
 _OPERATORS = [
@@ -118,9 +120,8 @@ class JSInterpreter(object):
         except ValueError:
             pass
 
-        m = re.match(
-            r'(?P<var>%s)\.(?P<member>[^(]+)(?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE,
-            expr)
+        m = re.match(r'(?P<var>%s)\.(?P<member>[^(]+)'
+                     r'(?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE, expr)
         if m:
             variable = m.group('var')
             member = m.group('member')
@@ -212,7 +213,8 @@ class JSInterpreter(object):
         obj = {}
         obj_m = re.search(
             (r'(?:var\s+)?%s\s*=\s*\{' % re.escape(objname)) +
-            r'\s*(?P<fields>([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\{.*?\}(?:,\s*)?)*)' +
+            r'\s*(?P<fields>([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\'' +
+            r'{.*?\}(?:,\s*)?)*)' +
             r'\}\s*;',
             self.code)
         fields = obj_m.group('fields')
@@ -223,7 +225,8 @@ class JSInterpreter(object):
             fields)
         for f in fields_m:
             argnames = f.group('args').split(',')
-            obj[f.group('key')] = self.build_function(argnames, f.group('code'))
+            obj[f.group('key')] = self.build_function(
+                argnames, f.group('code'))
 
         return obj
 

pytube/models.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import os
 from time import clock
 
@@ -13,6 +14,7 @@ except ImportError:
 class Video(object):
     """Class representation of a single instance of a YouTube video.
     """
+
     def __init__(self, url, filename, extension, resolution=None,
                  video_codec=None, profile=None, video_bitrate=None,
                  audio_codec=None, audio_bitrate=None):
@@ -70,7 +72,7 @@ class Video(object):
         if not os.path.isdir(path):
             raise OSError('Make sure path exists.')
 
-        filename = "{0}.{1}".format(self.filename, self.extension)
+        filename = '{0}.{1}'.format(self.filename, self.extension)
         path = os.path.join(path, filename)
         # TODO: If it's not a path, this should raise an ``OSError``.
         # TODO: Move this into cli, this kind of logic probably shouldn't be
@@ -108,7 +110,7 @@ class Video(object):
             # to disable this.
             os.remove(path)
             raise KeyboardInterrupt(
-                "Interrupt signal given. Deleting incomplete video.")
+                'Interrupt signal given. Deleting incomplete video.')
 
     def file_size(self, response):
         """Gets the file size from the response
@@ -117,12 +119,12 @@ class Video(object):
             Response of a opened url.
         """
         meta_data = dict(response.info().items())
-        return int(meta_data.get("Content-Length") or
-                   meta_data.get("content-length"))
+        return int(meta_data.get('Content-Length') or
+                   meta_data.get('content-length'))
 
     def __repr__(self):
         """A clean representation of the class instance."""
-        return "<Video: {0} (.{1}) - {2} - {3}>".format(
+        return '<Video: {0} (.{1}) - {2} - {3}>'.format(
             self.video_codec, self.extension, self.resolution, self.profile)
 
     def __lt__(self, other):
@@ -133,6 +135,6 @@ class Video(object):
             The instance of the other video instance for comparison.
         """
         if isinstance(other, Video):
-            v1 = "{0} {1}".format(self.extension, self.resolution)
-            v2 = "{0} {1}".format(other.extension, other.resolution)
+            v1 = '{0} {1}'.format(self.extension, self.resolution)
+            v2 = '{0} {1}'.format(other.extension, other.resolution)
             return (v1 > v2) - (v1 < v2) < 0

pytube/utils.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import argparse
-import re
 import math
-
+import re
 from os import path
 from sys import stdout
 from time import clock
@@ -11,6 +10,7 @@ from time import clock
 
 class FullPaths(argparse.Action):
     """Expand user- and relative-paths"""
+
     def __call__(self, parser, namespace, values, option_string=None):
         setattr(namespace, self.dest, path.abspath(path.expanduser(values)))
 
@@ -50,10 +50,11 @@ def sizeof(byts):
     """
     sizes = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB']
     power = int(math.floor(math.log(byts, 1024)))
-    value = int(byts/float(1024**power))
+    value = int(byts / float(1024**power))
     suffix = sizes[power] if byts != 1 else 'byte'
     return '{0} {1}'.format(value, suffix)
 
+
 def print_status(progress, file_size, start):
     """
     This function - when passed as `on_progress` to `Video.download` - prints
@@ -71,7 +72,7 @@ def print_status(progress, file_size, start):
     done = int(50 * progress / int(file_size))
     dt = (clock() - start)
     if dt > 0:
-        stdout.write("\r  [%s%s][%3.2f%%] %s at %s/s " %
+        stdout.write('\r  [%s%s][%3.2f%%] %s at %s/s ' %
                      ('=' * done, ' ' * (50 - done), percent_done,
                       sizeof(file_size), sizeof(progress // dt)))
     stdout.flush()

setup.py

@@ -12,12 +12,12 @@ with open('LICENSE.txt') as readme_file:
     license = readme_file.read()
 
 setup(
-    name="pytube",
-    version="6.3.1",
-    author="Nick Ficano",
-    author_email="nficano@gmail.com",
+    name='pytube',
+    version='6.3.1',
+    author='Nick Ficano',
+    author_email='nficano@gmail.com',
     packages=['pytube'],
-    url="https://github.com/nficano/pytube",
+    url='https://github.com/nficano/pytube',
     license=license,
     entry_points={
         'console_scripts': [
@@ -25,29 +25,29 @@ setup(
         ],
     },
     classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Console",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Natural Language :: English",
-        "Operating System :: MacOS",
-        "Operating System :: Microsoft",
-        "Operating System :: POSIX",
-        "Operating System :: Unix",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python",
-        "Topic :: Internet",
-        "Topic :: Multimedia :: Video",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Terminals",
-        "Topic :: Utilities",
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Operating System :: MacOS',
+        'Operating System :: Microsoft',
+        'Operating System :: POSIX',
+        'Operating System :: Unix',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python',
+        'Topic :: Internet',
+        'Topic :: Multimedia :: Video',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Terminals',
+        'Topic :: Utilities',
     ],
-    description=("A Python library for downloading YouTube videos."),
+    description=('A Python library for downloading YouTube videos.'),
     long_description=readme,
     zip_safe=True,
 

tests/mock_data/youtube_age_restricted.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html><html lang="en" data-cast-api-enabled="true"><head><style name="www-roboto">@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:local('Roboto Regular'),local('Roboto-Regular'),url(//fonts.gstatic.com/s/roboto/v15/zN7GBFwfMP4uA6AR0HCoLQ.ttf)format('truetype');}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;src:local('Roboto Medium'),local('Roboto-Medium'),url(//fonts.gstatic.com/s/roboto/v15/RxZJdnzeo3R5zSexge8UUaCWcynf_cDxXwCLxiixG1c.ttf)format('truetype');}@font-face{font-family:'Roboto';font-style:italic;font-weight:400;src:local('Roboto Italic'),local('Roboto-Italic'),url(//fonts.gstatic.com/s/roboto/v15/W4wDsBUluyw0tK3tykhXEfesZW2xOQ-xsNqO47m55DA.ttf)format('truetype');}@font-face{font-family:'Roboto';font-style:italic;font-weight:500;src:local('Roboto Medium Italic'),local('Roboto-MediumItalic'),url(//fonts.gstatic.com/s/roboto/v15/OLffGBTaF0XFOW1gnuHF0Z0EAVxt0G0biEntp43Qt6E.ttf)format('truetype');}</style><script name="www-roboto">if (document.fonts && document.fonts.load) {document.fonts.load("400 10pt Roboto", "E");document.fonts.load("500 10pt Roboto", "E");}</script><script>var ytcsi = {gt: function(n) {n = (n || '') + 'data_';return ytcsi[n] || (ytcsi[n] = {tick: {},span: {},info: {}});},tick: function(l, t, n) {ytcsi.gt(n).tick[l] = t || +new Date();},span: function(l, s, e, n) {ytcsi.gt(n).span[l] = (e ? e : +new Date()) - ytcsi.gt(n).tick[s];},setSpan: function(l, s, n) {ytcsi.gt(n).span[l] = s;},info: function(k, v, n) {ytcsi.gt(n).info[k] = v;},setStart: function(s, t, n) {ytcsi.info('yt_sts', s, n);ytcsi.tick('_start', t, n);}};(function(w, d) {ytcsi.perf = w.performance || w.mozPerformance ||w.msPerformance || w.webkitPerformance;ytcsi.setStart('dhs', ytcsi.perf ? ytcsi.perf.timing.responseStart : null);var isPrerender = (d.visibilityState || d.webkitVisibilityState) == 'prerender';var vName = d.webkitVisibilityState ? 'webkitvisibilitychange' : 'visibilitychange';if (isPrerender) {ytcsi.info('prerender', 1);var startTick = function() {ytcsi.setStart('dhs');d.removeEventListener(vName, startTick);};d.addEventListener(vName, startTick, false);}if (d.addEventListener) {d.addEventListener(vName, function() {ytcsi.tick('vc');}, false);}})(window, document);</script><script>var ytcfg = {d: function() {return (window.yt && yt.config_) || ytcfg.data_ || (ytcfg.data_ = {});},get: function(k, o) {return (k in ytcfg.d()) ? ytcfg.d()[k] : o;},set: function() {var a = arguments;if (a.length > 1) {ytcfg.d()[a[0]] = a[1];} else {for (var k in a[0]) {ytcfg.d()[k] = a[0][k];}}}};</script>  <script>ytcfg.set("LACT", null);</script>
-  
+
 
 
 
@@ -30,8 +30,8 @@ var m=["yt","www","masthead","sizing","runBeforeBodyIsReady"],n=this;m[0]in n||!
       <link rel="stylesheet" href="//s.ytimg.com/yts/cssbin/www-player-new-vfl1mGUtZ.css" name="www-player">
 
   <link rel="stylesheet" href="//s.ytimg.com/yts/cssbin/www-pageframe-vflAoSuzf.css" name="www-pageframe">
-  
-  
+
+
 
 <title>Kara Tointon (Age-restricted video) - YouTube</title><link rel="search" type="application/opensearchdescription+xml" href="https://www.youtube.com/opensearch?locale=en_US" title="YouTube Video Search"><link rel="shortcut icon" href="https://s.ytimg.com/yts/img/favicon-vflz7uhzw.ico" type="image/x-icon">     <link rel="icon" href="//s.ytimg.com/yts/img/favicon_32-vfl8NGn4k.png" sizes="32x32"><link rel="icon" href="//s.ytimg.com/yts/img/favicon_48-vfl1s0rGh.png" sizes="48x48"><link rel="icon" href="//s.ytimg.com/yts/img/favicon_96-vfldSA3ca.png" sizes="96x96"><link rel="icon" href="//s.ytimg.com/yts/img/favicon_144-vflWmzoXw.png" sizes="144x144"><link rel="canonical" href="http://www.youtube.com/watch?v=nzNgkc6t260"><link rel="alternate" media="handheld" href="http://m.youtube.com/watch?v=nzNgkc6t260"><link rel="alternate" media="only screen and (max-width: 640px)" href="http://m.youtube.com/watch?v=nzNgkc6t260"><link rel="shortlink" href="https://youtu.be/nzNgkc6t260">      <meta name="title" content="Kara Tointon (Age-restricted video)">
 
@@ -110,9 +110,9 @@ var m=["yt","www","masthead","sizing","runBeforeBodyIsReady"],n=this;m[0]in n||!
       <meta name="twitter:player:width" content="1280">
       <meta name="twitter:player:height" content="720">
 
-  
+
 <style>.exp-responsive #content .yt-uix-button-subscription-container .yt-short-subscriber-count {display: inline-block;}.exp-responsive #content .yt-uix-button-subscription-container .yt-subscriber-count {display: none;}@media only screen and (min-width: 850px) {.exp-responsive #content .yt-uix-button-subscription-container .yt-short-subscriber-count {display: none;}.exp-responsive #content .yt-uix-button-subscription-container .yt-subscriber-count {display: inline-block;}}</style></head>  <body dir="ltr" id="body" class="  ltr    exp-hamburglar exp-responsive exp-scrollable-guide exp-watch-controls-overlay   site-center-aligned site-as-giant-card appbar-hidden     not-nirvana-dogfood  not-yt-legacy-css      flex-width-enabled      flex-width-enabled-snap    delayed-frame-styles-not-in  " data-spf-name="watch">
-<div id="early-body"></div><div id="body-container"><div id="a11y-announcements-container" role="alert"><div id="a11y-announcements-message"></div></div><form name="logoutForm" method="POST" action="/logout"><input type="hidden" name="action_logout" value="1"></form><div id="masthead-positioner">    
+<div id="early-body"></div><div id="body-container"><div id="a11y-announcements-container" role="alert"><div id="a11y-announcements-message"></div></div><form name="logoutForm" method="POST" action="/logout"><input type="hidden" name="action_logout" value="1"></form><div id="masthead-positioner">
   <div id="yt-masthead-container" class="clearfix yt-base-gutter">  <button id="a11y-skip-nav" class="skip-nav" data-target-id="main" tabindex="3">
 Skip navigation
   </button>
@@ -142,7 +142,7 @@ Loading...
     </div>
   </div>
 
-</div><div class="alerts-wrapper"><div id="alerts" class="content-alignment">    
+</div><div class="alerts-wrapper"><div id="alerts" class="content-alignment">
   <div id="editor-progress-alert-container"></div>
   <div class="yt-alert yt-alert-default yt-alert-warn hid " id="editor-progress-alert-template">  <div class="yt-alert-icon">
     <span class="icon master-sprite yt-sprite"></span>
@@ -185,11 +185,11 @@ Loading...
     </div>
 
     <div id="player-api" class="player-width player-height off-screen-target player-api" tabIndex="-1"></div>
-    
+
 
     <div id="watch-queue-mole" class="video-mole mole-collapsed hid"><div id="watch-queue" class="watch-playlist player-height"><div class="main-content"><div class="watch-queue-header"><div class="watch-queue-info"><div class="watch-queue-info-icon"><span class="tv-queue-list-icon yt-sprite"></span></div><h3 class="watch-queue-title">Watch Queue</h3><h3 class="tv-queue-title">TV Queue</h3><span class="tv-queue-details"></span></div><div class="watch-queue-control-bar control-bar-button"><div class="watch-queue-mole-info"><div class="watch-queue-control-bar-icon"><span class="watch-queue-icon yt-sprite"></span></div><div class="watch-queue-title-container"><span class="watch-queue-count"></span><span class="watch-queue-title">Watch Queue</span><span class="tv-queue-title">TV Queue</span></div></div>  <span class="dark-overflow-action-menu">
-    
-    
+
+
     <button onclick=";return false;" class="flip control-bar-button yt-uix-button yt-uix-button-dark-overflow-action-menu yt-uix-button-size-default yt-uix-button-has-icon no-icon-markup yt-uix-button-empty" type="button" aria-label="Actions for the queue" aria-expanded="false" aria-haspopup="true" ><span class="yt-uix-button-arrow yt-sprite"></span><ul class="watch-queue-menu yt-uix-button-menu yt-uix-button-menu-dark-overflow-action-menu hid" role="menu" aria-haspopup="true"><li role="menuitem"><span onclick=";return false;" class="watch-queue-menu-choice overflow-menu-choice yt-uix-button-menu-item" data-action="remove-all" >Remove all</span></li><li role="menuitem"><span onclick=";return false;" class="watch-queue-menu-choice overflow-menu-choice yt-uix-button-menu-item" data-action="disconnect" >Disconnect</span></li></ul></button>
   </span>
   <div class="watch-queue-controls">
@@ -234,7 +234,7 @@ Loading...
   </div>
 </div></div>
     <div id="player-playlist" class="  content-alignment    watch-player-playlist  ">
-          
+
 
     </div>
 
@@ -301,7 +301,7 @@ Loading...
       <div id="watch7-headline" class="clearfix">
     <div id="watch-headline-title">
       <h1 class="yt watch-title-container" >
-        
+
 
   <span id="eow-title" class="watch-title " dir="ltr" title="Kara Tointon (Age-restricted video)">
     Kara Tointon (Age-restricted video)
@@ -327,9 +327,9 @@ Loading...
   <div class="yt-user-info">
     <a href="/channel/UCAX1W4xcZRiDUVjqwBr5x-g" class="yt-uix-sessionlink g-hovercard      spf-link " data-ytid="UCAX1W4xcZRiDUVjqwBr5x-g" data-sessionlink="itct=CAwQ4TkiEwjq3t_a5LvIAhXaVL4KHRUCDPko-B0" >Buzz Rock @MrGreglaw</a>
   </div>
-<span id="watch7-subscription-container"><span class=" yt-uix-button-subscription-container"><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-subscribe-branded yt-uix-button-has-icon no-icon-markup yt-uix-subscription-button yt-can-buffer" type="button" onclick=";return false;" aria-live="polite" aria-busy="false" data-style-type="branded" data-href="https://accounts.google.com/ServiceLogin?continue=http%3A%2F%2Fwww.youtube.com%2Fsignin%3Fhl%3Den%26action_handle_signin%3Dtrue%26feature%3Dsubscribe%26next%3D%252Fchannel%252FUCAX1W4xcZRiDUVjqwBr5x-g%26continue_action%3DQUFFLUhqbDRuRDZfV1N1MzViWl9GTHFFT0I0SXZiMEFpd3xBQ3Jtc0ttTk5tQ19ubENRcUNYV0psSGNOS21wQldrM0NTbUtkR2tOa2ZBR3lnZ0wxdGNjcS02ajVnRmN1bDJ3QkdaX29JcG1IM3RpVG9lQW52WjFzM3ZCMEVaMzVqT09OVElhanI3cVNzc3BxbGpINl9JUmVGQnp0NThVdWtuRmdQby1ZMTU1UnY1d0tpdThneFdKaWp6dHJyeFkzZGJSaEZBMlBNaXVzVnd6aUZoWnVndlJ3T2hPaVhpU3h5SHJBcFNGTTFIQVR5YUdZXzlObWRFX2x6Y2otTWR4Q19VOWN3%26app%3Ddesktop&amp;hl=en&amp;service=youtube&amp;passive=true&amp;uilel=3" data-channel-external-id="UCAX1W4xcZRiDUVjqwBr5x-g" data-clicktracking="itct=CA0QmysiEwjq3t_a5LvIAhXaVL4KHRUCDPko-B0yBXdhdGNo"><span class="yt-uix-button-content"><span class="subscribe-label" aria-label="Subscribe">Subscribe</span><span class="subscribed-label" aria-label="Unsubscribe">Subscribed</span><span class="unsubscribe-label" aria-label="Unsubscribe">Unsubscribe</span></span></button><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-default yt-uix-button-empty yt-uix-button-has-icon yt-uix-subscription-preferences-button" type="button" onclick=";return false;" aria-role="button" aria-live="polite" aria-label="Subscription preferences" aria-busy="false" data-channel-external-id="UCAX1W4xcZRiDUVjqwBr5x-g"><span class="yt-uix-button-icon-wrapper"><span class="yt-uix-button-icon yt-uix-button-icon-subscription-preferences yt-sprite"></span></span></button><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-subscriber-count" title="2,598" aria-label="2,598" tabindex="0">2,598</span><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-short-subscriber-count" title="2K" aria-label="2K" tabindex="0">2K</span>  
+<span id="watch7-subscription-container"><span class=" yt-uix-button-subscription-container"><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-subscribe-branded yt-uix-button-has-icon no-icon-markup yt-uix-subscription-button yt-can-buffer" type="button" onclick=";return false;" aria-live="polite" aria-busy="false" data-style-type="branded" data-href="https://accounts.google.com/ServiceLogin?continue=http%3A%2F%2Fwww.youtube.com%2Fsignin%3Fhl%3Den%26action_handle_signin%3Dtrue%26feature%3Dsubscribe%26next%3D%252Fchannel%252FUCAX1W4xcZRiDUVjqwBr5x-g%26continue_action%3DQUFFLUhqbDRuRDZfV1N1MzViWl9GTHFFT0I0SXZiMEFpd3xBQ3Jtc0ttTk5tQ19ubENRcUNYV0psSGNOS21wQldrM0NTbUtkR2tOa2ZBR3lnZ0wxdGNjcS02ajVnRmN1bDJ3QkdaX29JcG1IM3RpVG9lQW52WjFzM3ZCMEVaMzVqT09OVElhanI3cVNzc3BxbGpINl9JUmVGQnp0NThVdWtuRmdQby1ZMTU1UnY1d0tpdThneFdKaWp6dHJyeFkzZGJSaEZBMlBNaXVzVnd6aUZoWnVndlJ3T2hPaVhpU3h5SHJBcFNGTTFIQVR5YUdZXzlObWRFX2x6Y2otTWR4Q19VOWN3%26app%3Ddesktop&amp;hl=en&amp;service=youtube&amp;passive=true&amp;uilel=3" data-channel-external-id="UCAX1W4xcZRiDUVjqwBr5x-g" data-clicktracking="itct=CA0QmysiEwjq3t_a5LvIAhXaVL4KHRUCDPko-B0yBXdhdGNo"><span class="yt-uix-button-content"><span class="subscribe-label" aria-label="Subscribe">Subscribe</span><span class="subscribed-label" aria-label="Unsubscribe">Subscribed</span><span class="unsubscribe-label" aria-label="Unsubscribe">Unsubscribe</span></span></button><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-default yt-uix-button-empty yt-uix-button-has-icon yt-uix-subscription-preferences-button" type="button" onclick=";return false;" aria-role="button" aria-live="polite" aria-label="Subscription preferences" aria-busy="false" data-channel-external-id="UCAX1W4xcZRiDUVjqwBr5x-g"><span class="yt-uix-button-icon-wrapper"><span class="yt-uix-button-icon yt-uix-button-icon-subscription-preferences yt-sprite"></span></span></button><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-subscriber-count" title="2,598" aria-label="2,598" tabindex="0">2,598</span><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-short-subscriber-count" title="2K" aria-label="2K" tabindex="0">2K</span>
   <div class="yt-uix-overlay "  data-overlay-style="primary" data-overlay-shape="tiny">
-    
+
         <div class="yt-dialog hid ">
     <div class="yt-dialog-base">
       <span class="yt-dialog-align"></span>
@@ -520,7 +520,7 @@ Loading...
     </div>
   </div>
 
-    
+
   <div id="action-panel-rental-required" class="action-panel-content hid">
       <div id="watch-actions-rental-required">
     <strong>Rating is available when the video has been rented.</strong>
@@ -584,8 +584,8 @@ Loading...
           <div class="cmt_iframe_holder" data-href="http://www.youtube.com/watch?v=nzNgkc6t260" data-viewtype="FILTERED" style="display: none;"></div>
 
   <div id="watch-discussion" class="branded-page-box yt-card">
-            
-  
+
+
   <div class="comments-iframe-container">
     <div id="comments-test-iframe"></div>
     <div id="distiller-spinner" class="action-panel-loading">
@@ -613,7 +613,7 @@ Loading...
   <div id="watch7-sidebar-contents" class="watch-sidebar-gutter     yt-card yt-card-has-padding    yt-uix-expander yt-uix-expander-collapsed">
 
     <div id="watch7-sidebar-ads">
-      
+
     </div>
     <div id="watch7-sidebar-modules">
     </div>
@@ -869,7 +869,6 @@ Add to
   yt.setConfig('BLOCK_USER_AJAX_XSRF', 'QUFFLUhqbUVRNm9RcEJoTjBLRmduZE9RRi1fX25pdE4yQXxBQ3Jtc0tub1ZOMUJueXhodlJjVFdrMkU5aEdGa2JjVC1SaTVUZjBEWXRNUWxSdkdoV2ZTcXNCVmt3MnFTclljTExLNU02RmdnaU1Cd0szNlZ2MGlMSHNLUTB0YWVjWjdVWTFSczA1UnNJX3FQYW1GajRyc3J2T2Jpb1VFR28yZ0o0dzZCYVBVWkNuLTlaa0dmSFZKQ3BFaGoyMXpYOTgyUGc=');
 
 
-    
 
 
 
@@ -877,7 +876,8 @@ Add to
 
 
 
-    
+
+
 
       yt.setConfig({
     'GUIDED_HELP_LOCALE': "en_US",
@@ -927,4 +927,4 @@ ytcsi.setSpan('st', 113);yt.setConfig({'CSI_SERVICE_NAME': "youtube",'TIMING_ACT
   });
   yt.setConfig('THUMB_DELAY_LOAD_BUFFER', 0);
 if (window.ytcsi) {window.ytcsi.tick("jl", null, '');}</script>
-</body></html>
+</body></html>

tests/mock_data/youtube_gangnam_style.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html><html lang="en" data-cast-api-enabled="true"><head><style name="www-roboto">@font-face{font-family:'Roboto';font-style:italic;font-weight:400;src:local('Roboto Italic'),local('Roboto-Italic'),url(//fonts.gstatic.com/s/roboto/v15/W4wDsBUluyw0tK3tykhXEfesZW2xOQ-xsNqO47m55DA.ttf)format('truetype');}@font-face{font-family:'Roboto';font-style:italic;font-weight:500;src:local('Roboto Medium Italic'),local('Roboto-MediumItalic'),url(//fonts.gstatic.com/s/roboto/v15/OLffGBTaF0XFOW1gnuHF0Z0EAVxt0G0biEntp43Qt6E.ttf)format('truetype');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:local('Roboto Regular'),local('Roboto-Regular'),url(//fonts.gstatic.com/s/roboto/v15/zN7GBFwfMP4uA6AR0HCoLQ.ttf)format('truetype');}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;src:local('Roboto Medium'),local('Roboto-Medium'),url(//fonts.gstatic.com/s/roboto/v15/RxZJdnzeo3R5zSexge8UUaCWcynf_cDxXwCLxiixG1c.ttf)format('truetype');}</style><script name="www-roboto">if (document.fonts && document.fonts.load) {document.fonts.load("400 10pt Roboto", "E");document.fonts.load("500 10pt Roboto", "E");}</script><script>var ytcsi = {gt: function(n) {n = (n || '') + 'data_';return ytcsi[n] || (ytcsi[n] = {tick: {},span: {},info: {}});},tick: function(l, t, n) {ytcsi.gt(n).tick[l] = t || +new Date();},span: function(l, s, e, n) {ytcsi.gt(n).span[l] = (e ? e : +new Date()) - ytcsi.gt(n).tick[s];},setSpan: function(l, s, n) {ytcsi.gt(n).span[l] = s;},info: function(k, v, n) {ytcsi.gt(n).info[k] = v;},setStart: function(s, t, n) {ytcsi.info('yt_sts', s, n);ytcsi.tick('_start', t, n);}};(function(w, d) {ytcsi.perf = w.performance || w.mozPerformance ||w.msPerformance || w.webkitPerformance;ytcsi.setStart('dhs', ytcsi.perf ? ytcsi.perf.timing.responseStart : null);var isPrerender = (d.visibilityState || d.webkitVisibilityState) == 'prerender';var vName = d.webkitVisibilityState ? 'webkitvisibilitychange' : 'visibilitychange';if (isPrerender) {ytcsi.info('prerender', 1);var startTick = function() {ytcsi.setStart('dhs');d.removeEventListener(vName, startTick);};d.addEventListener(vName, startTick, false);}if (d.addEventListener) {d.addEventListener(vName, function() {ytcsi.tick('vc');}, false);}})(window, document);</script><script>var ytcfg = {d: function() {return (window.yt && yt.config_) || ytcfg.data_ || (ytcfg.data_ = {});},get: function(k, o) {return (k in ytcfg.d()) ? ytcfg.d()[k] : o;},set: function() {var a = arguments;if (a.length > 1) {ytcfg.d()[a[0]] = a[1];} else {for (var k in a[0]) {ytcfg.d()[k] = a[0][k];}}}};</script>  <script>ytcfg.set("LACT", null);</script>
-  
+
 
 
 
@@ -27,7 +27,7 @@ var m=["yt","www","masthead","sizing","runBeforeBodyIsReady"],n=this;m[0]in n||!
       <link rel="stylesheet" href="//s.ytimg.com/yts/cssbin/www-player-new-vfliB0u8F.css" name="www-player">
 
   <link rel="stylesheet" href="//s.ytimg.com/yts/cssbin/www-pageframe-vfly1fQ8j.css" name="www-pageframe">
-  
+
       <script>ytimg.preload("https:\/\/r5---sn-ab5l6nle.googlevideo.com\/crossdomain.xml");ytimg.preload("https:\/\/r5---sn-ab5l6nle.googlevideo.com\/generate_204");</script>
 
 
@@ -109,9 +109,9 @@ var m=["yt","www","masthead","sizing","runBeforeBodyIsReady"],n=this;m[0]in n||!
       <meta name="twitter:player:width" content="1280">
       <meta name="twitter:player:height" content="720">
 
-      <meta name=attribution content=ygent/>  
+      <meta name=attribution content=ygent/>
 <style>li.mc-channel-permission-present { width: 100%; } .exp-responsive #content .yt-uix-button-subscription-container .yt-short-subscriber-count {display: inline-block;}.exp-responsive #content .yt-uix-button-subscription-container .yt-subscriber-count {display: none;}@media only screen and (min-width: 850px) {.exp-responsive #content .yt-uix-button-subscription-container .yt-short-subscriber-count {display: none;}.exp-responsive #content .yt-uix-button-subscription-container .yt-subscriber-count {display: inline-block;}}</style></head>  <body dir="ltr" id="body" class="  ltr    exp-hamburglar exp-responsive exp-scrollable-guide exp-watch-controls-overlay   site-center-aligned site-as-giant-card appbar-hidden     not-nirvana-dogfood  not-yt-legacy-css      flex-width-enabled      flex-width-enabled-snap    delayed-frame-styles-not-in  " data-spf-name="watch">
-<div id="early-body"></div><div id="body-container"><div id="a11y-announcements-container" role="alert"><div id="a11y-announcements-message"></div></div><form name="logoutForm" method="POST" action="/logout"><input type="hidden" name="action_logout" value="1"></form><div id="masthead-positioner">    
+<div id="early-body"></div><div id="body-container"><div id="a11y-announcements-container" role="alert"><div id="a11y-announcements-message"></div></div><form name="logoutForm" method="POST" action="/logout"><input type="hidden" name="action_logout" value="1"></form><div id="masthead-positioner">
   <div id="yt-masthead-container" class="clearfix yt-base-gutter">  <button id="a11y-skip-nav" class="skip-nav" data-target-id="main" tabindex="3">
 Skip navigation
   </button>
@@ -141,7 +141,7 @@ Loading...
     </div>
   </div>
 
-</div><div class="alerts-wrapper"><div id="alerts" class="content-alignment">    
+</div><div class="alerts-wrapper"><div id="alerts" class="content-alignment">
   <div id="editor-progress-alert-container"></div>
   <div class="yt-alert yt-alert-default yt-alert-warn hid " id="editor-progress-alert-template">  <div class="yt-alert-icon">
     <span class="icon master-sprite yt-sprite"></span>
@@ -181,8 +181,8 @@ Loading...
 
 
     <div id="watch-queue-mole" class="video-mole mole-collapsed hid"><div id="watch-queue" class="watch-playlist player-height"><div class="main-content"><div class="watch-queue-header"><div class="watch-queue-info"><div class="watch-queue-info-icon"><span class="tv-queue-list-icon yt-sprite"></span></div><h3 class="watch-queue-title">Watch Queue</h3><h3 class="tv-queue-title">TV Queue</h3><span class="tv-queue-details"></span></div><div class="watch-queue-control-bar control-bar-button"><div class="watch-queue-mole-info"><div class="watch-queue-control-bar-icon"><span class="watch-queue-icon yt-sprite"></span></div><div class="watch-queue-title-container"><span class="watch-queue-count"></span><span class="watch-queue-title">Watch Queue</span><span class="tv-queue-title">TV Queue</span></div></div>  <span class="dark-overflow-action-menu">
-    
-    
+
+
     <button class="flip control-bar-button yt-uix-button yt-uix-button-dark-overflow-action-menu yt-uix-button-size-default yt-uix-button-has-icon no-icon-markup yt-uix-button-empty" type="button" aria-expanded="false" aria-label="Actions for the queue" aria-haspopup="true" onclick=";return false;" ><span class="yt-uix-button-arrow yt-sprite"></span><ul class="watch-queue-menu yt-uix-button-menu yt-uix-button-menu-dark-overflow-action-menu hid" role="menu" aria-haspopup="true"><li role="menuitem"><span class="watch-queue-menu-choice overflow-menu-choice yt-uix-button-menu-item" data-action="remove-all" onclick=";return false;" >Remove all</span></li><li role="menuitem"><span class="watch-queue-menu-choice overflow-menu-choice yt-uix-button-menu-item" data-action="disconnect" onclick=";return false;" >Disconnect</span></li></ul></button>
   </span>
   <div class="watch-queue-controls">
@@ -227,7 +227,7 @@ Loading...
   </div>
 </div></div>
     <div id="player-playlist" class="  content-alignment    watch-player-playlist  ">
-              
+
 
   <div id="watch-appbar-playlist" class="watch-playlist player-height">
     <div class="main-content">
@@ -235,7 +235,7 @@ Loading...
         <div class="playlist-header-content" data-loop-auto-clicktracking="CBUQ0TkiEwiNqZGumqrIAhUGJb4KHXvMC80o-B0yCGF1dG9wbGF5" data-initial-loop-state="false" data-list-author="" data-full-list-id="PLirAqAtl_h2r5g8xGajEwdXd3x1sZh8hC" data-shuffle-auto-clicktracking="CBUQ0TkiEwiNqZGumqrIAhUGJb4KHXvMC80o-B0yCGF1dG9wbGF5" data-normal-auto-clicktracking="CBUQ0TkiEwiNqZGumqrIAhUGJb4KHXvMC80o-B0yCGF1dG9wbGF5" data-loop_shuffle-auto-clicktracking="CBUQ0TkiEwiNqZGumqrIAhUGJb4KHXvMC80o-B0yCGF1dG9wbGF5" data-shareable="True" data-list-title="Most Viewed Videos of All Time・(Over 100 million views)">
           <div class="appbar-playlist-controls clearfix">
 
-              
+
 
     <span class="yt-uix-clickcard">
       <span class="yt-uix-clickcard-target" data-position="bottomright" data-orientation="vertical">
@@ -244,7 +244,7 @@ Loading...
       <div class="signin-clickcard yt-uix-clickcard-content">
     <h3 class="signin-clickcard-header">Sign in to YouTube</h3>
     <div class="signin-clickcard-message">
-      
+
     </div>
     <a href="https://accounts.google.com/ServiceLogin?passive=true&amp;continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Faction_handle_signin%3Dtrue%26app%3Ddesktop%26feature%3D__FEATURE__%26next%3D%252Fwatch%253Fv%253D9bZkp7q19f0%2526list%253DPLirAqAtl_h2r5g8xGajEwdXd3x1sZh8hC%2526index%253D1%26hl%3Den&amp;hl=en&amp;uilel=3&amp;service=youtube" class="yt-uix-button  signin-button yt-uix-sessionlink yt-uix-button-primary yt-uix-button-size-default" data-sessionlink="ei=4NURVo25LIbK-AX7mK_oDA"><span class="yt-uix-button-content">Sign in</span></a>
   </div>
@@ -5762,7 +5762,7 @@ Loading...
       <div id="watch7-headline" class="clearfix">
     <div id="watch-headline-title">
       <h1 class="yt watch-title-container" >
-        
+
 
   <span id="eow-title" class="watch-title " dir="ltr" title="PSY - GANGNAM STYLE(강남스타일) M/V">
     PSY - GANGNAM STYLE(강남스타일) M/V
@@ -5787,12 +5787,12 @@ Loading...
   </a>
   <div class="yt-user-info">
     <a href="/channel/UCrDkAvwZum-UTjHmzDI2iIw" class="yt-uix-sessionlink g-hovercard      spf-link " data-ytid="UCrDkAvwZum-UTjHmzDI2iIw" data-sessionlink="itct=CPsBEOE5IhMIjamRrpqqyAIVBiW-Ch17zAvNKPgd" >officialpsy</a>
-       
+
       <span aria-label="Verified" class="yt-channel-title-icon-verified yt-uix-tooltip yt-sprite" data-tooltip-text="Verified"></span>
   </div>
-<span id="watch7-subscription-container"><span class=" yt-uix-button-subscription-container"><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-subscribe-branded yt-uix-button-has-icon no-icon-markup yt-uix-subscription-button yt-can-buffer" type="button" onclick=";return false;" aria-live="polite" aria-busy="false" data-channel-external-id="UCrDkAvwZum-UTjHmzDI2iIw" data-href="https://accounts.google.com/ServiceLogin?passive=true&amp;continue=http%3A%2F%2Fwww.youtube.com%2Fsignin%3Fapp%3Ddesktop%26feature%3Dsubscribe%26action_handle_signin%3Dtrue%26next%3D%252Fchannel%252FUCrDkAvwZum-UTjHmzDI2iIw%26continue_action%3DQUFFLUhqbTVxeGwyWktCZGRuQlNjczRTTW9OT3Y4aE85QXxBQ3Jtc0ttZGJCOW1URzZoLUQ1YTR1R2NIR09NcTN3NmJKeXU4SnAwS3FSeU9VWkNkSVpTc185cU91dklGejNoU0hHbWVwOEJEQzlsYnBDMDRiZFcxTTV4SGVxQnByY2xXV2lUWjV4SjBPNFhPNjBZMV85OFlRSHl6aU1IRkxUSkxwdGF2NElDa3ktNVhELVZqZmU5dTFOaFBDT1hCLU9OanFXV2JLWkFvcjhWT09TU05kYm9MNnhNZ3BnUmlJd1JfUDVCU09jUG5CdTh0RFR1TG1JeGFDdWFxcEJPQ0JudEJR%26hl%3Den&amp;hl=en&amp;uilel=3&amp;service=youtube" data-style-type="branded" data-clicktracking="itct=CPwBEJsrIhMIjamRrpqqyAIVBiW-Ch17zAvNKPgdMgV3YXRjaA"><span class="yt-uix-button-content"><span class="subscribe-label" aria-label="Subscribe">Subscribe</span><span class="subscribed-label" aria-label="Unsubscribe">Subscribed</span><span class="unsubscribe-label" aria-label="Unsubscribe">Unsubscribe</span></span></button><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-default yt-uix-button-empty yt-uix-button-has-icon yt-uix-subscription-preferences-button" type="button" onclick=";return false;" aria-role="button" aria-label="Subscription preferences" aria-live="polite" aria-busy="false" data-channel-external-id="UCrDkAvwZum-UTjHmzDI2iIw"><span class="yt-uix-button-icon-wrapper"><span class="yt-uix-button-icon yt-uix-button-icon-subscription-preferences yt-sprite"></span></span></button><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-subscriber-count" title="8,185,162" aria-label="8,185,162" tabindex="0">8,185,162</span><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-short-subscriber-count" title="8M" aria-label="8M" tabindex="0">8M</span>  
+<span id="watch7-subscription-container"><span class=" yt-uix-button-subscription-container"><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-subscribe-branded yt-uix-button-has-icon no-icon-markup yt-uix-subscription-button yt-can-buffer" type="button" onclick=";return false;" aria-live="polite" aria-busy="false" data-channel-external-id="UCrDkAvwZum-UTjHmzDI2iIw" data-href="https://accounts.google.com/ServiceLogin?passive=true&amp;continue=http%3A%2F%2Fwww.youtube.com%2Fsignin%3Fapp%3Ddesktop%26feature%3Dsubscribe%26action_handle_signin%3Dtrue%26next%3D%252Fchannel%252FUCrDkAvwZum-UTjHmzDI2iIw%26continue_action%3DQUFFLUhqbTVxeGwyWktCZGRuQlNjczRTTW9OT3Y4aE85QXxBQ3Jtc0ttZGJCOW1URzZoLUQ1YTR1R2NIR09NcTN3NmJKeXU4SnAwS3FSeU9VWkNkSVpTc185cU91dklGejNoU0hHbWVwOEJEQzlsYnBDMDRiZFcxTTV4SGVxQnByY2xXV2lUWjV4SjBPNFhPNjBZMV85OFlRSHl6aU1IRkxUSkxwdGF2NElDa3ktNVhELVZqZmU5dTFOaFBDT1hCLU9OanFXV2JLWkFvcjhWT09TU05kYm9MNnhNZ3BnUmlJd1JfUDVCU09jUG5CdTh0RFR1TG1JeGFDdWFxcEJPQ0JudEJR%26hl%3Den&amp;hl=en&amp;uilel=3&amp;service=youtube" data-style-type="branded" data-clicktracking="itct=CPwBEJsrIhMIjamRrpqqyAIVBiW-Ch17zAvNKPgdMgV3YXRjaA"><span class="yt-uix-button-content"><span class="subscribe-label" aria-label="Subscribe">Subscribe</span><span class="subscribed-label" aria-label="Unsubscribe">Subscribed</span><span class="unsubscribe-label" aria-label="Unsubscribe">Unsubscribe</span></span></button><button class="yt-uix-button yt-uix-button-size-default yt-uix-button-default yt-uix-button-empty yt-uix-button-has-icon yt-uix-subscription-preferences-button" type="button" onclick=";return false;" aria-role="button" aria-label="Subscription preferences" aria-live="polite" aria-busy="false" data-channel-external-id="UCrDkAvwZum-UTjHmzDI2iIw"><span class="yt-uix-button-icon-wrapper"><span class="yt-uix-button-icon yt-uix-button-icon-subscription-preferences yt-sprite"></span></span></button><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-subscriber-count" title="8,185,162" aria-label="8,185,162" tabindex="0">8,185,162</span><span class="yt-subscription-button-subscriber-count-branded-horizontal yt-short-subscriber-count" title="8M" aria-label="8M" tabindex="0">8M</span>
   <div class="yt-uix-overlay "  data-overlay-style="primary" data-overlay-shape="tiny">
-    
+
         <div class="yt-dialog hid ">
     <div class="yt-dialog-base">
       <span class="yt-dialog-align"></span>
@@ -5983,7 +5983,7 @@ Loading...
     </div>
   </div>
 
-    
+
   <div id="action-panel-rental-required" class="action-panel-content hid">
       <div id="watch-actions-rental-required">
     <strong>Rating is available when the video has been rented.</strong>
@@ -6038,8 +6038,8 @@ Loading...
           <div class="cmt_iframe_holder" data-href="http://www.youtube.com/watch?v=9bZkp7q19f0&amp;list=PLirAqAtl_h2r5g8xGajEwdXd3x1sZh8hC&amp;index=1" data-viewtype="FILTERED" style="display: none;"></div>
 
   <div id="watch-discussion" class="branded-page-box yt-card">
-            
-  
+
+
   <div class="comments-iframe-container">
     <div id="comments-test-iframe"></div>
     <div id="distiller-spinner" class="action-panel-loading">
@@ -6066,7 +6066,7 @@ Loading...
 
   <div id="watch7-sidebar-contents" class="watch-sidebar-gutter     yt-card yt-card-has-padding    yt-uix-expander yt-uix-expander-collapsed">
       <div id="watch7-sidebar-offer">
-        
+
       </div>
 
     <div id="watch7-sidebar-ads">
@@ -6081,13 +6081,13 @@ Advertisement
 
     </div>
     <div id="watch7-sidebar-modules">
-        
+
           <div class="watch-sidebar-section">
     <div class="watch-sidebar-body">
       <ul id="watch-related" class="video-list">
             <li class="video-list-item related-list-item  show-video-time related-list-item-compact-radio"><a href="/watch?v=9bZkp7q19f0&amp;list=RD9bZkp7q19f0" class="yt-uix-sessionlink related-playlist yt-pl-thumb-link spf-link  mix-playlist resumable-list       spf-link " data-sessionlink="itct=CPQBEKMwGAAiEwiNqZGumqrIAhUGJb4KHXvMC80o-B0yCmxpc3Rfb3RoZXJI_evX1fuUmdv1AQ" data-secondary-video-url="/watch?v=ASO_zypdnsQ&amp;list=RD9bZkp7q19f0" rel="spf-prefetch">
   <span class="yt-pl-thumb  is-small yt-mix-thumb">
-      
+
     <span class="video-thumb  yt-thumb yt-thumb-120"
     >
     <span class="yt-thumb-default">
@@ -6878,7 +6878,6 @@ Add to
   yt.setConfig('BLOCK_USER_AJAX_XSRF', 'QUFFLUhqbUdSQlg1RlhVR25uSkotc21PX2xva2trNEx0Z3xBQ3Jtc0trdGgyeFFGUUR2Vzhua0xNVW9sMWNUOGVFTXBXRGxrTFVHOFktYzV4T2xUcDNzU2RkUngxSWl6cEwyN0lNM1pacXVYdzBWMXVEWXNlRjFQRVd0QkJFaFliV0J0OHMzOXJtWFFnWmR3cGpNdUtFWEFybmpFNVZvNUdMaktQNjc3U2hkbmhVMWg1QjlCNmJSem5jRWYySTRIY2tldFE=');
 
 
-    
 
 
 
@@ -6886,7 +6885,8 @@ Add to
 
 
 
-    
+
+
 
       yt.setConfig({
     'GUIDED_HELP_LOCALE': "en_US",
@@ -6936,4 +6936,4 @@ ytcsi.setSpan('st', 783);yt.setConfig({'CSI_SERVICE_NAME': "youtube",'TIMING_ACT
   });
   yt.setConfig('THUMB_DELAY_LOAD_BUFFER', 0);
 if (window.ytcsi) {window.ytcsi.tick("jl", null, '');}</script>
-</body></html>
+</body></html>

tests/requirements.txt

@@ -1,4 +1,5 @@
+bumpversion==0.5.3
+coveralls==1.0
 mock==1.3.0
 nose==1.3.7
-coveralls==1.0
-bumpversion==0.5.3
+pre-commit==0.15.0

tests/test_p3_pytube.py

@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-import warnings
-import mock
-from nose.tools import eq_, raises
-from pytube import api
-from pytube.exceptions import MultipleObjectsReturned, AgeRestricted, \
-    DoesNotExist, PytubeError
-
-
-class TestPytube(object):
-    def setUp(self):
-        self.url = 'http://www.youtube.com/watch?v=9bZkp7q19f0'
-
-    def test_YT_create_from_url(self):
-        'test creation of YouYube Object from url'
-        yt = api.YouTube(self.url)

tests/test_pytube.py

@@ -1,12 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import warnings
+
 import mock
-from nose.tools import eq_, raises
+from nose.tools import eq_
+from nose.tools import raises
+
 from pytube import api
-from pytube.exceptions import MultipleObjectsReturned, AgeRestricted, \
-    DoesNotExist, PytubeError
+from pytube.exceptions import AgeRestricted
+from pytube.exceptions import DoesNotExist
+from pytube.exceptions import MultipleObjectsReturned
+from pytube.exceptions import PytubeError
 
 
 class TestPytube(object):
@@ -99,7 +105,7 @@ class TestPytube(object):
         """Deprecation warnings get triggered on url set"""
         with warnings.catch_warnings(record=True) as w:
             # Cause all warnings to always be triggered.
-            warnings.simplefilter("always")
+            warnings.simplefilter('always')
             with mock.patch('pytube.api.urlopen') as urlopen:
                 urlopen.return_value.read.return_value = self.mock_html
                 yt = api.YouTube()
@@ -111,7 +117,7 @@ class TestPytube(object):
         """Deprecation warnings get triggered on filename set"""
         with warnings.catch_warnings(record=True) as w:
             # Cause all warnings to always be triggered.
-            warnings.simplefilter("always")
+            warnings.simplefilter('always')
             self.yt.filename = 'Gangnam Style'
             eq_(len(w), 1)
 
@@ -119,7 +125,7 @@ class TestPytube(object):
         """Deprecation warnings get triggered on video getter"""
         with warnings.catch_warnings(record=True) as w:
             # Cause all warnings to always be triggered.
-            warnings.simplefilter("always")
+            warnings.simplefilter('always')
             self.yt.videos
             eq_(len(w), 1)
 
@@ -132,9 +138,3 @@ class TestPytube(object):
     def test_get_json_offset_with_bad_html(self):
         """Raise exception if json offset cannot be found"""
         self.yt._get_json_offset('asdfasdf')
-
-    def test_YT_create_from_url(self):
-        'test creation of YouYube Object from url'
-        url = 'http://www.youtube.com/watch?v=9bZkp7q19f0'
-
-        yt = api.YouTube(url)

tests/test_utils.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from nose.tools import eq_
+
 from pytube import utils
 
 
 class TestUtils(object):
-    blob = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+    blob = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit'
 
     def test_truncate(self):
         """Truncate string works as expected"""
@@ -15,10 +17,10 @@ class TestUtils(object):
 
     def test_safe_filename(self):
         """Unsafe characters get stripped from generated filename"""
-        eq_(utils.safe_filename("abc1245$$"), "abc1245")
-        eq_(utils.safe_filename("abc##"), "abc")
-        eq_(utils.safe_filename("abc:foo"), "abc -foo")
-        eq_(utils.safe_filename("abc_foo"), "abc foo")
+        eq_(utils.safe_filename('abc1245$$'), 'abc1245')
+        eq_(utils.safe_filename('abc##'), 'abc')
+        eq_(utils.safe_filename('abc:foo'), 'abc -foo')
+        eq_(utils.safe_filename('abc_foo'), 'abc foo')
 
     def test_sizeof(self):
         """Accurately converts the bytes to its humanized equivalent"""