diff --git a/MySQLdb/release.py b/MySQLdb/release.py
index 5c30a6c2..4ce94127 100644
--- a/MySQLdb/release.py
+++ b/MySQLdb/release.py
@@ -1,4 +1,4 @@
-
-__author__ = "Andy Dustman <farcepest@gmail.com>"
-version_info = (1,2,4,'final',1)
-__version__ = "1.2.4"
+
+__author__ = "Andy Dustman <farcepest@gmail.com>"
+version_info = (1,2,4,'final',1)
+__version__ = "1.2.4"
diff --git a/setup_posix.py b/setup_posix.py
index cfcf33ca..e595d255 100644
--- a/setup_posix.py
+++ b/setup_posix.py
@@ -1,5 +1,10 @@
 import os, sys
-from ConfigParser import SafeConfigParser
+try:
+    # Python 2.x
+    from ConfigParser import SafeConfigParser
+except ImportError:
+    # Python 3.x
+    from configparser import ConfigParser as SafeConfigParser
 
 # This dequote() business is required for some older versions
 # of mysql_config