Merge pull request #448 from bashtage/fix-tsp-default

Fix tsp default

Author: bashtage

pandas_datareader/data.py

@@ -231,7 +231,7 @@ def DataReader(name, data_source=None, start=None, end=None,
         Time, in seconds, to pause between consecutive queries of chunks. If
         single value given for symbol, represents the pause between retries.
     session : Session, default None
-            requests.sessions.Session instance to be used
+        requests.sessions.Session instance to be used
     access_key : (str, None)
         Optional parameter to specify an API key for certain data sources.
 

pandas_datareader/edgar.py

@@ -125,7 +125,7 @@ def _read_daily_data(self, url, params):
     def _check_idx(self, idx_entry):
         if re.match(_FILENAME_MASTER_RE, idx_entry['name']):
             if idx_entry['date'] is not None:
-                if (self.start <= idx_entry['date'] <= self.end):
+                if self.start <= idx_entry['date'] <= self.end:
                     return True
         else:
             return False
@@ -235,7 +235,7 @@ def _get_index_date(self, filename):
                     filedate = dt.datetime.strptime(idx_date, '%y%m%d')
                     if filedate > _EDGAR_MAX_6_DIGIT_DATE:
                         filedate = None
-            elif len(idx_date) == 8:
+            else:  # len(idx_date) == 8:
                 filedate = dt.datetime.strptime(idx_date, '%Y%m%d')
         except AttributeError:
             filedate = None
@@ -244,7 +244,7 @@ def _get_index_date(self, filename):
 
     def _check_mlsd_year(self, entry):
         try:
-            if (self.start.year <= int(entry['name']) <= self.end.year):
+            if self.start.year <= int(entry['name']) <= self.end.year:
                 return True
             else:
                 return False

pandas_datareader/enigma.py

@@ -43,7 +43,7 @@ def __init__(self,
 
         super(EnigmaReader, self).__init__(symbols=[],
                                            retry_count=retry_count,
-                                           pause=pause)
+                                           pause=pause, session=session)
         if api_key is None:
             self._api_key = os.getenv('ENIGMA_API_KEY')
             if self._api_key is None:

pandas_datareader/famafrench.py

@@ -20,7 +20,7 @@ def get_available_datasets(**kwargs):
     Parameters
     ----------
     session : Session, default None
-            requests.sessions.Session instance to be used
+        requests.sessions.Session instance to be used
 
     Returns
     -------

pandas_datareader/io/sdmx.py

@@ -34,7 +34,7 @@ def read_sdmx(path_or_buf, dtype='float64', dsd=None):
 
     Parameters
     ----------
-    filepath_or_buffer : a valid SDMX-XML string or file-like
+    path_or_buf : a valid SDMX-XML string or file-like
         https://webgate.ec.europa.eu/fpfis/mwikis/sdmx/index.php/Main_Page
     dtype : str
         dtype to coerce values
@@ -65,9 +65,9 @@ def read_sdmx(path_or_buf, dtype='float64', dsd=None):
                 data = _read_zipped_sdmx(result)
                 return read_sdmx(data, dtype=dtype, dsd=dsd)
             except HTTPError:
+                time.sleep(1)
                 continue
 
-            time.sleep(1)
         msg = ('Unable to download zipped data within 60 secs, '
                'please download it manually from: {0}')
         raise ValueError(msg.format(result))

pandas_datareader/moex.py

@@ -124,7 +124,7 @@ def read(self):
                     start_str = self.start.strftime('%Y-%m-%d')
                     start = self.start
 
-                if start >= self.end or start>=dt.date.today():
+                if start >= self.end or start >= dt.date.today():
                     break
 
                 params = self._get_params(start_str)

pandas_datareader/nasdaq_trader.py

@@ -38,14 +38,14 @@ def _download_nasdaq_symbols(timeout):
         ftp_session = FTP(_NASDAQ_FTP_SERVER, timeout=timeout)
         ftp_session.login()
     except all_errors as err:
-        raise RemoteDataError('Error connecting to %r: $s' %
+        raise RemoteDataError('Error connecting to %r: %s' %
                               (_NASDAQ_FTP_SERVER, err))
 
     lines = []
     try:
         ftp_session.retrlines('RETR ' + _NASDAQ_TICKER_LOC, lines.append)
     except all_errors as err:
-        raise RemoteDataError('Error downloading from %r: $s' %
+        raise RemoteDataError('Error downloading from %r: %s' %
                               (_NASDAQ_FTP_SERVER, err))
     finally:
         ftp_session.close()

pandas_datareader/tsp.py

@@ -27,8 +27,8 @@ class TSPReader(_BaseReader):
     """
 
     def __init__(self,
-                 symbols=['Linc', 'L2020', 'L2030', 'L2040',
-                          'L2050', 'G', 'F', 'C', 'S', 'I'],
+                 symbols=('Linc', 'L2020', 'L2030', 'L2040',
+                          'L2050', 'G', 'F', 'C', 'S', 'I'),
                  start=None, end=None, retry_count=3, pause=0.001,
                  session=None):
         super(TSPReader, self).__init__(symbols=symbols,

pandas_datareader/wb.py

@@ -397,15 +397,15 @@ def get_countries(**kwargs):
 
 
 def get_indicators(**kwargs):
-    '''Download information about all World Bank data series
+    """Download information about all World Bank data series
 
     Parameters
     ----------
 
     kwargs:
         keywords passed to WorldBankReader
 
-    '''
+    """
     return WorldBankReader(**kwargs).get_indicators()