Skip to content

Fixed Code Quality Issues #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpoehnelt merged 4 commits into from
Mar 1, 2021
Merged

Fixed Code Quality Issues #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a44f495
Add .deepsource.toml
HarshCasper Mar 1, 2021
ae037c2
Fixed Object Inheritance
HarshCasper Mar 1, 2021
96d6bbd
Replace ternary syntax with if expression
HarshCasper Mar 1, 2021
3c01500
Use literal syntax to create data structure
HarshCasper Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .deepsource.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version = 1

test_patterns = ["tests/**"]

[[analyzers]]
name = "python"
enabled = true

[analyzers.meta]
runtime_version = "3.x.x"
4 changes: 2 additions & 2 deletions googlemaps/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions googlemaps/convert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
11 changes: 3 additions & 8 deletions googlemaps/maps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
29 changes: 9 additions & 20 deletions googlemaps/places.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -42,23 +40,19 @@
"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
^ PLACES_FIND_FIELDS_CONTACT
^ PLACES_FIND_FIELDS_ATMOSPHERE
)

PLACES_DETAIL_FIELDS_BASIC = set(
[
"address_component",
PLACES_DETAIL_FIELDS_BASIC = {"address_component",
"adr_address",
"business_status",
"formatted_address",
Expand All @@ -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
Expand Down Expand Up @@ -658,3 +646,4 @@ def _autocomplete(

url = "/maps/api/place/%sautocomplete/json" % url_part
return client._request(url, params).get("predictions", [])

2 changes: 1 addition & 1 deletion tests/test_timezone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down