Skip to content

TST: Remove else after except in tests for io.data.Options. #7564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jreback merged 1 commit into from
Jun 25, 2014
Merged

TST: Remove else after except in tests for io.data.Options. #7564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pandas/io/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,10 @@ def _get_option_tables(self, month, year, expiry):

root = self._parse_url(url)
tables = root.xpath('.//table')
ntables = len(tables)
if ntables == 0:
raise RemoteDataError("No tables found at {0!r}".format(url))

table_name = '_tables' + m1 + str(year)[-2:]
setattr(self, table_name, tables)

Expand Down Expand Up @@ -723,9 +727,7 @@ def _get_option_data(self, month, year, expiry, name):

ntables = len(tables)
table_loc = self._TABLE_LOC[name]
if ntables == 0:
raise RemoteDataError("No tables found at {0!r}".format(url))
elif table_loc - 1 > ntables:
if table_loc - 1 > ntables:
raise RemoteDataError("Table location {0} invalid, {1} tables"
" found".format(table_loc, ntables))

Expand Down
26 changes: 9 additions & 17 deletions pandas/io/tests/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,7 @@ def test_get_options_data(self):
options = self.aapl.get_options_data(expiry=self.expiry)
except RemoteDataError as e:
nose.SkipTest(e)
else:
assert len(options) > 1
self.assertTrue(len(options) > 1)

@network
def test_get_near_stock_price(self):
Expand All @@ -276,9 +275,6 @@ def test_get_near_stock_price(self):
expiry=self.expiry)
except RemoteDataError as e:
nose.SkipTest(e)
else:
assert len(options) > 1

self.assertTrue(len(options) > 1)

@network
Expand All @@ -287,42 +283,38 @@ def test_get_call_data(self):
calls = self.aapl.get_call_data(expiry=self.expiry)
except RemoteDataError as e:
nose.SkipTest(e)
else:
assert len(calls) > 1
self.assertTrue(len(calls) > 1)

@network
def test_get_put_data(self):
try:
puts = self.aapl.get_put_data(expiry=self.expiry)
except RemoteDataError as e:
nose.SkipTest(e)
else:
assert len(puts) > 1
self.assertTrue(len(puts) > 1)

@network
def test_get_expiry_months(self):
try:
dates = self.aapl._get_expiry_months()
except RemoteDataError:
raise nose.SkipTest("RemoteDataError thrown no dates found")
except RemoteDataError as e:
raise nose.SkipTest(e)
self.assertTrue(len(dates) > 1)

@network
def test_get_all_data(self):
try:
data = self.aapl.get_all_data(put=True)
except RemoteDataError:
raise nose.SkipTest("RemoteDataError thrown")

except RemoteDataError as e:
raise nose.SkipTest(e)
self.assertTrue(len(data) > 1)

@network
def test_get_all_data_calls_only(self):
try:
data = self.aapl.get_all_data(call=True, put=False)
except RemoteDataError:
raise nose.SkipTest("RemoteDataError thrown")

except RemoteDataError as e:
raise nose.SkipTest(e)
self.assertTrue(len(data) > 1)

@network
Expand Down