2.7 compat
Browse files- pytube/compat.py +20 -0
- pytube/extract.py +3 -3
- pytube/mixins.py +2 -3
- pytube/request.py +1 -1
pytube/compat.py
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/usr/bin/env python
|
2 |
+
# -*- coding: utf-8 -*-
|
3 |
+
# flake8: noqa
|
4 |
+
import sys
|
5 |
+
|
6 |
+
python_version = sys.version_info[0]
|
7 |
+
|
8 |
+
if python_version == 2:
|
9 |
+
from urllib import urlencode
|
10 |
+
from urllib2 import quote
|
11 |
+
from urllib2 import unquote
|
12 |
+
from urllib2 import urlopen
|
13 |
+
from urlparse import parse_qsl
|
14 |
+
|
15 |
+
elif python_version == 3:
|
16 |
+
from urllib.parse import parse_qsl
|
17 |
+
from urllib.parse import quote
|
18 |
+
from urllib.parse import unquote
|
19 |
+
from urllib.parse import urlencode
|
20 |
+
from urllib.request import urlopen
|
pytube/extract.py
CHANGED
@@ -6,10 +6,10 @@ pytube.extract
|
|
6 |
"""
|
7 |
import json
|
8 |
import re
|
9 |
-
from urllib.parse import parse_qsl
|
10 |
-
from urllib.parse import quote
|
11 |
-
from urllib.parse import urlencode
|
12 |
|
|
|
|
|
|
|
13 |
from pytube.helpers import memoize
|
14 |
|
15 |
|
|
|
6 |
"""
|
7 |
import json
|
8 |
import re
|
|
|
|
|
|
|
9 |
|
10 |
+
from pytube.compat import parse_qsl
|
11 |
+
from pytube.compat import quote
|
12 |
+
from pytube.compat import urlencode
|
13 |
from pytube.helpers import memoize
|
14 |
|
15 |
|
pytube/mixins.py
CHANGED
@@ -4,10 +4,9 @@ pytube.mixins
|
|
4 |
~~~~~~~~~~~~~
|
5 |
|
6 |
"""
|
7 |
-
from urllib.parse import parse_qsl
|
8 |
-
from urllib.parse import unquote
|
9 |
-
|
10 |
from pytube import cipher
|
|
|
|
|
11 |
|
12 |
|
13 |
def apply_signature(video_info, fmt, js):
|
|
|
4 |
~~~~~~~~~~~~~
|
5 |
|
6 |
"""
|
|
|
|
|
|
|
7 |
from pytube import cipher
|
8 |
+
from pytube.compat import parse_qsl
|
9 |
+
from pytube.compat import unquote
|
10 |
|
11 |
|
12 |
def apply_signature(video_info, fmt, js):
|
pytube/request.py
CHANGED
@@ -5,7 +5,7 @@ pytube.request
|
|
5 |
|
6 |
Implements a simple wrapper around urlopen.
|
7 |
"""
|
8 |
-
from
|
9 |
|
10 |
|
11 |
def get(url, headers=False, streaming=False, chunk_size=8 * 1024):
|
|
|
5 |
|
6 |
Implements a simple wrapper around urlopen.
|
7 |
"""
|
8 |
+
from pytube.compat import urlopen
|
9 |
|
10 |
|
11 |
def get(url, headers=False, streaming=False, chunk_size=8 * 1024):
|