openstack/deb-python-pymysql
Code Issues Proposed changes

Don't try to iterate over none for warnings

Browse Source 
When executing multiple statements that generate warnings
show_warnings() may produce None which _show_warnings() was trying to
iterate over.
This commit is contained in:
Michael Miller
2015-04-02 18:27:50 -07:00
committed by INADA Naoki
parent 604935a3b2
commit d707b12650
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pymysql/cursors.py
View File

@@ -299,8 +299,9 @@ class Cursor(object):
def _show_warnings(self, conn): def _show_warnings(self, conn):
ws = conn.show_warnings() ws = conn.show_warnings()
for w in ws: if ws is not None:
warnings.warn(w[-1], err.Warning, 4) for w in ws:
warnings.warn(w[-1], err.Warning, 4)
def __iter__(self): def __iter__(self):
return iter(self.fetchone, None) return iter(self.fetchone, None)

9
pymysql/tests/test_nextset.py
View File

@@ -55,5 +55,14 @@ class TestNextset(base.PyMySQLTestCase):
self.assertEqual([(2,)], list(cur1)) self.assertEqual([(2,)], list(cur1))
self.assertIsNone(cur1.nextset()) self.assertIsNone(cur1.nextset())
def test_multi_statement_warnings(self):
cursor = self.con.cursor()
try:
cursor.execute('DROP TABLE IF EXISTS a; '
'DROP TABLE IF EXISTS b;')
except TypeError:
self.fail()
#TODO: How about SSCursor and nextset? #TODO: How about SSCursor and nextset?
# It's very hard to implement correctly... # It's very hard to implement correctly...