chore: Remove old Python2 syntax (#86)

Co-authored-by: Julian Psotta <[email protected]>
Co-authored-by: Claude Paroz <[email protected]>
Co-authored-by: Jakob Schnell <[email protected]>

Author: 3 people

docs/source/conf.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-#
 # openrouteservice-py documentation build configuration file, created by
 # sphinx-quickstart on Wed Jan 31 20:43:55 2018.
 #

openrouteservice/client.py

@@ -20,6 +20,7 @@
 
 from datetime import datetime
 from datetime import timedelta
+from urllib.parse import urlencode
 import cgi
 import functools
 import requests
@@ -30,18 +31,13 @@
 
 from openrouteservice import exceptions, __version__, get_ordinal
 
-try:  # Python 3
-    from urllib.parse import urlencode
-except ImportError:  # pragma: no cover # Python 2
-    from urllib import urlencode  # noqa
-
 _USER_AGENT = "ORSClientPython.v{}".format(__version__)
 _DEFAULT_BASE_URL = "https://api.openrouteservice.org"
 
 _RETRIABLE_STATUSES = set([503])  # noqa
 
 
-class Client(object):
+class Client:
     """Performs requests to the ORS API services."""
 
     def __init__(
@@ -360,34 +356,8 @@ def _urlencode_params(params):
 
     :rtype: string
     """
-    # urlencode does not handle unicode strings in Python 2.
-    # Firstly, normalize the values so they get encoded correctly.
-    params = [(key, _normalize_for_urlencode(val)) for key, val in params]
-    # Secondly, unquote unreserved chars which are incorrectly quoted
+    params = [(key, val) for key, val in params]
+    # Unquote unreserved chars which are incorrectly quoted
     # by urllib.urlencode, causing invalid auth signatures. See GH #72
     # for more info.
     return requests.utils.unquote_unreserved(urlencode(params))
-
-
-try:
-    unicode  # noqa
-
-    # NOTE(cbro): `unicode` was removed in Python 3. In Python 3, NameError is
-    # raised here, and caught below.
-
-    def _normalize_for_urlencode(value):  # pragma: no cover
-        """(Python 2) Converts the value to a `str` (raw bytes)."""
-        if isinstance(value, unicode):  # noqa
-            return value.encode("utf8")
-
-        if isinstance(value, str):
-            return value
-
-        return _normalize_for_urlencode(str(value))
-
-except NameError:
-
-    def _normalize_for_urlencode(value):
-        """(Python 3) No-op."""
-        # urlencode in Python 3 handles all the types we are passing it.
-        return value

openrouteservice/elevation.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 # Copyright (C) 2018 HeiGIT, University of Heidelberg.
 #
 #

openrouteservice/optimization.py

@@ -101,7 +101,7 @@ def optimization(
     )
 
 
-class Job(object):
+class Job:
     """
     Class to create a Job object for optimization endpoint.
 
@@ -172,7 +172,7 @@ def __init__(
             self.time_windows = time_windows
 
 
-class ShipmentStep(object):
+class ShipmentStep:
     """
     Class to create a Shipment object for optimization endpoint.
 
@@ -222,7 +222,7 @@ def __init__(
             self.time_windows = time_windows
 
 
-class Shipment(object):
+class Shipment:
     """
     Class to create a Shipment object for optimization endpoint.
 
@@ -272,7 +272,7 @@ def __init__(
             self.priority = priority
 
 
-class Vehicle(object):
+class Vehicle:
     """
     Class to create a Vehicle object for optimization endpoint.
 

openrouteservice/places.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 # Copyright (C) 2018 HeiGIT, University of Heidelberg.
 #
 #

test/__init__.py

@@ -17,13 +17,9 @@
 #
 
 import unittest
-import codecs
 import openrouteservice
 
-try:  # Python 3
-    from urllib.parse import urlparse, parse_qsl
-except ImportError:  # Python 2
-    from urlparse import urlparse, parse_qsl
+from urllib.parse import urlparse, parse_qsl
 
 # For relative imports to work in Python 3.6
 import os
@@ -49,12 +45,6 @@ def assertURLEqual(self, first, second, msg=None):
         second_qsl = sorted(parse_qsl(second_parsed.query))
         self.assertEqual(first_qsl, second_qsl, msg)
 
-    @staticmethod
-    def u(string):
-        """Create a unicode string, compatible across all versions of Python."""
-        # NOTE(cbro): Python 3-3.2 does not have the u'' syntax.
-        return codecs.unicode_escape_decode(string)[0]
-
     def assertDictContainsSubset(self, a, b, **kwargs):
         """Replaces deprecated unittest.TestCase.assertDictContainsSubset"""
         c = dict([(k, b[k]) for k in a.keys() if k in b.keys()])

test/test_elevation.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 # Copyright (C) 2018 HeiGIT, University of Heidelberg.
 #
 #