BUG: Fix tests and colon separation

Author: econdb

pandas_datareader/compat/__init__.py

@@ -14,7 +14,6 @@
 PANDAS_0220 = PANDAS_VERSION >= LooseVersion("0.22.0")
 PANDAS_0230 = PANDAS_VERSION >= LooseVersion("0.23.0")
 
-
 __all__ = [
     "HTTPError",
     "StringIO",

pandas_datareader/econdb.py

@@ -27,25 +27,28 @@ def read(self):
         if self._show == "labels":
 
             def show_func(x):
-                return x.split(":")[1]
+                return x[x.find(':')+1:]
 
         elif self._show == "codes":
 
             def show_func(x):
-                return x.split(":")[0]
+                return x[:x.find(':')]
 
         for entry in results:
             series = pd.DataFrame(entry["data"])[["dates", "values"]].set_index("dates")
-
             head = entry["additional_metadata"]
+
             if head != "":  # this additional metadata is not blank
                 series.columns = pd.MultiIndex.from_tuples(
                     [[show_func(x) for x in head.values()]],
                     names=[show_func(x) for x in head.keys()],
                 )
+            else:
+                series.rename(
+                        columns={"values": entry['ticker']}, inplace=True)
 
             if not df.empty:
-                df = df.join(series, how="outer")
+                df = df.merge(series, how="outer", left_index=True, right_index=True)
             else:
                 df = series
         if df.shape[0] > 0:

pandas_datareader/tests/test_econdb.py

@@ -48,11 +48,22 @@ def test_get_tourism(self):
         us = np.array(
             [175702304, 160507424, 164079728, 167600272, 171320416], dtype=float
         )
+        index = pd.date_range("2008-01-01", "2012-01-01", freq="AS", name="TIME_PERIOD")
+
 
         # check the values coming back are equal
         np.testing.assert_array_equal(df.values[:, 0], jp)
         np.testing.assert_array_equal(df.values[:, 1], us)
 
+        # sometimes the country and variable columns are swapped
+        df = df.swaplevel(2, 1, axis=1)
+        for label, values in [("Japan", jp), ("United States", us)]:
+            expected = pd.Series(
+                values, index=index, name="Total international arrivals"
+            )
+            tm.assert_series_equal(
+                df[label]['Tourism demand surveys']["Total international arrivals"], expected)
+
     def test_bls(self):
         # BLS
         # CPI
@@ -64,3 +75,14 @@ def test_bls(self):
         )
 
         assert df.loc["2010-05-01"][0] == 217.3
+
+
+    def test_australia_gdp(self):
+
+        df = web.DataReader(
+            'dataset=ABS_GDP&to=2019-09-01&from=1959-09-01&h=TIME&v=Indicator',
+            'econdb')
+        assert df.loc[
+            '2017-10-01',
+            ('GDP per capita: Current prices - National Accounts',
+             'Seasonally Adjusted', 'AUD')]  == 18329