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

pandas_datareader/eurostat.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import pandas as pd
 
 from pandas_datareader.base import _BaseReader
@@ -26,7 +24,7 @@ def dsd_url(self):
         if not isinstance(self.symbols, str):
             raise ValueError("data name must be string")
 
-        return "{0}/datastructure/ESTAT/DSD_{1}".format(self._URL, self.symbols)
+        return f"{self._URL}/datastructure/ESTAT/DSD_{self.symbols}"
 
     def _read_one_data(self, url, params):
         resp_dsd = self._get_response(self.dsd_url)

pandas_datareader/famafrench.py

@@ -72,7 +72,7 @@ def read(self):
             A dictionary of DataFrames. Tables are accessed by integer keys.
             See df['DESCR'] for a description of the data set.
         """
-        return super(FamaFrenchReader, self).read()
+        return super().read()
 
     def _read_one_data(self, url, params):
         params = {
@@ -120,15 +120,15 @@ def _read_one_data(self, url, params):
             datasets[i] = df
 
             title = src[:start].replace("\r\n", " ").strip()
-            shape = "({0} rows x {1} cols)".format(*df.shape)
-            table_desc.append("{0} {1}".format(title, shape).strip())
+            shape = "({} rows x {} cols)".format(*df.shape)
+            table_desc.append(f"{title} {shape}".strip())
 
-        descr = "{0}\n{1}\n\n".format(
+        descr = "{}\n{}\n\n".format(
             self.symbols.replace("_", " "), len(self.symbols) * "-"
         )
         if doc_chunks:
             descr += " ".join(doc_chunks).replace(2 * " ", " ") + "\n\n"
-        table_descr = map(lambda x: "{0:3} : {1}".format(*x), enumerate(table_desc))
+        table_descr = map(lambda x: "{:3} : {}".format(*x), enumerate(table_desc))
         datasets["DESCR"] = descr + "\n".join(table_descr)
 
         return datasets

pandas_datareader/fred.py

@@ -34,7 +34,7 @@ def _read(self):
         else:
             names = self.symbols
 
-        urls = ["{}?id={}".format(self.url, n) for n in names]
+        urls = [f"{self.url}?id={n}" for n in names]
 
         def fetch_data(url, name):
             """Utillity to fetch data"""
@@ -52,9 +52,9 @@ def fetch_data(url, name):
                 return data.truncate(self.start, self.end)
             except KeyError as exc:  # pragma: no cover
                 if data.iloc[3].name[7:12] == "Error":
-                    raise IOError(
+                    raise OSError(
                         "Failed to get the data. Check that "
-                        "{0!r} is a valid FRED series.".format(name)
+                        "{!r} is a valid FRED series.".format(name)
                     ) from exc
                 raise
 

pandas_datareader/iex/__init__.py

@@ -22,7 +22,7 @@ class IEX(_BaseReader):
     def __init__(
         self, symbols=None, start=None, end=None, retry_count=3, pause=0.1, session=None
     ):
-        super(IEX, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,
@@ -41,11 +41,11 @@ def service(self):
     def url(self):
         """API URL"""
         qstring = urlencode(self._get_params(self.symbols))
-        return "https://api.iextrading.com/1.0/{}?{}".format(self.service, qstring)
+        return f"https://api.iextrading.com/1.0/{self.service}?{qstring}"
 
     def read(self):
         """Read data"""
-        df = super(IEX, self).read()
+        df = super().read()
         if isinstance(df, pd.DataFrame):
             df = df.squeeze()
             if not isinstance(df, pd.DataFrame):
@@ -75,7 +75,7 @@ def _output_error(self, out):
             raise TypeError("Failed to interpret response as JSON.") from exc
 
         for key, string in content.items():
-            e = "IEX Output error encountered: {}".format(string)
+            e = f"IEX Output error encountered: {string}"
             if key == "error":
                 raise Exception(e)
 

pandas_datareader/iex/daily.py

@@ -71,7 +71,7 @@ def __init__(
         else:
             self.sandbox = False
         self.api_key = api_key
-        super(IEXDailyReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,

pandas_datareader/iex/deep.py

@@ -39,7 +39,7 @@ def __init__(
         else:
             symbols = [s.lower() for s in symbols]
 
-        super(Deep, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,
@@ -53,7 +53,7 @@ def __init__(
     def service(self):
         """Service endpoint"""
         ss = "/" + self.sub if self.sub is not None else ""
-        return "deep{}".format(ss)
+        return f"deep{ss}"
 
     def _read_lines(self, out):
         """
@@ -85,7 +85,7 @@ def _read_lines(self, out):
         if self.sub in fmap:
             return getattr(self, fmap[self.sub])(out)
         else:
-            raise "Invalid service specified: {}.".format(self.sub)
+            raise f"Invalid service specified: {self.sub}."
 
     def _read_system_event(self, out):
         # Map the response code to a string output per the API docs.

pandas_datareader/iex/market.py

@@ -20,7 +20,7 @@ class MarketReader(IEX):
     def __init__(
         self, symbols=None, start=None, end=None, retry_count=3, pause=0.1, session=None
     ):
-        super(MarketReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,

pandas_datareader/iex/ref.py

@@ -20,7 +20,7 @@ class SymbolsReader(IEX):
     def __init__(
         self, symbols=None, start=None, end=None, retry_count=3, pause=0.1, session=None
     ):
-        super(SymbolsReader, self).__init__(
+        super().__init__(
             symbols=symbols,
             start=start,
             end=end,