Fix Algolia breaking py2.7 support

geopy · May 10, 2020 · 7eff5c7 · 7eff5c7
1 parent ea3d3b8
commit 7eff5c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/geopy/geocoders/algolia.py b/geopy/geocoders/algolia.py
@@ -156,8 +156,6 @@ def geocode(
             'query': self.format_string % query,
         }
 
-        _parse_json_kwargs = {}
-
         if type is not None:
             params['type'] = type
 
@@ -173,7 +171,6 @@ def geocode(
 
         if language is not None:
             params['language'] = language.lower()
-            _parse_json_kwargs['language'] = language
 
         if countries is not None:
             params['countries'] = ','.join([c.lower() for c in countries])
@@ -202,7 +199,7 @@ def geocode(
         return self._parse_json(
             self._call_geocoder(request, timeout=timeout),
             exactly_one,
-            **_parse_json_kwargs,
+            language=language,
         )
 
     def reverse(
@@ -250,14 +247,11 @@ def reverse(
             'aroundLatLng': '%s,%s' % (lat, lng),
         }
 
-        _parse_json_kwargs = {}
-
         if limit is not None:
             params['hitsPerPage'] = limit
 
         if language is not None:
             params['language'] = language
-            _parse_json_kwargs['language'] = language
 
         url = '?'.join((self.reverse_api, urlencode(params)))
         request = Request(url)
@@ -270,21 +264,27 @@ def reverse(
         return self._parse_json(
             self._call_geocoder(request, timeout=timeout),
             exactly_one,
-            **_parse_json_kwargs,
+            language=language,
         )
 
     @staticmethod
-    def _parse_feature(feature, language="default"):
+    def _parse_feature(feature, language):
         # Parse each resource.
         latitude = feature.get('_geoloc', {}).get('lat')
         longitude = feature.get('_geoloc', {}).get('lng')
-        placename = feature['locale_names'].get(language)[0] \
-            if isinstance(feature['locale_names'], dict) \
-            else feature['locale_names'][0]
+
+        if isinstance(feature['locale_names'], dict):
+            if language in feature['locale_names']:
+                placename = feature['locale_names'][language][0]
+            else:
+                placename = feature['locale_names']["default"][0]
+        else:
+            placename = feature['locale_names'][0]
+
         return Location(placename, (latitude, longitude), feature)
 
     @classmethod
-    def _parse_json(self, response, exactly_one, language='default'):
+    def _parse_json(self, response, exactly_one, language):
         if response is None or 'hits' not in response:
             return None
         features = response['hits']

diff --git a/test/geocoders/algolia.py b/test/geocoders/algolia.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+from __future__ import unicode_literals
 import unittest
 
 from geopy.geocoders import AlgoliaPlaces