Merge pull request #979 from bashtage/formatting

STY: Improve style and fix FF reader

Author: bashtage

pandas_datareader/famafrench.py

@@ -58,8 +58,7 @@ def _read_zipfile(self, url):
             tmpf.write(raw)
 
             with ZipFile(tmpf, "r") as zf:
-                data = zf.open(zf.namelist()[0]).read().decode('utf-8','ignore')
-
+                data = zf.open(zf.namelist()[0]).read().decode("utf-8", "ignore")
 
         return data
 
@@ -89,7 +88,7 @@ def _read_one_data(self, url, params):
             else:
                 c = ["Count"]
             r = list(range(0, 105, 5))
-            params["names"] = ["Date"] + c + list(zip(r, r[1:], strict=True))
+            params["names"] = ["Date"] + c + list(zip(r, r[1:], strict=False))
 
             if self.symbols != "Prior_2-12_Breakpoints":
                 params["skiprows"] = 1

pandas_datareader/oecd.py

@@ -12,13 +12,13 @@ class OECDReader(_BaseReader):
     @property
     def url(self):
         """API URL"""
-        url = "http://stats.oecd.org/SDMX-JSON/data"
+        url = "https://stats.oecd.org/SDMX-JSON/data"
 
         if not isinstance(self.symbols, str):
             raise ValueError("data name must be string")
 
         # API: https://data.oecd.org/api/sdmx-json-documentation/
-        return "{0}/{1}/all/all?".format(url, self.symbols)
+        return "{0}/{1}/all/all".format(url, self.symbols)
 
     def _read_lines(self, out):
         """read one data from specified URL"""

pandas_datareader/tests/test_famafrench.py

@@ -62,32 +62,32 @@ def test_f_f_research(self):
                     6.82,
                 ],
                 "SMB": [
-                    0.37,
+                    0.40,
                     1.19,
-                    1.44,
-                    4.86,
-                    0.14,
-                    -1.84,
-                    0.18,
-                    -3.02,
-                    3.93,
-                    1.07,
-                    3.78,
-                    0.68,
+                    1.48,
+                    4.87,
+                    0.09,
+                    -1.82,
+                    0.20,
+                    -3.00,
+                    3.96,
+                    1.14,
+                    3.77,
+                    0.73,
                 ],
                 "HML": [
-                    0.33,
-                    3.19,
-                    2.11,
-                    2.91,
-                    -2.39,
-                    -4.52,
-                    -0.36,
+                    0.43,
+                    3.23,
+                    2.21,
+                    2.89,
+                    -2.44,
+                    -4.70,
+                    -0.31,
                     -1.90,
-                    -3.23,
-                    -2.46,
-                    -0.95,
-                    3.64,
+                    -3.16,
+                    -2.43,
+                    -0.96,
+                    3.70,
                 ],
                 "RF": [
                     0.00,

pandas_datareader/tests/test_tiingo.py

@@ -64,7 +64,10 @@ def test_tiingo_metadata(symbols):
 
 
 def test_tiingo_no_api_key(symbols):
-    from test.support import EnvironmentVarGuard
+    try:
+        from test.support.os_helper import EnvironmentVarGuard
+    except ImportError:
+        from test.support import EnvironmentVarGuard
 
     env = EnvironmentVarGuard()
     env.unset("TIINGO_API_KEY")