Merge pull request #774 from simongarisch/master

Fix tests and black formatting

Author: bashtage

pandas_datareader/compat/__init__.py

@@ -51,6 +51,8 @@ def get_filepath_or_buffer(filepath_or_buffer, encoding=None, compression=None):
 
 
 def str_to_bytes(s, encoding=None):
+    if isinstance(s, bytes):
+        return s
     return s.encode(encoding or "ascii")
 
 

pandas_datareader/econdb.py

@@ -1,6 +1,4 @@
 import pandas as pd
-import requests
-
 from pandas_datareader.base import _BaseReader
 
 

pandas_datareader/tests/test_econdb.py

@@ -48,17 +48,10 @@ 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")
 
-        # sometimes the country and variable columns are swapped
-        lvl1 = df.columns.levels[0][0]
-        if lvl1 == "Total international arrivals":
-            df = df.swaplevel(0, 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]["Total international arrivals"], expected)
+        # check the values coming back are equal
+        tm.assert_numpy_array_equal(df.values[:, 0], jp)
+        tm.assert_numpy_array_equal(df.values[:, 1], us)
 
     def test_bls(self):
         # BLS

pandas_datareader/tests/test_stooq.py

@@ -27,7 +27,7 @@ def test_stooq_sp500():
 
 
 def test_stooq_clx19f():
-    f = get_data_stooq("CLX19.F", start="20190101", end="20190115")
+    f = get_data_stooq("CLX26.F", start="20200101", end="20200115")
     assert f.shape[0] > 0
 
 

pandas_datareader/yahoo/daily.py

@@ -199,7 +199,7 @@ def _read_one_data(self, url, params):
                 def split_ratio(row):
                     if float(row["Numerator"]) > 0:
                         if ":" in row["Splitratio"]:
-                            n, m = row["Splitratio"].split(':')
+                            n, m = row["Splitratio"].split(":")
                             return float(m) / float(n)
                         else:
                             return eval(row["Splitratio"])