Skip to content

Commit 5fdaedd

Browse files
pass symbols string parsing to __init__
1 parent 2729a4c commit 5fdaedd

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

pandas_datareader/econdb.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ class EcondbReader(_BaseReader):
1010
_format = None
1111
_show = "labels"
1212

13+
def __init__(self, *args, **kwargs):
14+
super().__init__(**kwargs)
15+
params = dict(s.split("=") for s in self.symbols.split("&"))
16+
if "from" in params and not kwargs.get("start"):
17+
self.start = pd.to_datetime(params["from"], format="%Y-%m-%d")
18+
if "to" in params and not kwargs.get("end"):
19+
self.end = pd.to_datetime(params["to"], format="%Y-%m-%d")
20+
1321
@property
1422
def url(self):
1523
"""API URL"""
@@ -22,12 +30,6 @@ def url(self):
2230

2331
def read(self):
2432
"""read one data from specified URL"""
25-
params = dict(s.split("=") for s in self.symbols.split("&"))
26-
if "from" in params:
27-
self.start = pd.to_datetime(params["from"], format="%Y-%m-%d")
28-
if "to" in params:
29-
self.end = pd.to_datetime(params["to"], format="%Y-%m-%d")
30-
3133
results = self.session.get(self.url).json()["results"]
3234
df = pd.DataFrame({"dates": []}).set_index("dates")
3335

pandas_datareader/tests/test_econdb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_get_tourism(self):
5252
# TOURISM_INBOUND
5353

5454
df = web.DataReader(
55-
"dataset=OE_TOURISM_INBOUND&COUNTRY=JPN,USA&" "VARIABLE=INB_ARRIVALS_TOTAL",
55+
"dataset=OE_TOURISM_INBOUND&COUNTRY=JPN,USA&VARIABLE=INB_ARRIVALS_TOTAL",
5656
"econdb",
5757
start=pd.Timestamp("2008-01-01"),
5858
end=pd.Timestamp("2012-01-01"),

0 commit comments

Comments
 (0)