comparison setup_common.py @ 60:c9fd1a7932f4 MySQLdb

Merge back change 609 for remaining old style exceptions
author kylev
date Thu, 05 Mar 2009 20:00:51 +0000
parents 3f4c6af70e52
children
comparison
equal deleted inserted replaced
59:5db99d9be0fb 60:c9fd1a7932f4
1 from ConfigParser import SafeConfigParser 1 from ConfigParser import SafeConfigParser
2 2
3 def get_metadata_and_options(): 3 def get_metadata_and_options():
4 config = SafeConfigParser() 4 config = SafeConfigParser()
5 config.read(['metadata.cfg', 'site.cfg']) 5 config.read(['metadata.cfg', 'site.cfg'])
6 6
7 metadata = dict(config.items('metadata')) 7 metadata = dict(config.items('metadata'))
8 options = dict(config.items('options')) 8 options = dict(config.items('options'))
9 9
10 metadata['py_modules'] = filter(None, metadata['py_modules'].split('\n')) 10 metadata['py_modules'] = filter(None, metadata['py_modules'].split('\n'))
11 metadata['classifiers'] = filter(None, metadata['classifiers'].split('\n')) 11 metadata['classifiers'] = filter(None, metadata['classifiers'].split('\n'))
12 12
13 return metadata, options 13 return metadata, options
14 14
18 if s in ('yes','true','1','y'): 18 if s in ('yes','true','1','y'):
19 return True 19 return True
20 elif s in ('no', 'false', '0', 'n'): 20 elif s in ('no', 'false', '0', 'n'):
21 return False 21 return False
22 else: 22 else:
23 raise Abort, "Unknown value %s for option %s" % (value, option) 23 raise ValueError("Unknown value %s for option %s" % (value, option))
24 24
25 def create_release_file(metadata): 25 def create_release_file(metadata):
26 rel = open("MySQLdb/release.py",'w') 26 rel = open("MySQLdb/release.py",'w')
27 rel.write(""" 27 rel.write("""
28 "Release data, autogenerated from metadata.cfg by setup_common.create_release_file()" 28 "Release data, autogenerated from metadata.cfg by setup_common.create_release_file()"