Merge branch 'KeluDiao-master'

* KeluDiao-master:
pep8/cleanup
Changed the coditioning
No bug in previous version
test travis ci
Delete batch.py
Fixed a bug
Create batch.py
Added python 3 compatibility

pytube/api.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
 import json
 import logging
 import re
@@ -38,13 +37,13 @@ YT_QUALITY_PROFILES = {
 
 # The keys corresponding to the quality/codec map above.
 YT_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"
 )
 
 
@@ -85,9 +84,9 @@ class YouTube(object):
     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()
 
@@ -183,8 +182,8 @@ class YouTube(object):
             # 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...')
+                log.debug("signature not in url, attempting to resolve the "
+                          "cipher.")
                 signature = self._get_cipher(stream_map["s"][idx], js_url)
                 url = "{0}&signature={1}".format(url, signature)
             self._add_video(url, self.filename, **quality_profile)
@@ -255,7 +254,12 @@ class YouTube(object):
             raise PytubeError("Unable to open url: {0}".format(self.url))
 
         html = response.read()
-        if "og:restrictions:age" in html:
+        if isinstance(html, str):
+            restriction_pattern = "og:restrictions:age"
+        else:
+            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.")
 
@@ -266,7 +270,7 @@ class YouTube(object):
         # 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(
+        json_object["args"]["stream_map"] = self._parse_stream_map(
             encoded_stream_map)
         return json_object
 
@@ -298,7 +302,7 @@ class YouTube(object):
             for kv in video:
                 key, value = kv.split("=")
                 dct.get(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):
@@ -308,13 +312,26 @@ class YouTube(object):
             The raw html of the page.
         """
         # 18 represents the length of "ytplayer.config = ".
-        start = html.find("ytplayer.config = ") + 18
+        if isinstance(html, str):
+            json_start_pattern = "ytplayer.config = "
+        else:
+            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.")
+        start = pattern_idx + 18
         html = html[start:]
 
         offset = self._get_json_offset(html)
         if not offset:
             raise PytubeError("Unable to extract json.")
-        return json.loads(html[:offset])
+        if isinstance(html, str):
+            json_content = json.loads(html[:offset])
+        else:
+            json_content = json.loads(html[:offset].decode("utf-8"))
+
+        return json_content
 
     def _get_json_offset(self, html):
         """Find where the json object starts.
@@ -322,16 +339,18 @@ class YouTube(object):
         :param str html:
             The raw html of the YouTube page.
         """
-        brackets = []
+        unmatched_brackets_num = 0
         index = 1
         # Determine the offset by pushing/popping brackets until all
         # js expressions are closed.
         for idx, ch in enumerate(html):
+            if isinstance(ch, int):
+                ch = chr(ch)
             if ch == "{":
-                brackets.append("}")
+                unmatched_brackets_num += 1
             elif ch == "}":
-                brackets.pop()
-                if len(brackets) == 0:
+                unmatched_brackets_num -= 1
+                if unmatched_brackets_num == 0:
                     break
         else:
             raise PytubeError("Unable to determine json offset.")