PEP8

pytube/__init__.py

@@ -5,3 +5,4 @@ __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 Nick Ficano'
 
 from .api import YouTube
+YouTube

pytube/api.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from .exceptions import MultipleObjectsReturned, YouTubeError, CipherError
-from .tinyjs import * # TODO: get rid of tinyjs ugghhh
+from .tinyjs import JSVM
 from .models import Video
 from .utils import safe_filename
 try:
@@ -146,7 +146,7 @@ class YouTube(object):
             return result[0]
         else:
             raise MultipleObjectsReturned(
-              "get() returned more than one object")
+                "get() returned more than one object")
 
     def filter(self, extension=None, resolution=None):
         """Return a filtered list of videos given an extention and resolution
@@ -257,7 +257,7 @@ class YouTube(object):
                 is_vevo = True
 
             stream_map = self._parse_stream_map(
-              data["args"]["url_encoded_fmt_stream_map"])
+                data["args"]["url_encoded_fmt_stream_map"])
 
             self.title = data["args"]["title"]
             js_url = "http:" + data["assets"]["js"]
@@ -275,16 +275,17 @@ class YouTube(object):
                         has_decrypted_signature = False
                         try:
                             signature = self._decrypt_signature(
-                              stream_map['s'][0])
+                                stream_map['s'][0])
                             url += '&signature=' + signature
                             has_decrypted_signature = True
                         except TypeError, e:
                             pass
 
                         if not has_decrypted_signature:
-                            raise CipherError("Couldn't cipher the signature. "
-                              "Maybe YouTube has changed the cipher "
-                              "algorithm. Notify this issue on GitHub")
+                            raise CipherError(
+                                "Couldn't cipher the signature. "
+                                "Maybe YouTube has changed the cipher "
+                                "algorithm. Notify this issue on GitHub")
 
                     else:
                         signature = self._cipher(stream_map["s"][i], js_url)
@@ -315,7 +316,8 @@ class YouTube(object):
         return "".join(a)
 
     def _cipher(self, s, url):
-        """Get the signature using the cipher implemented in the JavaScript code
+        """Get the signature using the cipher
+        implemented in the JavaScript code
 
         :params s: Signature
         :params url: url of JavaScript file

pytube/models.py

@@ -104,8 +104,11 @@ class Video(object):
 
     def __repr__(self):
         """A cleaner representation of the class instance."""
-        return "<Video: {0} (.{1}) - {2} - {3}>".format(self.video_codec, self.extension,
-                                                        self.resolution, self.profile)
+        return "<Video: {0} (.{1}) - {2} - {3}>".format(
+            self.video_codec,
+            self.extension,
+            self.resolution,
+            self.profile)
 
     def __lt__(self, other):
         if type(other) == Video:

pytube/tinyjs.py

@@ -1,5 +1,6 @@
 import re
 
+
 class JSVM(object):
 
     _memory = {}
@@ -9,13 +10,31 @@ class JSVM(object):
     def __init__(self, code=""):
         # TODO: parse automatically the 'swap' method
         # function Bn(a,b){var c=a[0];a[0]=a[b%a.length];a[b]=c;return a};
-        def _swap(args): a = list(args[0]); b = int(args[1]); c = a[0]; a[0] = a[b % len(a)]; a[b] = c; return "".join(a)
-        def _split(args): return ""
-        def _slice(args): return args[0][int(args[1]):]
-        def _reverse(args): return args[0][::-1]
-        def _join(args): return "".join(args[0])
-        def _assign(args): return args[0]
-        def _get(args): return self._memory[args[0]]
+        def _swap(args):
+            a = list(args[0])
+            b = int(args[1])
+            c = a[0]
+            a[0] = a[b % len(a)]
+            a[b] = c
+            return "".join(a)
+
+        def _split(args):
+            return ""
+
+        def _slice(args):
+            return args[0][int(args[1]):]
+
+        def _reverse(args):
+            return args[0][::-1]
+
+        def _join(args):
+            return "".join(args[0])
+
+        def _assign(args):
+            return args[0]
+
+        def _get(args):
+            return self._memory[args[0]]
 
         self._js_methods = {
             "split": _split,
@@ -38,17 +57,17 @@ class JSVM(object):
             #print instruction
             var, method = instruction.split("=")
             m = regex.match(method)
-            if m == None:
+            if m is None:
                 arguments = [method[1:-1]]
                 method = "$assign"
             else:
                 m = m.groups()
                 #print m
                 arguments = []
-                pre_args = [m[0][:-1]] if m[0] != None else []
+                pre_args = [m[0][:-1]] if m[0] is not None else []
                 pre_args += m[2].split(",")
                 for a in pre_args:
-                    if a == None or a == "":
+                    if a is None or a == "":
                         continue
                     # Replace variables with his value
                     arguments += [JSMethod(self._js_methods["$get"], a) if not a[0] == '"' and not a[0] == '' and not a.isdigit() else a]
@@ -68,6 +87,7 @@ class JSVM(object):
             self._memory[ins[0]] = ins[1].run()
         return self._memory
 
+
 class JSMethod(object):
 
     def __init__(self, method, args):
@@ -75,8 +95,8 @@ class JSMethod(object):
         self._a = args
 
     def run(self):
-        args = [arg.run() if isinstance(arg, JSMethod) else arg for arg in self._a]
+        args = [a.run() if isinstance(a, JSMethod) else a for a in self._a]
         return self._m(args)
 
     def __repr__(self):
-        return "%s(%s)" % (self._m.__name__, self._a)
+        return "%s(%s)" % (self._m.__name__, self._a)

pytube/utils.py

@@ -79,7 +79,7 @@ def print_status(progress, file_size, start):
 
     percentDone = int(progress) * 100. / file_size
     done = int(50 * progress / int(file_size))
-    stdout.write("\r  [%s%s][%3.2f%%] %s at %s/s\r " % ('=' * done, ' ' *
-        (50 - done), percentDone, sizeof(file_size), sizeof(
-          progress // (clock() - start))))
+    stdout.write("\r  [%s%s][%3.2f%%] %s at %s/s\r " %
+                ('=' * done, ' ' * (50 - done), percentDone, sizeof(file_size),
+                    sizeof(progress // (clock() - start))))
     stdout.flush()