# HG changeset patch
# User kylev
# Date 1236283251 0
# Node ID c9fd1a7932f416e1fbc5742e94640296757fd336
# Parent  5db99d9be0fb9deb7eb35251bfe762bbe311a3dd
Merge back change 609 for remaining old style exceptions

diff -r 5db99d9be0fb -r c9fd1a7932f4 setup_common.py
--- a/setup_common.py	Thu Mar 05 02:40:50 2009 +0000
+++ b/setup_common.py	Thu Mar 05 20:00:51 2009 +0000
@@ -3,10 +3,10 @@
 def get_metadata_and_options():
     config = SafeConfigParser()
     config.read(['metadata.cfg', 'site.cfg'])
-    
+
     metadata = dict(config.items('metadata'))
     options = dict(config.items('options'))
-    
+
     metadata['py_modules'] = filter(None, metadata['py_modules'].split('\n'))
     metadata['classifiers'] = filter(None, metadata['classifiers'].split('\n'))
 
@@ -20,7 +20,7 @@
     elif s in ('no', 'false', '0', 'n'):
         return False
     else:
-        raise Abort, "Unknown value %s for option %s" % (value, option)
+        raise ValueError("Unknown value %s for option %s" % (value, option))
 
 def create_release_file(metadata):
     rel = open("MySQLdb/release.py",'w')
diff -r 5db99d9be0fb -r c9fd1a7932f4 setup_posix.py
--- a/setup_posix.py	Thu Mar 05 02:40:50 2009 +0000
+++ b/setup_posix.py	Thu Mar 05 20:00:51 2009 +0000
@@ -20,7 +20,7 @@
         if ret/256:
             data = []
         if ret/256 > 1:
-            raise EnvironmentError, "%s not found" % mysql_config.path
+            raise EnvironmentError("%s not found" % (mysql_config.path,))
     return data
 mysql_config.path = "mysql_config"