drop support for python 2 and 3.4

.travis.yml

@@ -3,13 +3,9 @@ cache:
   - apt
   - pip
 python:
-  - "2.7"
-  - "3.4"
   - "3.5"
-  - "3.5-dev"  # 3.5 development branch
   - "3.6"
-  - "3.6-dev"  # 3.6 development branch
-  - "3.7-dev"  # 3.7 development branch
+  - "3.7"
 install: "make"
 script:
   - make ci
@@ -19,4 +15,4 @@ sudo: false
 after_success:
   coveralls
 notifications:
-  slack: watchcloud:rNoT5kJJakPqwLSKuev6oa4C
+#  slack: watchcloud:rNoT5kJJakPqwLSKuev6oa4C

Pipfile

@@ -21,4 +21,4 @@ twine = "*"
 more-itertools = "==5.0.0"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"

docs/api.rst

@@ -65,12 +65,6 @@ Mixins
 .. automodule:: pytube.mixins
     :members:
 
-Compat
-------
-
-.. automodule:: pytube.compat
-    :members:
-
 
 Helpers
 -------

pytube/__main__.py

@@ -11,6 +11,7 @@ from __future__ import absolute_import
 
 import json
 import logging
+from urllib.parse import parse_qsl
 
 from pytube import Caption
 from pytube import CaptionQuery
@@ -19,8 +20,7 @@ from pytube import mixins
 from pytube import request
 from pytube import Stream
 from pytube import StreamQuery
-from pytube.compat import install_proxy
-from pytube.compat import parse_qsl
+from pytube.mixins import install_proxy
 from pytube.exceptions import VideoUnavailable
 from pytube.helpers import apply_mixin
 

pytube/captions.py

@@ -5,8 +5,7 @@ import time
 import xml.etree.ElementTree as ElementTree
 
 from pytube import request
-from pytube.compat import unescape
-
+from html import unescape
 
 class Caption:
     """Container for caption tracks."""

pytube/compat.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# flake8: noqa
-"""Python 2/3 compatibility support."""
-import sys
-
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-PY33 = sys.version_info[0:2] >= (3, 3)
-
-if PY2:
-    reload(sys)
-    sys.setdefaultencoding('utf8')
-    import urllib2
-    from urllib import urlencode
-    from urllib2 import URLError
-    from urllib2 import quote
-    from urllib2 import unquote
-    from urllib2 import urlopen
-    from urlparse import parse_qsl
-    from urlparse import parse_qs
-    from HTMLParser import HTMLParser
-
-    def install_proxy(proxy_handler):
-        """
-        install global proxy.
-        :param proxy_handler:
-            :samp:`{"http":"http://my.proxy.com:1234", "https":"https://my.proxy.com:1234"}`
-        :return:
-        """
-        proxy_support = urllib2.ProxyHandler(proxy_handler)
-        opener = urllib2.build_opener(proxy_support)
-        urllib2.install_opener(opener)
-
-    def unescape(s):
-        """Strip HTML entries from a string."""
-        html_parser = HTMLParser()
-        return html_parser.unescape(s)
-
-    def unicode(s):
-        """Encode a string to utf-8."""
-        return s.encode('utf-8')
-
-elif PY3:
-    from urllib.error import URLError
-    from urllib.parse import parse_qsl
-    from urllib.parse import parse_qs
-    from urllib.parse import quote
-    from urllib.parse import unquote
-    from urllib.parse import urlencode
-    from urllib.request import urlopen
-    from urllib import request
-
-    def install_proxy(proxy_handler):
-        proxy_support = request.ProxyHandler(proxy_handler)
-        opener = request.build_opener(proxy_support)
-        request.install_opener(opener)
-
-    def unicode(s):
-        """No-op."""
-        return s
-
-    if PY33:
-        from html.parser import HTMLParser
-
-        def unescape(s):
-            """Strip HTML entries from a string."""
-            html_parser = HTMLParser()
-            return html_parser.unescape(s)
-    else:
-        from html import unescape

pytube/extract.py

@@ -3,9 +3,9 @@
 import json
 from collections import OrderedDict
 
-from pytube.compat import HTMLParser
-from pytube.compat import quote
-from pytube.compat import urlencode
+from html.parser import HTMLParser
+from urllib.parse import quote
+from urllib.parse import urlencode
 from pytube.exceptions import RegexMatchError
 from pytube.helpers import regex_search
 

pytube/helpers.py

@@ -6,7 +6,6 @@ import logging
 import pprint
 import re
 
-from pytube.compat import unicode
 from pytube.exceptions import RegexMatchError
 
 
@@ -124,4 +123,4 @@ def safe_filename(s, max_length=255):
     pattern = '|'.join(ntfs_chrs + chrs)
     regex = re.compile(pattern, re.UNICODE)
     filename = regex.sub('', s)
-    return unicode(filename[:max_length].rsplit(' ', 0)[0])
+    return filename[:max_length].rsplit(' ', 0)[0]

pytube/mixins.py

@@ -7,9 +7,10 @@ import logging
 import pprint
 
 from pytube import cipher
-from pytube.compat import parse_qsl
-from pytube.compat import parse_qs
-from pytube.compat import unquote
+from urllib import request
+from urllib.parse import parse_qsl
+from urllib.parse import parse_qs
+from urllib.parse import unquote
 from pytube.exceptions import LiveStreamError
 
 
@@ -117,3 +118,8 @@ def apply_descrambler(stream_data, key):
         'applying descrambler\n%s',
         pprint.pformat(stream_data[key], indent=2),
     )
+
+def install_proxy(proxy_handler):
+    proxy_support = request.ProxyHandler(proxy_handler)
+    opener = request.build_opener(proxy_support)
+    request.install_opener(opener)

pytube/request.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 """Implements a simple wrapper around urlopen."""
-import urllib.request
-
-from pytube.compat import urlopen
+from urllib.request import Request
+from urllib.request import urlopen
 # 403 forbidden fix
 
 
@@ -23,7 +22,7 @@ def get(
     """
 
     # https://github.com/nficano/pytube/pull/465
-    req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
+    req = Request(url, headers={'User-Agent': 'Mozilla/5.0'})
     response = urlopen(req)
 
     if streaming:

setup.cfg

@@ -15,8 +15,6 @@ description-file = README.md
 
 [coverage:run]
 source = pytube
-omit = 
-	pytube/compat.py
 
 [flake8]
 ignore = W605

setup.py

@@ -54,7 +54,7 @@ setup(
     package_data={
         '': ['LICENSE'],
     },
-    url='https://github.com/nficano/pytube',
+    url='https://github.com/hbmartin/pytube',
     license='MIT',
     entry_points={
         'console_scripts': [
@@ -71,8 +71,6 @@ setup(
         'Operating System :: Microsoft',
         'Operating System :: POSIX',
         'Operating System :: Unix',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',