Merge pull request #9 from fcurella/py3

Drop Python 2

Author: fcurella

.travis.yml

@@ -4,13 +4,11 @@ branches:
   only:
     - master
 python:
-  - 2.7
-  - 3.4
   - 3.5
   - 3.6
   - 3.7
   - 3.8
-  - "pypy"
+  - 3.9
   - "pypy3"
 env:
   global:

README.rst

@@ -38,7 +38,7 @@ Parsing
   b'The quick brown fox jumped over the lazy dog.'
 
 Note that ``DataURI.data`` will always return bytes, (which in Python 2 is the same as a string).
-Use ``DataURI.text`` to get the text type (``str`` on Python 3.x, ``unicode`` on Python 2.x).
+Use ``DataURI.text`` to get a string.
 
 Creating from a string
 ----------------------

datauri/__init__.py

@@ -5,17 +5,10 @@
 from base64 import b64decode as decode64
 from base64 import b64encode as encode64
 
-try:
-    from urllib.parse import quote, unquote
-    BYTES = True
-except ImportError:
-    from urllib import quote, unquote
-    BYTES = False
-
+from urllib.parse import quote, unquote
 
 from .exceptions import InvalidCharset, InvalidDataURI, InvalidMimeType
 
-
 MIMETYPE_REGEX = r'[\w]+\/[\w\-\+\.]+'
 _MIMETYPE_RE = re.compile('^{}$'.format(MIMETYPE_REGEX))
 
@@ -47,15 +40,12 @@ def make(cls, mimetype, charset, base64, data):
             parts.extend([';charset=', charset])
         if base64:
             parts.append(';base64')
-            if BYTES:
-                _charset = charset or 'utf-8'
-                if isinstance(data, bytes):
-                    _data = data
-                else:
-                    _data = bytes(data, _charset)
-                encoded_data = encode64(_data).decode(_charset).strip()
+            _charset = charset or 'utf-8'
+            if isinstance(data, bytes):
+                _data = data
             else:
-                encoded_data = encode64(data).strip()
+                _data = bytes(data, _charset)
+            encoded_data = encode64(_data).decode(_charset).strip()
         else:
             encoded_data = quote(data)
         parts.extend([',', encoded_data])
@@ -120,12 +110,9 @@ def _parse(self):
         charset = match.group('charset') or None
 
         if match.group('base64'):
-            if BYTES:
-                _charset = charset or 'utf-8'
-                _data = bytes(match.group('data'), _charset)
-                data = decode64(_data)
-            else:
-                data = decode64(match.group('data'))
+            _charset = charset or 'utf-8'
+            _data = bytes(match.group('data'), _charset)
+            data = decode64(_data)
         else:
             data = unquote(match.group('data'))
 

setup.py

@@ -29,14 +29,12 @@ def read(fname):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     test_suite='tests',
 )

tests/test_parsing.py

@@ -3,7 +3,6 @@
 
 from datauri import DataURI, exceptions
 
-
 TEST_DIR = os.path.dirname(__file__)