Mercurial > p > mysql-python > mysqldb-2

changeset 60:c9fd1a7932f4 MySQLdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge back change 609 for remaining old style exceptions
author kylev
date Thu, 05 Mar 2009 20:00:51 +0000
parents 5db99d9be0fb
children 8506ded95181
files setup_common.py setup_posix.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- 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"