Skip to content

Commit

Permalink
Merge d1a54d2 into fc62e23
Browse files Browse the repository at this point in the history
  • Loading branch information
bashtage committed Apr 14, 2018
2 parents fc62e23 + d1a54d2 commit 6589b34
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions pandas_datareader/compat/__init__.py
Expand Up @@ -14,6 +14,7 @@
PANDAS_0190 = (PANDAS_VERSION >= LooseVersion('0.19.0'))
PANDAS_0200 = (PANDAS_VERSION >= LooseVersion('0.20.0'))
PANDAS_0210 = (PANDAS_VERSION >= LooseVersion('0.21.0'))
PANDAS_0230 = (PANDAS_VERSION >= LooseVersion('0.23.0'))

if PANDAS_0190:
from pandas.api.types import is_number
Expand All @@ -39,6 +40,12 @@ def get_filepath_or_buffer(filepath_or_buffer, encoding=None,
from pandas.util.testing import assertRaisesRegexp as assert_raises_regex
get_filepath_or_buffer = com.get_filepath_or_buffer

if PANDAS_0230:
from pandas.core.dtypes.common import is_list_like
else:
from pandas.core.common import is_list_like


if compat.PY3:
from urllib.error import HTTPError
else:
Expand Down
3 changes: 2 additions & 1 deletion pandas_datareader/fred.py
@@ -1,4 +1,5 @@
from pandas.core.common import is_list_like
from pandas_datareader.compat import is_list_like

from pandas import concat, read_csv

from pandas_datareader.base import _BaseReader
Expand Down

0 comments on commit 6589b34

Please sign in to comment.