Skip to content

Commit 75fc096

Browse files
dwrpaynebashtage
authored andcommitted
Fix flake8 issues.
1 parent e669812 commit 75fc096

File tree

3 files changed

+34
-29
lines changed

3 files changed

+34
-29
lines changed

pandas_datareader/bankofcanada.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
from __future__ import unicode_literals
22

33
import pandas.compat as compat
4+
45
from pandas_datareader.base import _BaseReader
56

6-
class BankOfCanadaReader(_BaseReader):
77

8+
class BankOfCanadaReader(_BaseReader):
89
"""Get data for the given name from Bank of Canada."""
910

1011
_URL = 'http://www.bankofcanada.ca/valet/observations'

pandas_datareader/data.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@
44

55
import warnings
66

7-
from pandas_datareader.google.daily import GoogleDailyReader
8-
from pandas_datareader.google.quotes import GoogleQuotesReader
9-
from pandas_datareader.google.options import Options as GoogleOptions
10-
11-
from pandas_datareader.yahoo.daily import YahooDailyReader
12-
from pandas_datareader.yahoo.quotes import YahooQuotesReader
13-
from pandas_datareader.yahoo.actions import (YahooActionReader, YahooDivReader)
14-
from pandas_datareader.yahoo.components import _get_data as get_components_yahoo # noqa
15-
from pandas_datareader.yahoo.options import Options as YahooOptions
16-
177
from pandas_datareader.bankofcanada import BankOfCanadaReader
18-
from pandas_datareader.eurostat import EurostatReader
19-
from pandas_datareader.fred import FredReader
20-
from pandas_datareader.famafrench import FamaFrenchReader
21-
from pandas_datareader.oecd import OECDReader
228
from pandas_datareader.edgar import EdgarIndexReader
239
from pandas_datareader.enigma import EnigmaReader
10+
from pandas_datareader.eurostat import EurostatReader
11+
from pandas_datareader.famafrench import FamaFrenchReader
12+
from pandas_datareader.fred import FredReader
13+
from pandas_datareader.google.daily import GoogleDailyReader
14+
from pandas_datareader.google.options import Options as GoogleOptions
15+
from pandas_datareader.google.quotes import GoogleQuotesReader
16+
from pandas_datareader.moex import MoexReader
2417
from pandas_datareader.nasdaq_trader import get_nasdaq_symbols
18+
from pandas_datareader.oecd import OECDReader
2519
from pandas_datareader.quandl import QuandlReader
26-
from pandas_datareader.moex import MoexReader
20+
from pandas_datareader.yahoo.actions import (YahooActionReader, YahooDivReader)
21+
from pandas_datareader.yahoo.daily import YahooDailyReader
22+
from pandas_datareader.yahoo.options import Options as YahooOptions
23+
from pandas_datareader.yahoo.quotes import YahooQuotesReader
2724

2825

2926
def get_data_fred(*args, **kwargs):
@@ -132,11 +129,11 @@ def DataReader(name, data_source=None, start=None, end=None,
132129
chunksize=25,
133130
retry_count=retry_count, pause=pause,
134131
session=session).read()
135-
132+
136133
elif data_source == "bankofcanada":
137134
return BankOfCanadaReader(symbols=name, start=start, end=end,
138-
retry_count=retry_count, pause=pause,
139-
session=session).read()
135+
retry_count=retry_count, pause=pause,
136+
session=session).read()
140137

141138
elif data_source == "enigma":
142139
return EnigmaReader(dataset_id=name, api_key=access_key).read()

pandas_datareader/tests/test_bankofcanada.py

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from datetime import date, timedelta
2+
23
import pytest
34

4-
from pandas_datareader._utils import RemoteDataError
55
import pandas_datareader.data as web
6+
from pandas_datareader._utils import RemoteDataError
67

78

89
class TestBankOfCanada(object):
9-
10+
1011
@staticmethod
1112
def get_symbol(currency_code, inverted=False):
1213
if inverted:
@@ -15,23 +16,27 @@ def get_symbol(currency_code, inverted=False):
1516
return 'FX{}CAD'.format(currency_code)
1617

1718
def check_bankofcanada_count(self, code):
18-
df = web.DataReader(self.get_symbol(code), 'bankofcanada', date.today() - timedelta(days=30), date.today())
19+
df = web.DataReader(self.get_symbol(code), 'bankofcanada',
20+
date.today() - timedelta(days=30), date.today())
1921
assert df.size > 15
2022

2123
def check_bankofcanada_valid(self, code):
2224
symbol = self.get_symbol(code)
23-
df = web.DataReader(symbol, 'bankofcanada', date.today() - timedelta(days=30), date.today())
25+
df = web.DataReader(symbol, 'bankofcanada',
26+
date.today() - timedelta(days=30), date.today())
2427
assert symbol in df.columns
2528

2629
def check_bankofcanada_inverted(self, code):
2730
symbol = self.get_symbol(code)
2831
symbol_inverted = self.get_symbol(code, inverted=True)
2932

30-
df = web.DataReader(symbol, 'bankofcanada', date.today() - timedelta(days=30), date.today())
31-
df_inv = web.DataReader(symbol_inverted, 'bankofcanada', date.today() - timedelta(days=30), date.today())
33+
df = web.DataReader(symbol, 'bankofcanada',
34+
date.today() - timedelta(days=30), date.today())
35+
df_i = web.DataReader(symbol_inverted, 'bankofcanada',
36+
date.today() - timedelta(days=30), date.today())
3237

33-
pairs = zip((1/df)[symbol].tolist(), df_inv[symbol_inverted].tolist())
34-
assert all(a-b < 0.01 for a, b in pairs)
38+
pairs = zip((1 / df)[symbol].tolist(), df_i[symbol_inverted].tolist())
39+
assert all(a - b < 0.01 for a, b in pairs)
3540

3641
def test_bankofcanada_usd_count(self):
3742
self.check_bankofcanada_count('USD')
@@ -53,8 +58,10 @@ def test_bankofcanada_eur_inverted(self):
5358

5459
def test_bankofcanada_bad_range(self):
5560
with pytest.raises(RemoteDataError):
56-
web.DataReader('FXCADUSD', 'bankofcanada', date.today(), date.today() - timedelta(days=30))
61+
web.DataReader('FXCADUSD', 'bankofcanada',
62+
date.today(), date.today() - timedelta(days=30))
5763

5864
def test_bankofcanada_bad_url(self):
5965
with pytest.raises(RemoteDataError):
60-
web.DataReader('abcdefgh', 'bankofcanada', date.today(), date.today() - timedelta(days=30))
66+
web.DataReader('abcdefgh', 'bankofcanada',
67+
date.today() - timedelta(days=30), date.today())

0 commit comments

Comments
 (0)