Skip to content

Commit 4c31df4

Browse files
mcaransmcarans
committed
Modernise to Py310
1 parent b12c884 commit 4c31df4

15 files changed

Lines changed: 92 additions & 194 deletions

‎src/hdx/api/utilities/dataset_title_helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DatasetTitleHelper:
2626
r"([12]\d\d\d)(/(\d{1,2}))?(-| & | and )([12]\d\d\d)"
2727
)
2828
YEAR_RANGE_PATTERN2 = re.compile(r"([12]\d\d\d)([/-])(\d{1,2})")
29-
PUNCTUATION_PATTERN = re.compile(r"[%s]" % punctuation)
29+
PUNCTUATION_PATTERN = re.compile(rf"[{punctuation}]")
3030
EMPTY_BRACKET_PATTERN = re.compile(r"(\s?\(\s*\)\s?)")
3131
WORD_RIGHT_BRACKET_PATTERN = re.compile(r"\b(\s*)(\w{2,})\b\)")
3232
DATE_INTRO_WORDS = ["on", "at", "for", "of", "in"]

‎src/hdx/data/dataset.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,8 +1786,7 @@ def add_country_location(
17861786
return self.add_other_location(
17871787
iso3,
17881788
exact=exact,
1789-
alterror="Country: %s with iso3: %s could not be found in HDX list!"
1790-
% (country, iso3),
1789+
alterror=f"Country: {country} with iso3: {iso3} could not be found in HDX list!",
17911790
locations=locations,
17921791
)
17931792

‎src/hdx/data/vocabulary.py‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,7 @@ def read_tags_mappings(
417417
chainerror = True
418418
if failchained:
419419
logger.error(
420-
"Chained rules: %s (%s -> %s) | %s (%s -> %s)"
421-
% (
422-
action,
423-
tag,
424-
final_tags,
425-
action2,
426-
final_tag,
427-
final_tags2,
428-
)
420+
f"Chained rules: {action} ({tag} -> {final_tags}) | {action2} ({final_tag} -> {final_tags2})"
429421
)
430422

431423
if failchained and chainerror:

‎tests/hdx/__init__.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,14 @@ def dataset_mockshow(url, datadict):
271271
result = json.dumps(resources_data[0])
272272
return MockResponse(
273273
200,
274-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_show"}'
275-
% result,
274+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_show"}}',
276275
)
277276
else:
278277
if datadict["id"] in ("TEST1", "DatasetExist"):
279278
result = json.dumps(dataset_resultdict)
280279
return MockResponse(
281280
200,
282-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}'
283-
% result,
281+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}}',
284282
)
285283
if datadict["id"] == "TEST2":
286284
return MockResponse(
@@ -303,8 +301,7 @@ def dataset_mockshow(url, datadict):
303301
result = json.dumps(resultdictcopy)
304302
return MockResponse(
305303
200,
306-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}'
307-
% result,
304+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}}',
308305
)
309306

310307
return MockResponse(

‎tests/hdx/api/utilities/test_hdx_state.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
5252
result = json.dumps(resultdict)
5353
return MockResponse(
5454
200,
55-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_show"}'
56-
% result,
55+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_show"}}',
5756
)
5857
else:
5958
myresultdict = deepcopy(dataset_resultdict)
@@ -63,8 +62,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
6362
result = json.dumps(myresultdict)
6463
return MockResponse(
6564
200,
66-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}'
67-
% result,
65+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}}',
6866
)
6967

7068
Configuration.read().remoteckan().session = MockSession()
@@ -78,8 +76,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
7876
result = json.dumps(resultdict)
7977
return MockResponse(
8078
200,
81-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_show"}'
82-
% result,
79+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_show"}}',
8380
)
8481
else:
8582
myresultdict = deepcopy(dataset_resultdict)
@@ -89,8 +86,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
8986
result = json.dumps(myresultdict)
9087
return MockResponse(
9188
200,
92-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}'
93-
% result,
89+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}}',
9490
)
9591

9692
Configuration.read().remoteckan().session = MockSession()

‎tests/hdx/data/test_dataset_add_hapi_error.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
3333
result = json.dumps(resource_json)
3434
return MockResponse(
3535
200,
36-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_create"}'
37-
% result,
36+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_create"}}',
3837
)
3938
if "patch" not in url:
4039
return MockResponse(
@@ -44,8 +43,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
4443
result = json.dumps(datadict)
4544
return MockResponse(
4645
200,
47-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_patch"}'
48-
% result,
46+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_patch"}}',
4947
)
5048

5149
Configuration.read().remoteckan().session = MockSession()

‎tests/hdx/data/test_dataset_core.py‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ def mocksearch(url, datadict):
9595
result = json.dumps(newsearchdict)
9696
return MockResponse(
9797
200,
98-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_search"}'
99-
% result,
98+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_search"}}',
10099
)
101100
if datadict["q"] == '"':
102101
return MockResponse(
@@ -126,8 +125,7 @@ def mocklist(url, datadict):
126125
result = json.dumps(dataset_list[offset : offset + limit])
127126
return MockResponse(
128127
200,
129-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_list"}'
130-
% result,
128+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_list"}}',
131129
)
132130

133131

@@ -168,8 +166,7 @@ def mockall(url, datadict):
168166
result = json.dumps(newsearchdict)
169167
return MockResponse(
170168
200,
171-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_search"}'
172-
% result,
169+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_search"}}',
173170
)
174171

175172

@@ -182,8 +179,7 @@ def mockhxlupdate(url, datadict):
182179
result = json.dumps(hxlupdate_list)
183180
return MockResponse(
184181
200,
185-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_hxl_update"}'
186-
% result,
182+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_hxl_update"}}',
187183
)
188184

189185

@@ -224,8 +220,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
224220
result = json.dumps(resultdictcopy)
225221
return MockResponse(
226222
200,
227-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_revise"}'
228-
% result,
223+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_revise"}}',
229224
)
230225
return MockResponse(
231226
404,
@@ -255,22 +250,19 @@ def post(url, data, headers, files, allow_redirects, auth=None):
255250
result = json.dumps(resource_view_list)
256251
return MockResponse(
257252
200,
258-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_create_default_resource_views"}'
259-
% result,
253+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_create_default_resource_views"}}',
260254
)
261255
if "resource_view" in url:
262256
result = json.dumps(resource_view_list[1])
263257
return MockResponse(
264258
200,
265-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_view_create"}'
266-
% result,
259+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_view_create"}}',
267260
)
268261
if "resource" in url:
269262
result = json.dumps(resources_data[0])
270263
return MockResponse(
271264
200,
272-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_create"}'
273-
% result,
265+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_create"}}',
274266
)
275267
if "create" not in url and "revise" not in url:
276268
return MockResponse(
@@ -287,8 +279,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
287279
result = json.dumps(resultdictcopy)
288280
return MockResponse(
289281
200,
290-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_create"}'
291-
% result,
282+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_create"}}',
292283
)
293284
if datadict["name"] == "MyDataset2":
294285
return MockResponse(
@@ -322,8 +313,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
322313
result = json.dumps(resource_view_list)
323314
return MockResponse(
324315
200,
325-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_create_default_resource_views"}'
326-
% result,
316+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_create_default_resource_views"}}',
327317
)
328318
if "resource_view" in url:
329319
if "show" in url:
@@ -349,8 +339,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
349339
result = json.dumps(resultdictcopy)
350340
return MockResponse(
351341
200,
352-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_update"}'
353-
% result,
342+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=resource_update"}}',
354343
)
355344
else:
356345
if "revise" not in url:
@@ -379,8 +368,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
379368
result = json.dumps(resultdictcopy)
380369
return MockResponse(
381370
200,
382-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_update"}'
383-
% result,
371+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_update"}}',
384372
)
385373
return MockResponse(
386374
404,
@@ -408,8 +396,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
408396
if datadict["id"] == "6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d":
409397
return MockResponse(
410398
200,
411-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_resource_reorder"}'
412-
% decodedata,
399+
f'{{"success": true, "result": {decodedata}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_resource_reorder"}}',
413400
)
414401

415402
return MockResponse(
@@ -436,15 +423,13 @@ def post(url, data, headers, files, allow_redirects, auth=None):
436423
if "resource" in url:
437424
return MockResponse(
438425
200,
439-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_delete"}'
440-
% decodedata,
426+
f'{{"success": true, "result": {decodedata}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_delete"}}',
441427
)
442428

443429
if datadict["id"] == "6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d":
444430
return MockResponse(
445431
200,
446-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_delete"}'
447-
% decodedata,
432+
f'{{"success": true, "result": {decodedata}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=dataset_delete"}}',
448433
)
449434

450435
return MockResponse(
@@ -499,8 +484,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
499484
result = json.dumps(dataset_autocomplete)
500485
return MockResponse(
501486
200,
502-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_autocomplete"}'
503-
% result,
487+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_autocomplete"}}',
504488
)
505489

506490
Configuration.read().remoteckan().session = MockSession()
@@ -666,10 +650,7 @@ def test_update_in_hdx(self, configuration, post_update, date_pattern, test_xlsx
666650
"crisis-somewhere",
667651
]
668652
assert dataset["state"] == "active"
669-
pattern = (
670-
r"HDXPythonLibrary/%s-test \([12]\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\d\d\d\d\d\d\)"
671-
% __version__
672-
)
653+
pattern = rf"HDXPythonLibrary/{__version__}-test \([12]\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\d\d\d\d\d\d\)"
673654
match = re.search(pattern, dataset["updated_by_script"])
674655
assert match
675656
resourceviewdata = {

‎tests/hdx/data/test_dataset_noncore.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
9090
result = json.dumps([showcase_resultdict])
9191
return MockResponse(
9292
200,
93-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=ckanext_package_showcase_list"}'
94-
% result,
93+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=ckanext_package_showcase_list"}}',
9594
)
9695
if "association_delete" in url:
9796
TestDatasetNoncore.association = "delete"
@@ -104,8 +103,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
104103
result = json.dumps(datadict)
105104
return MockResponse(
106105
200,
107-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=ckanext_showcase_package_association_create"}'
108-
% result,
106+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=ckanext_showcase_package_association_create"}}',
109107
)
110108
return dataset_mockshow(url, datadict)
111109

@@ -126,8 +124,7 @@ def post(url, data, headers, files, allow_redirects, auth=None):
126124
result = json.dumps(resource_view_list)
127125
return MockResponse(
128126
200,
129-
'{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_create_default_resource_views"}'
130-
% result,
127+
f'{{"success": true, "result": {result}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_create_default_resource_views"}}',
131128
)
132129
if "resource_view" in url:
133130
if "show" in url:

0 commit comments

Comments
 (0)