Skip to content

Commit 81670c3

Browse files
committed
Getting in memory maps from user rather than files
1 parent 60fdb9c commit 81670c3

File tree

2 files changed

+10
-30
lines changed

2 files changed

+10
-30
lines changed

ipinfo/handler.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,21 @@ def __init__(self, access_token=None, **kwargs):
4646
self.access_token = access_token
4747

4848
# load countries file
49-
self.countries = (
50-
read_json_file(kwargs.get("countries_file")) or countries
51-
)
49+
self.countries = kwargs.get("countries") or countries
5250

5351
# load eu countries file
54-
self.eu_countries = (
55-
read_json_file(kwargs.get("eu_countries_file")) or eu_countries
56-
)
52+
self.eu_countries = kwargs.get("eu_countries") or eu_countries
5753

5854
# load countries flags file
59-
self.countries_flags = (
60-
read_json_file(kwargs.get("countries_flags_file"))
61-
or countries_flags
62-
)
55+
self.countries_flags = kwargs.get("countries_flags") or countries_flags
6356

6457
# load countries currency file
6558
self.countries_currencies = (
66-
read_json_file(kwargs.get("countries_currencies_file"))
67-
or countries_currencies
59+
kwargs.get("countries_currencies") or countries_currencies
6860
)
6961

7062
# load continent file
71-
self.continents = (
72-
read_json_file(kwargs.get("continent_file")) or continents
73-
)
63+
self.continents = kwargs.get("continent") or continents
7464

7565
# setup req opts
7666
self.request_options = kwargs.get("request_options", {})

ipinfo/handler_async.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,21 @@ def __init__(self, access_token=None, **kwargs):
5050
self.access_token = access_token
5151

5252
# load countries file
53-
self.countries = (
54-
read_json_file(kwargs.get("countries_file")) or countries
55-
)
53+
self.countries = kwargs.get("countries") or countries
5654

5755
# load eu countries file
58-
self.eu_countries = (
59-
read_json_file(kwargs.get("eu_countries_file")) or eu_countries
60-
)
56+
self.eu_countries = kwargs.get("eu_countries") or eu_countries
6157

6258
# load countries flags file
63-
self.countries_flags = (
64-
read_json_file(kwargs.get("countries_flags_file"))
65-
or countries_flags
66-
)
59+
self.countries_flags = kwargs.get("countries_flags") or countries_flags
6760

6861
# load countries currency file
6962
self.countries_currencies = (
70-
read_json_file(kwargs.get("countries_currencies_file"))
71-
or countries_currencies
63+
kwargs.get("countries_currencies") or countries_currencies
7264
)
7365

7466
# load continent file
75-
self.continents = (
76-
read_json_file(kwargs.get("continent_file")) or continents
77-
)
67+
self.continents = kwargs.get("continent") or continents
7868

7969
# setup req opts
8070
self.request_options = kwargs.get("request_options", {})

0 commit comments

Comments
 (0)