Merge pull request #980 from bashtage/pyupgrade-38

MAINT: Upgrade to Python 3.8

Author: bashtage

docs/source/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # pandas-datareader documentation build configuration file, created by
 # sphinx-quickstart on Thu Jan 18 13:34:14 2018.

pandas_datareader/av/__init__.py

@@ -29,7 +29,7 @@ def __init__(
         session=None,
         api_key=None,
     ):
-        super(AlphaVantage, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,

pandas_datareader/av/forex.py

@@ -30,7 +30,7 @@ class AVForexReader(AlphaVantage):
     def __init__(
         self, symbols=None, retry_count=3, pause=0.1, session=None, api_key=None
     ):
-        super(AVForexReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=None,
             end=None,
@@ -79,7 +79,7 @@ def read(self):
                 "from_currency": self.from_curr[pair],
                 "to_currency": self.to_curr[pair],
             }
-            data = super(AVForexReader, self).read()
+            data = super().read()
             result.append(data)
         df = pd.concat(result, axis=1)
         df.columns = self.symbols

pandas_datareader/av/quotes.py

@@ -36,7 +36,7 @@ def __init__(
                 raise ValueError("Up to 100 symbols at once are allowed.")
             else:
                 syms = symbols
-        super(AVQuotesReader, self).__init__(
+        super().__init__(
             symbols=syms,
             start=None,
             end=None,
@@ -76,6 +76,6 @@ def _read_lines(self, out):
                 df["volume"] = [np.nan * len(self.symbols)]
             result.append(df)
         if len(result) != len(self.symbols):
-            raise ValueError("Not all symbols downloaded. Check valid " "ticker(s).")
+            raise ValueError("Not all symbols downloaded. Check valid ticker(s).")
         else:
             return pd.concat(result)

pandas_datareader/av/time_series.py

@@ -55,7 +55,7 @@ def __init__(
         api_key=None,
     ):
         self._func = function
-        super(AVTimeSeriesReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,
@@ -111,7 +111,7 @@ def params(self):
         return p
 
     def _read_lines(self, out):
-        data = super(AVTimeSeriesReader, self)._read_lines(out)
+        data = super()._read_lines(out)
         # reverse since alphavantage returns descending by date
         data = data[::-1]
         start_str = self.start.strftime("%Y-%m-%d")

pandas_datareader/bankofcanada.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pandas_datareader.base import _BaseReader
 
 
@@ -18,7 +16,7 @@ def url(self):
         if not isinstance(self.symbols, str):
             raise ValueError("data name must be string")
 
-        return "{0}/{1}/csv".format(self._URL, self.symbols)
+        return f"{self._URL}/{self.symbols}/csv"
 
     @property
     def params(self):

pandas_datareader/base.py

@@ -16,7 +16,7 @@
 )
 
 
-class _BaseReader(object):
+class _BaseReader:
     """
     Parameters
     ----------
@@ -114,7 +114,7 @@ def _read_url_as_StringIO(self, url, params=None):
         out = StringIO()
         if len(text) == 0:
             service = self.__class__.__name__
-            raise IOError(
+            raise OSError(
                 "{} request returned no data; check URL for invalid "
                 "inputs: {}".format(service, self.url)
             )
@@ -167,9 +167,9 @@ def _get_response(self, url, params=None, headers=None):
 
         if params is not None and len(params) > 0:
             url = url + "?" + urlencode(params)
-        msg = "Unable to read URL: {0}".format(url)
+        msg = f"Unable to read URL: {url}"
         if last_response_text:
-            msg += "\nResponse Text:\n{0}".format(last_response_text)
+            msg += f"\nResponse Text:\n{last_response_text}"
 
         raise RemoteDataError(msg)
 
@@ -226,7 +226,7 @@ def __init__(
         session=None,
         chunksize=25,
     ):
-        super(_DailyBaseReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,
@@ -260,7 +260,7 @@ def _dl_mult_symbols(self, symbols):
                 try:
                     stocks[sym] = self._read_one_data(self.url, self._get_params(sym))
                     passed.append(sym)
-                except (IOError, KeyError):
+                except (OSError, KeyError):
                     msg = "Failed to read symbol: {0!r}, replacing with NaN."
                     warnings.warn(msg.format(sym), SymbolWarning, stacklevel=2)
                     failed.append(sym)
@@ -294,7 +294,7 @@ class _OptionBaseReader(_BaseReader):
     def __init__(self, symbol, session=None):
         """Instantiates options_data with a ticker saved as symbol"""
         self.symbol = symbol.upper()
-        super(_OptionBaseReader, self).__init__(symbols=symbol, session=session)
+        super().__init__(symbols=symbol, session=session)
 
     def get_options_data(self, month=None, year=None, expiry=None):
         """

pandas_datareader/data.py

@@ -491,7 +491,7 @@ def DataReader(
     elif data_source == "nasdaq":
         if name != "symbols":
             raise ValueError(
-                "Only the string 'symbols' is supported for " "Nasdaq, not %r" % (name,)
+                "Only the string 'symbols' is supported for Nasdaq, not {!r}".format(name)
             )
         return get_nasdaq_symbols(retry_count=retry_count, pause=pause)
 

pandas_datareader/econdb.py

@@ -50,7 +50,7 @@ def __init__(
         session=None,
         freq=None,
     ):
-        super(EcondbReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,
@@ -71,7 +71,7 @@ def url(self):
         if not isinstance(self.symbols, str):
             raise ValueError("data name must be string")
 
-        return "{0}?{1}&format=json&page_size=500&expand=both".format(
+        return "{}?{}&format=json&page_size=500&expand=both".format(
             self._URL, self.symbols
         )
 

pandas_datareader/enigma.py

@@ -55,7 +55,7 @@ def __init__(
     ):
         raise ImmediateDeprecationError(DEP_ERROR_MSG.format("Enigma"))
 
-        super(EnigmaReader, self).__init__(
+        super().__init__(
             symbols=[], retry_count=retry_count, pause=pause, session=session
         )
         if api_key is None:
@@ -78,7 +78,7 @@ def __init__(
             )
 
         headers = {
-            "Authorization": "Bearer {0}".format(self._api_key),
+            "Authorization": f"Bearer {self._api_key}",
             "User-Agent": "pandas-datareader",
         }
         self.session.headers.update(headers)
@@ -101,7 +101,7 @@ def _read(self):
 
     def _get(self, url):
         """HTTP GET Request with Retry Logic"""
-        url = "{0}/{1}".format(self._base_url, url)
+        url = f"{self._base_url}/{url}"
         attempts = 0
         while True:
             try:
@@ -125,12 +125,12 @@ def get_dataset_metadata(self, dataset_id):
         """Get the Dataset Model of this EnigmaReader's dataset
         https://docs.public.enigma.com/resources/dataset/index.html
         """
-        url = "datasets/{0}?row_limit=0".format(dataset_id)
+        url = f"datasets/{dataset_id}?row_limit=0"
         response = self._get(url)
         return response.json()
 
     def get_snapshot_export(self, snapshot_id):
         """Return raw CSV of a dataset"""
-        url = "export/{0}".format(snapshot_id)
+        url = f"export/{snapshot_id}"
         response = self._get(url)
         return response.content