Merge pull request #670 from econdb/master

Correct EcondbReader's API URL format

Author: bashtage

pandas_datareader/econdb.py

@@ -3,7 +3,6 @@
 import requests
 import pandas as pd
 
-
 from pandas_datareader.base import _BaseReader
 
 
@@ -17,10 +16,10 @@ class EcondbReader(_BaseReader):
     @property
     def url(self):
         """API URL"""
-        if not isinstance(self.symbols, string_types):
+        if not isinstance(self.symbols, str):
             raise ValueError('data name must be string')
 
-        return ('{0}?{1}&format=json&page_size=500&expand=meta'
+        return ('{0}?{1}&format=json&page_size=500&expand=both'
                 .format(self._URL, self.symbols))
 
     def read(self):

pandas_datareader/tests/test_econdb.py

@@ -42,8 +42,8 @@ def test_get_tourism(self):
         df = df.astype(np.float)
         jp = np.array([8351000, 6790000, 8611000, 6219000,
                        8368000], dtype=float)
-        us = np.array([175702309, 160507417, 164079732, 167600277,
-                       171320408], dtype=float)
+        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')