Skip to content

Commit 2bacfec

Browse files
committed
fix: test value for existence before checking
1 parent 0e887cf commit 2bacfec

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

ORStools/common/client.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def __init__(self, provider: Optional[dict] = None, agent: Optional[str] = None)
8585
self.settings = QgsSettings()
8686
self.user_agent = self.settings.value("qgis/networkAndProxy/userAgent")
8787
# In case the value was still set by the ORS Tools Plugin, reset to empty string
88-
if "ORStools" in self.user_agent:
88+
if self.user_agent and "ORStools" in self.user_agent:
8989
self.user_agent = ""
9090
self.settings.setValue("qgis/networkAndProxy/userAgent", agent)
9191

@@ -111,8 +111,6 @@ def _request(
111111
:rtype: QgsNetworkReplyContent
112112
:raises: Various ApiError exceptions based on HTTP status codes
113113
"""
114-
115-
116114

117115
if post_json is not None:
118116
result = blocking_request.post(request, json.dumps(post_json).encode())
@@ -202,14 +200,12 @@ def fetch_with_retry(
202200
# Reset to old value
203201
self.settings.setValue("qgis/networkAndProxy/userAgent", self.user_agent)
204202

205-
206203
# Write env variables if successful
207204
if self.ENV_VARS:
208205
for env_var in self.ENV_VARS:
209206
header_value = reply.rawHeader(self.ENV_VARS[env_var].encode()).data().decode()
210207
configmanager.write_env_var(env_var, header_value)
211208

212-
213209
return json.loads(content)
214210

215211
def get_delay_seconds(self, retry_counter: int) -> int:

0 commit comments

Comments
 (0)