Skip to content
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

STYLE: Specify bare exceptions in pandas/tests #23370

Merged
merged 22 commits into from
Nov 19, 2018
Merged

STYLE: Specify bare exceptions in pandas/tests #23370

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cd65d8e
Fix issue #22872 - Capture specific exceptions
alexander-ponomaroff Oct 27, 2018
066cdcf
Some fixes
alexander-ponomaroff Oct 27, 2018
318dd54
Further fixes
alexander-ponomaroff Oct 27, 2018
677b707
Test if the problem is in common.py line 217
alexander-ponomaroff Oct 27, 2018
fa0b03b
Issue confirmed line 217 of common.py, testing exceptions
alexander-ponomaroff Oct 27, 2018
2f57297
Working through exceptions
alexander-ponomaroff Oct 27, 2018
6cca7d7
Working through exceptions
alexander-ponomaroff Oct 27, 2018
6967323
Fix final bare excepts and stop ignoring E722
alexander-ponomaroff Oct 27, 2018
91c8af2
Added assertion error to line 217 of common.py
alexander-ponomaroff Oct 27, 2018
3fc4499
Line 217 still problematic
alexander-ponomaroff Oct 27, 2018
12b8c34
Rebase
alexander-ponomaroff Oct 31, 2018
f055a09
Update pymysql errors
alexander-ponomaroff Nov 5, 2018
4f08510
Merge branch 'master' into issue-22872
alexander-ponomaroff Nov 5, 2018
85e1c9c
Rebase
alexander-ponomaroff Nov 8, 2018
74ce78c
Merge conflict fix
alexander-ponomaroff Nov 8, 2018
39944b6
isort Run on pandas, test_sql.py removed from setup.cfg exclusion list
alexander-ponomaroff Nov 8, 2018
c276bd3
merge
alexander-ponomaroff Nov 8, 2018
48ad6f0
Reverted isort changes
alexander-ponomaroff Nov 8, 2018
c55692f
import pymysql in the beginning of function
alexander-ponomaroff Nov 10, 2018
ff36b21
Remove empty line 1819
alexander-ponomaroff Nov 13, 2018
bd3e656
Merge branch 'master' into PR_TOOL_MERGE_PR_23370
jreback Nov 18, 2018
6a86779
Merge branch 'master' into PR_TOOL_MERGE_PR_23370
jreback Nov 18, 2018
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/tests/io/test_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,10 +1787,12 @@ def test_read_procedure(self):

connection = self.conn.connect()
trans = connection.begin()

import pymysql
alexander-ponomaroff marked this conversation as resolved.
Show resolved Hide resolved
try:
r1 = connection.execute(proc) # noqa
trans.commit()
except pymysql.err.DatabaseError:
except pymysql.Error:
datapythonista marked this conversation as resolved.
Show resolved Hide resolved
trans.rollback()
raise

Expand Down Expand Up @@ -2375,7 +2377,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 pymysql.err.DatabaseError:
except pymysql.Error:
pass
else:
return
Expand All @@ -2402,7 +2404,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 pymysql.err.DatabaseError:
except pymysql.Error:
pass
else:
return
Expand Down