Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit120dff8

Browse files
authored
Fix set use live default (#63)
* Add failing test to demonstrate bug in issue#62* Fix issue
1 parentfa69943 commit120dff8

File tree

2 files changed

+28
-17
lines changed

2 files changed

+28
-17
lines changed

‎src/hdx/location/country.py‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def sort_list(colname):
212212
@classmethod
213213
defcountriesdata(
214214
cls,
215-
use_live:bool=_use_live,
215+
use_live:bool=None,
216216
country_name_overrides:Dict=None,
217217
country_name_mappings:Dict=None,
218218
)->List[Dict[str,Dict]]:
@@ -227,6 +227,8 @@ def countriesdata(
227227
Returns:
228228
List[Dict[str,Dict]]: Countries dictionaries
229229
"""
230+
ifuse_liveisNone:
231+
use_live=cls._use_live
230232
ifcls._countriesdataisNone:
231233
countries=None
232234
ifcountry_name_overridesisnotNone:
@@ -326,7 +328,7 @@ def set_country_name_mappings(cls, country_name_mappings: Dict) -> None:
326328
defget_country_info_from_iso3(
327329
cls,
328330
iso3:str,
329-
use_live:bool=_use_live,
331+
use_live:bool=None,
330332
exception:Optional[ExceptionUpperBound]=None,
331333
)->Optional[Dict[str,str]]:
332334
"""Get country information from ISO3 code
@@ -352,7 +354,7 @@ def get_country_info_from_iso3(
352354
defget_country_name_from_iso3(
353355
cls,
354356
iso3:str,
355-
use_live:bool=_use_live,
357+
use_live:bool=None,
356358
exception:Optional[ExceptionUpperBound]=None,
357359
formal:bool=False,
358360
)->Optional[str]:
@@ -389,7 +391,7 @@ def get_country_name_from_iso3(
389391
defget_currency_from_iso3(
390392
cls,
391393
iso3:str,
392-
use_live:bool=_use_live,
394+
use_live:bool=None,
393395
exception:Optional[ExceptionUpperBound]=None,
394396
)->Optional[int]:
395397
"""Get currency code from ISO3 code
@@ -415,7 +417,7 @@ def get_currency_from_iso3(
415417
defget_iso2_from_iso3(
416418
cls,
417419
iso3:str,
418-
use_live:bool=_use_live,
420+
use_live:bool=None,
419421
exception:Optional[ExceptionUpperBound]=None,
420422
)->Optional[str]:
421423
"""Get ISO2 from ISO3 code
@@ -441,7 +443,7 @@ def get_iso2_from_iso3(
441443
defget_iso3_from_iso2(
442444
cls,
443445
iso2:str,
444-
use_live:bool=_use_live,
446+
use_live:bool=None,
445447
exception:Optional[ExceptionUpperBound]=None,
446448
)->Optional[str]:
447449
"""Get ISO3 from ISO2 code
@@ -467,7 +469,7 @@ def get_iso3_from_iso2(
467469
defget_country_info_from_iso2(
468470
cls,
469471
iso2:str,
470-
use_live:bool=_use_live,
472+
use_live:bool=None,
471473
exception:Optional[ExceptionUpperBound]=None,
472474
)->Optional[Dict[str,str]]:
473475
"""Get country name from ISO2 code
@@ -493,7 +495,7 @@ def get_country_info_from_iso2(
493495
defget_country_name_from_iso2(
494496
cls,
495497
iso2:str,
496-
use_live:bool=_use_live,
498+
use_live:bool=None,
497499
exception:Optional[ExceptionUpperBound]=None,
498500
formal:bool=False,
499501
)->Optional[str]:
@@ -521,7 +523,7 @@ def get_country_name_from_iso2(
521523
defget_currency_from_iso2(
522524
cls,
523525
iso2:str,
524-
use_live:bool=_use_live,
526+
use_live:bool=None,
525527
exception:Optional[ExceptionUpperBound]=None,
526528
)->Optional[str]:
527529
"""Get currency from ISO2 code
@@ -547,7 +549,7 @@ def get_currency_from_iso2(
547549
defget_m49_from_iso3(
548550
cls,
549551
iso3:str,
550-
use_live:bool=_use_live,
552+
use_live:bool=None,
551553
exception:Optional[ExceptionUpperBound]=None,
552554
)->Optional[int]:
553555
"""Get M49 from ISO3 code
@@ -573,7 +575,7 @@ def get_m49_from_iso3(
573575
defget_iso3_from_m49(
574576
cls,
575577
m49:int,
576-
use_live:bool=_use_live,
578+
use_live:bool=None,
577579
exception:Optional[ExceptionUpperBound]=None,
578580
)->Optional[str]:
579581
"""Get ISO3 from M49 code
@@ -599,7 +601,7 @@ def get_iso3_from_m49(
599601
defget_country_info_from_m49(
600602
cls,
601603
m49:int,
602-
use_live:bool=_use_live,
604+
use_live:bool=None,
603605
exception:Optional[ExceptionUpperBound]=None,
604606
)->Optional[Dict[str,str]]:
605607
"""Get country name from M49 code
@@ -623,7 +625,7 @@ def get_country_info_from_m49(
623625
defget_country_name_from_m49(
624626
cls,
625627
m49:int,
626-
use_live:bool=_use_live,
628+
use_live:bool=None,
627629
exception:Optional[ExceptionUpperBound]=None,
628630
formal:bool=False,
629631
)->Optional[str]:
@@ -651,7 +653,7 @@ def get_country_name_from_m49(
651653
defget_currency_from_m49(
652654
cls,
653655
m49:int,
654-
use_live:bool=_use_live,
656+
use_live:bool=None,
655657
exception:Optional[ExceptionUpperBound]=None,
656658
)->Optional[str]:
657659
"""Get currency from M49 code
@@ -754,7 +756,7 @@ def simplify_countryname(cls, country: str) -> (str, List[str]):
754756
defget_iso3_country_code(
755757
cls,
756758
country:str,
757-
use_live:bool=_use_live,
759+
use_live:bool=None,
758760
exception:Optional[ExceptionUpperBound]=None,
759761
)->Optional[str]:
760762
"""Get ISO3 code for cls. Only exact matches or None are returned.
@@ -814,7 +816,7 @@ def get_iso3_country_code(
814816
defget_iso3_country_code_fuzzy(
815817
cls,
816818
country:str,
817-
use_live:bool=_use_live,
819+
use_live:bool=None,
818820
exception:Optional[ExceptionUpperBound]=None,
819821
min_chars:int=5,
820822
)->Tuple[Optional[str],bool]:
@@ -904,7 +906,7 @@ def remove_matching_from_list(wordlist, word_or_part):
904906
defget_countries_in_region(
905907
cls,
906908
region:Union[int,str],
907-
use_live:bool=_use_live,
909+
use_live:bool=None,
908910
exception:Optional[ExceptionUpperBound]=None,
909911
)->List[str]:
910912
"""Get countries (ISO3 codes) in region

‎tests/hdx/location/test_country.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,8 +696,17 @@ def test_use_live_default(self):
696696
assertCountry._use_liveisTrue
697697
Country.set_use_live_default(False)
698698
assertCountry._use_liveisFalse
699+
# We should now be able to load from local data without setting use_live=False
700+
Country._countriesdata=None
701+
Country.set_ocha_path(
702+
script_dir_plus_file("Countries_UZB_Deleted.csv",TestCountry)
703+
)
704+
assertCountry.get_iso3_country_code("UZBEKISTAN")isNone
699705
Country.set_use_live_default(None)
700706
assertCountry._use_liveisTrue
707+
Country._countriesdata=None
708+
assertCountry.get_iso3_country_code("UZBEKISTAN")=="UZB"
709+
Country._countriesdata=None
701710

702711
deftest_ocha_feed_file_working(self):
703712
countries=hxl.data(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp