BUG: zipfile import

Closes pydata#280

Author: femtotrader

pandas_datareader/edgar.py

@@ -6,7 +6,7 @@
 from pandas import read_csv
 from pandas import DataFrame
 from pandas import to_datetime
-from pandas.io.common import ZipFile
+import zipfile
 from pandas.compat import StringIO
 from pandas.core.common import is_number
 
@@ -65,7 +65,7 @@ def _read_zipfile(self, ftppath):
         except EOFError:
             raise RemoteDataError('FTP server has closed the connection.')
         zipf.seek(0)
-        with ZipFile(zipf, 'r') as zf:
+        with zipfile.ZipFile(zipf, 'r') as zf:
             data = zf.open(zf.namelist()[0]).read().decode()
 
         return StringIO(data)

pandas_datareader/famafrench.py

@@ -1,7 +1,7 @@
 import tempfile
 import re
 import datetime as dt
-from pandas.io.common import ZipFile
+import zipfile
 from pandas.compat import lmap, StringIO
 from pandas import read_csv, to_datetime
 
@@ -61,7 +61,7 @@ def _read_zipfile(self, url):
         with tempfile.TemporaryFile() as tmpf:
             tmpf.write(raw)
 
-            with ZipFile(tmpf, 'r') as zf:
+            with zipfile.ZipFile(tmpf, 'r') as zf:
                 data = zf.open(zf.namelist()[0]).read().decode()
 
         return data