Skip to content

Commit

Permalink
Fix issue pandas-dev#22872 - Capture specific exceptions
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-ponomaroff committed Oct 27, 2018
1 parent f662c5f commit cd65d8e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions pandas/tests/indexing/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def get_result(self, obj, method, key, axis):
with catch_warnings(record=True):
try:
xp = getattr(obj, method).__getitem__(_axify(obj, key, axis))
except:
except AttributeError:
xp = getattr(obj, method).__getitem__(key)

return xp
Expand Down Expand Up @@ -214,7 +214,7 @@ def _print(result, error=None):

try:
xp = self.get_result(obj, method2, k2, a)
except:
except RuntimeError:
result = 'no comp'
_print(result)
return
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/io/formats/test_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def has_horizontally_truncated_repr(df):
try: # Check header row
fst_line = np.array(repr(df).splitlines()[0].split())
cand_col = np.where(fst_line == '...')[0][0]
except:
except IndexError:
return False
# Make sure each row has this ... in the same place
r = repr(df)
Expand Down Expand Up @@ -452,7 +452,7 @@ def test_to_string_repr_unicode(self):
for line in rs[1:]:
try:
line = line.decode(get_option("display.encoding"))
except:
except UnicodeDecodeError:
pass
if not line.startswith('dtype:'):
assert len(line) == line_len
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/io/test_pytables.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ def safe_remove(path):
if path is not None:
try:
os.remove(path)
except:
except OSError:
pass


def safe_close(store):
try:
if store is not None:
store.close()
except:
except IOError:
pass


Expand Down Expand Up @@ -117,7 +117,7 @@ def _maybe_remove(store, key):
no content from previous tests using the same table name."""
try:
store.remove(key)
except:
except ValueError:
pass


Expand Down Expand Up @@ -4621,7 +4621,7 @@ def do_copy(f, new_f=None, keys=None,
safe_close(tstore)
try:
os.close(fd)
except:
except OSError:
pass
safe_remove(new_f)

Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/io/test_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,7 @@ def test_read_procedure(self):
try:
r1 = connection.execute(proc) # noqa
trans.commit()
except:
except pymysql.err.DatabaseError:
trans.rollback()
raise

Expand Down Expand Up @@ -2375,7 +2375,7 @@ def setup_class(cls):
# No real user should allow root access with a blank password.
pymysql.connect(host='localhost', user='root', passwd='',
db='pandas_nosetest')
except:
except pymysql.err.DatabaseError:
pass
else:
return
Expand All @@ -2402,7 +2402,7 @@ def setup_method(self, request, datapath):
# No real user should allow root access with a blank password.
self.conn = pymysql.connect(host='localhost', user='root',
passwd='', db='pandas_nosetest')
except:
except pymysql.err.DatabaseError:
pass
else:
return
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/test_multilevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ def f():

try:
df = f()
except:
except RuntimeError:
pass
assert (df['foo', 'one'] == 0).all()

Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/test_nanops.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ def _coerce_tds(targ, res):
if axis != 0 and hasattr(
targ, 'shape') and targ.ndim and targ.shape != res.shape:
res = np.split(res, [targ.shape[0]], axis=0)[0]
except:
except ValueError:
targ, res = _coerce_tds(targ, res)

try:
tm.assert_almost_equal(targ, res, check_dtype=check_dtype)
except:
except AssertionError:

# handle timedelta dtypes
if hasattr(targ, 'dtype') and targ.dtype == 'm8[ns]':
Expand All @@ -167,11 +167,11 @@ def _coerce_tds(targ, res):
else:
try:
res = res.astype('c16')
except:
except RuntimeError:
res = res.astype('f8')
try:
targ = targ.astype('c16')
except:
except RuntimeError:
targ = targ.astype('f8')
# there should never be a case where numpy returns an object
# but nanops doesn't, so make that an exception
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/test_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,13 @@ def check_op(op, name):
for op in ops:
try:
check_op(getattr(operator, op), op)
except:
except AttributeError:
pprint_thing("Failing operation: %r" % op)
raise
if compat.PY3:
try:
check_op(operator.truediv, 'div')
except:
except AttributeError:
pprint_thing("Failing operation: %r" % 'div')
raise

Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/test_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ def test_slice(self):
expected = Series([s[start:stop:step] if not isna(s) else NA
for s in values])
tm.assert_series_equal(result, expected)
except:
except IndexError:
print('failed on %s:%s:%s' % (start, stop, step))
raise

Expand Down

0 comments on commit cd65d8e

Please sign in to comment.