graingert
diff --git a/‎MySQLdb/_mysql.c
Copy file name to clipboardExpand all lines: MySQLdb/_mysql.c
+3-1Lines changed: 3 additions & 1 deletion b/‎MySQLdb/_mysql.c
Copy file name to clipboardExpand all lines: MySQLdb/_mysql.c
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎MySQLdb/_mysql_exceptions.py
Copy file name to clipboardExpand all lines: MySQLdb/_mysql_exceptions.py
+6-2Lines changed: 6 additions & 2 deletions b/‎MySQLdb/_mysql_exceptions.py
Copy file name to clipboardExpand all lines: MySQLdb/_mysql_exceptions.py
+6-2Lines changed: 6 additions & 2 deletions
@@ -3018,8 +3018,10 @@ init_mysql(void)
 			       (PyObject *)&_mysql_ResultObject_Type))
 		goto error;	
 	Py_INCREF(&_mysql_ResultObject_Type);
-	if (!(emod = PyImport_ImportModule("_mysql_exceptions")))
+	if (!(emod = PyImport_ImportModule("_mysql_exceptions"))) {
+	    PyErr_Print();
 		goto error;
+	}
 	if (!(edict = PyModule_GetDict(emod))) goto error;
 	if (!(_mysql_MySQLError =
 	      _mysql_NewException(dict, edict, "MySQLError")))
 
@@ -5,7 +5,12 @@
     http://www.python.org/topics/database/DatabaseAPI-2.0.html
 """
 
-from exceptions import Exception, StandardError, Warning
+try:
+    from exceptions import Exception, StandardError, Warning
+except ImportError:
+    # Python 3
+    StandardError = Exception
+
 
 class MySQLError(StandardError):
 
@@ -80,4 +85,3 @@ class NotSupportedError(DatabaseError):
     has transactions turned off."""
 
 
-del Exception, StandardError