MAINT: Refactor more compat checks into compat init (#311)

Author: gfyoung

pandas_datareader/_utils.py

@@ -1,43 +1,12 @@
 import datetime as dt
-from distutils.version import LooseVersion
-
-import pandas as pd
 from pandas import to_datetime
+from requests_file import FileAdapter
+from pandas_datareader.compat import is_number
 
 import requests
-from requests_file import FileAdapter
 import requests_ftp
-requests_ftp.monkeypatch_session()
-
-
-if pd.compat.PY3:
-    from urllib.error import HTTPError     # noqa
-else:
-    from urllib2 import HTTPError          # noqa
 
-PANDAS_VERSION = LooseVersion(pd.__version__)
-
-if PANDAS_VERSION >= LooseVersion('0.19.0'):
-    PANDAS_0190 = True
-    from pandas.api.types import is_number                   # noqa
-else:
-    PANDAS_0190 = False
-    from pandas.core.common import is_number                 # noqa
-
-if PANDAS_VERSION >= LooseVersion('0.17.0'):
-    PANDAS_0170 = True
-else:
-    PANDAS_0170 = False
-
-if PANDAS_VERSION >= LooseVersion('0.16.0'):
-    PANDAS_0160 = True
-else:
-    PANDAS_0160 = False
-
-if PANDAS_VERSION >= LooseVersion('0.14.0'):
-    PANDAS_0140 = True
-else:
-    PANDAS_0140 = False
+requests_ftp.monkeypatch_session()
 
 
 class SymbolWarning(UserWarning):

pandas_datareader/compat/__init__.py

@@ -1,11 +1,22 @@
 # flake8: noqa
 import pandas as pd
+import pandas.compat as compat
 
 from io import BytesIO
 from distutils.version import LooseVersion
 
-pandas_version = LooseVersion(pd.__version__)
-if pandas_version <= '0.19.2':
+PANDAS_VERSION = LooseVersion(pd.__version__)
+
+PANDAS_0190 = (PANDAS_VERSION >= LooseVersion('0.19.0'))
+PANDAS_0170 = (PANDAS_VERSION >= LooseVersion('0.17.0'))
+PANDAS_0160 = (PANDAS_VERSION >= LooseVersion('0.16.0'))
+
+if PANDAS_0190:
+    from pandas.api.types import is_number
+else:
     from pandas.core.common import is_number
+
+if compat.PY3:
+    from urllib.error import HTTPError
 else:
-    from pandas.api.types import is_number
+    from urllib2 import HTTPError

pandas_datareader/io/sdmx.py

@@ -8,7 +8,7 @@
 import pandas.compat as compat
 
 from pandas_datareader.io.util import _read_content
-from pandas_datareader._utils import HTTPError
+from pandas_datareader.compat import HTTPError
 
 
 _STRUCTURE = '{http://www.sdmx.org/resources/sdmxml/schemas/v2_1/structure}'

pandas_datareader/tests/test_eurostat.py

@@ -6,7 +6,7 @@
 import pandas.util.testing as tm
 import pandas_datareader.data as web
 
-from pandas_datareader._utils import PANDAS_0170
+from pandas_datareader.compat import PANDAS_0170
 
 
 class TestEurostat(tm.TestCase):

pandas_datareader/tests/test_wb.py

@@ -8,7 +8,7 @@
 
 from pandas_datareader.wb import (search, download, get_countries,
                                   get_indicators, WorldBankReader)
-from pandas_datareader._utils import PANDAS_0170, PANDAS_0160, PANDAS_0140
+from pandas_datareader.compat import PANDAS_0170, PANDAS_0160
 
 
 class TestWB(tm.TestCase):
@@ -70,12 +70,7 @@ def test_wdi_download(self):
         # Round, to ignore revisions to data.
         result = np.round(result, decimals=-3)
 
-        if PANDAS_0140:
-            expected.index.names = ['country', 'year']
-        else:
-            # prior versions doesn't allow to set multiple names to MultiIndex
-            # Thus overwrite it with the result
-            expected.index = result.index
+        expected.index.names = ['country', 'year']
         tm.assert_frame_equal(result, expected)
 
         # pass start and end as string
@@ -114,13 +109,7 @@ def test_wdi_download_str(self):
             result = result.sort()
         result = np.round(result, decimals=-3)
 
-        if PANDAS_0140:
-            expected.index.names = ['country', 'year']
-        else:
-            # prior versions doesn't allow to set multiple names to MultiIndex
-            # Thus overwrite it with the result
-            expected.index = result.index
-
+        expected.index.names = ['country', 'year']
         tm.assert_frame_equal(result, expected)
 
         result = WorldBankReader(inds, countries=cntry_codes,

pandas_datareader/wb.py

@@ -7,7 +7,7 @@
 import numpy as np
 
 from pandas_datareader.base import _BaseReader
-from pandas_datareader._utils import PANDAS_0170
+from pandas_datareader.compat import PANDAS_0170
 
 # This list of country codes was pulled from wikipedia during October 2014.
 # While some exceptions do exist, it is the best proxy for countries supported