__unicode__ is a left-over from python 2

Author: mtmail

opencage/geocoder.py

@@ -95,11 +95,9 @@ def __init__(self, message, bad_value=None):
         self.message = message
         self.bad_value = bad_value
 
-    def __unicode__(self):
+    def __str__(self):
         return self.message
 
-    __str__ = __unicode__
-
 
 class UnknownError(OpenCageGeocodeError):
     """There was a problem with the OpenCage server."""
@@ -108,33 +106,27 @@ class UnknownError(OpenCageGeocodeError):
 class RateLimitExceededError(OpenCageGeocodeError):
     """Exception raised when account has exceeded its limit."""
 
-    def __unicode__(self):
+    def __str__(self):
         """Convert exception to a string."""
         return ("You have used the requests available on your plan. "
                 "Please purchase more if you wish to continue: https://opencagedata.com/pricing")
 
-    __str__ = __unicode__
-
 
 class NotAuthorizedError(OpenCageGeocodeError):
     """Exception raised when an unauthorized API key is used."""
 
-    def __unicode__(self):
+    def __str__(self):
         """Convert exception to a string."""
         return "Your API key is not authorized. You may have entered it incorrectly."
 
-    __str__ = __unicode__
-
 
 class ForbiddenError(OpenCageGeocodeError):
     """Exception raised when a blocked or suspended API key is used."""
 
-    def __unicode__(self):
+    def __str__(self):
         """Convert exception to a string."""
         return "Your API key has been blocked or suspended."
 
-    __str__ = __unicode__
-
 
 class AioHttpError(OpenCageGeocodeError):
     """Exception raised for errors related to async HTTP calls with aiohttp."""
@@ -143,14 +135,12 @@ class AioHttpError(OpenCageGeocodeError):
 class SSLError(OpenCageGeocodeError):
     """Exception raised when SSL connection to OpenCage server fails."""
 
-    def __unicode__(self):
+    def __str__(self):
         """Convert exception to a string."""
         return ("SSL Certificate error connecting to OpenCage API. This is usually due to "
                 "outdated CA root certificates of the operating system. "
                 )
 
-    __str__ = __unicode__
-
 
 class NetworkError(OpenCageGeocodeError):
     """Exception raised when the connection to the OpenCage API fails."""
@@ -620,7 +610,7 @@ def floatify_latlng(input_value):
             # This dict has only 2 keys 'lat' & 'lon'
             return {'lat': float_if_float(input_value["lat"]), 'lng': float_if_float(input_value["lng"])}
 
-        return dict((key, floatify_latlng(value)) for key, value in input_value.items())
+        return {key: floatify_latlng(value) for key, value in input_value.items()}
 
     if isinstance(input_value, collections.abc.MutableSequence):
         return [floatify_latlng(x) for x in input_value]

test/test_all.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 from pathlib import Path
 
 import os

test/test_async.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 import pytest
 
 from opencage.geocoder import ForbiddenError, OpenCageGeocode, AioHttpError

test/test_error_network.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 import asyncio
 import os
 import socket

test/test_error_ssl.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 import ssl
 import pytest
 from opencage.geocoder import OpenCageGeocode, SSLError

test/test_geocoder_args.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 import os
 
 import pytest

test/test_headers.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 from pathlib import Path
 
 import os

test/test_session.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 from pathlib import Path
 
 import pytest