From 44cafa059f0d76599525001fc39f448fc0c722c8 Mon Sep 17 00:00:00 2001 From: Harsh Mishra Date: Mon, 1 Mar 2021 23:48:50 +0530 Subject: [PATCH 1/2] fix: fixed code quality issues (#398) * Add .deepsource.toml * Fixed Object Inheritance * Replace ternary syntax with if expression * Use literal syntax to create data structure --- .deepsource.toml | 10 ++++++++++ googlemaps/client.py | 4 ++-- googlemaps/convert.py | 4 +--- googlemaps/maps.py | 11 +++-------- googlemaps/places.py | 29 +++++++++-------------------- tests/test_timezone.py | 2 +- 6 files changed, 26 insertions(+), 34 deletions(-) create mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml new file mode 100644 index 00000000..f772ce8c --- /dev/null +++ b/.deepsource.toml @@ -0,0 +1,10 @@ +version = 1 + +test_patterns = ["tests/**"] + +[[analyzers]] +name = "python" +enabled = true + + [analyzers.meta] + runtime_version = "3.x.x" diff --git a/googlemaps/client.py b/googlemaps/client.py index 546f7796..980509e2 100644 --- a/googlemaps/client.py +++ b/googlemaps/client.py @@ -43,10 +43,10 @@ _USER_AGENT = "GoogleGeoApiClientPython/%s" % googlemaps.__version__ _DEFAULT_BASE_URL = "https://maps.googleapis.com" -_RETRIABLE_STATUSES = set([500, 503, 504]) +_RETRIABLE_STATUSES = {500, 503, 504} -class Client(object): +class Client: """Performs requests to the Google Maps API web services.""" def __init__(self, key=None, client_id=None, client_secret=None, diff --git a/googlemaps/convert.py b/googlemaps/convert.py index 7dfa9882..2b3d056e 100644 --- a/googlemaps/convert.py +++ b/googlemaps/convert.py @@ -160,9 +160,7 @@ def _is_list(arg): return False if isinstance(arg, str): # Python 3-only, as str has __iter__ return False - return (not _has_method(arg, "strip") - and _has_method(arg, "__getitem__") - or _has_method(arg, "__iter__")) + return _has_method(arg, "__getitem__") if not _has_method(arg, "strip") else _has_method(arg, "__iter__") def is_string(val): diff --git a/googlemaps/maps.py b/googlemaps/maps.py index 763e0126..cc1a054e 100644 --- a/googlemaps/maps.py +++ b/googlemaps/maps.py @@ -20,16 +20,11 @@ from googlemaps import convert -MAPS_IMAGE_FORMATS = set( - ['png8', 'png', 'png32', 'gif', 'jpg', 'jpg-baseline'] -) +MAPS_IMAGE_FORMATS = {'png8', 'png', 'png32', 'gif', 'jpg', 'jpg-baseline'} -MAPS_MAP_TYPES = set( - ['roadmap', 'satellite', 'terrain', 'hybrid'] -) +MAPS_MAP_TYPES = {'roadmap', 'satellite', 'terrain', 'hybrid'} - -class StaticMapParam(object): +class StaticMapParam: """Base class to handle parameters for Maps Static API.""" def __init__(self): diff --git a/googlemaps/places.py b/googlemaps/places.py index af070c4c..f84bb84d 100644 --- a/googlemaps/places.py +++ b/googlemaps/places.py @@ -21,9 +21,7 @@ from googlemaps import convert -PLACES_FIND_FIELDS_BASIC = set( - [ - "business_status", +PLACES_FIND_FIELDS_BASIC = {"business_status", "formatted_address", "geometry", "geometry/location", @@ -42,13 +40,11 @@ "photos", "place_id", "plus_code", - "types", - ] -) + "types",} -PLACES_FIND_FIELDS_CONTACT = set(["opening_hours"]) +PLACES_FIND_FIELDS_CONTACT = {"opening_hours"} -PLACES_FIND_FIELDS_ATMOSPHERE = set(["price_level", "rating", "user_ratings_total"]) +PLACES_FIND_FIELDS_ATMOSPHERE = {"price_level", "rating", "user_ratings_total"} PLACES_FIND_FIELDS = ( PLACES_FIND_FIELDS_BASIC @@ -56,9 +52,7 @@ ^ PLACES_FIND_FIELDS_ATMOSPHERE ) -PLACES_DETAIL_FIELDS_BASIC = set( - [ - "address_component", +PLACES_DETAIL_FIELDS_BASIC = {"address_component", "adr_address", "business_status", "formatted_address", @@ -82,17 +76,11 @@ "type", "url", "utc_offset", - "vicinity", - ] -) + "vicinity",} -PLACES_DETAIL_FIELDS_CONTACT = set( - ["formatted_phone_number", "international_phone_number", "opening_hours", "website"] -) +PLACES_DETAIL_FIELDS_CONTACT = {"formatted_phone_number", "international_phone_number", "opening_hours", "website"} -PLACES_DETAIL_FIELDS_ATMOSPHERE = set( - ["price_level", "rating", "review", "user_ratings_total"] -) +PLACES_DETAIL_FIELDS_ATMOSPHERE = {"price_level", "rating", "review", "user_ratings_total"} PLACES_DETAIL_FIELDS = ( PLACES_DETAIL_FIELDS_BASIC @@ -658,3 +646,4 @@ def _autocomplete( url = "/maps/api/place/%sautocomplete/json" % url_part return client._request(url, params).get("predictions", []) + \ No newline at end of file diff --git a/tests/test_timezone.py b/tests/test_timezone.py index 9d2edc1c..a1d7394e 100644 --- a/tests/test_timezone.py +++ b/tests/test_timezone.py @@ -53,7 +53,7 @@ def test_los_angeles(self): responses.calls[0].request.url, ) - class MockDatetime(object): + class MockDatetime: def now(self): return datetime.datetime.fromtimestamp(1608) From f9c8febd3d2705a9a0ac329dd8e0ce6dcef4d0c2 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 1 Mar 2021 18:19:45 +0000 Subject: [PATCH 2/2] chore(release): 4.4.3 [skip ci] ## [4.4.3](https://github.com/googlemaps/google-maps-services-python/compare/v4.4.2...v4.4.3) (2021-03-01) ### Bug Fixes * fixed code quality issues ([#398](https://github.com/googlemaps/google-maps-services-python/issues/398)) ([44cafa0](https://github.com/googlemaps/google-maps-services-python/commit/44cafa059f0d76599525001fc39f448fc0c722c8)) --- googlemaps/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/googlemaps/__init__.py b/googlemaps/__init__.py index b6f45f8c..f0568e3d 100644 --- a/googlemaps/__init__.py +++ b/googlemaps/__init__.py @@ -15,7 +15,7 @@ # the License. # -__version__ = "4.4.2" +__version__ = "4.4.3" from googlemaps.client import Client from googlemaps import exceptions diff --git a/setup.py b/setup.py index b9b3aeea..11e0dc62 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name="googlemaps", - version="4.4.2", + version="4.4.3", description="Python client library for Google Maps Platform", long_description=readme + changelog, long_description_content_type="text/markdown",