From 1294271d28b202cb79cf4671450af2d22f1bfe91 Mon Sep 17 00:00:00 2001 From: adustman Date: Fri, 7 Sep 2012 20:01:59 +0000 Subject: [PATCH] Some Python 3 fixes for the build process. _mysql does *not* build yet. --- MySQLdb/setup_common.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MySQLdb/setup_common.py b/MySQLdb/setup_common.py index 76d384a..03c39bb 100644 --- a/MySQLdb/setup_common.py +++ b/MySQLdb/setup_common.py @@ -1,4 +1,9 @@ -from ConfigParser import SafeConfigParser +try: + # Python 2.x + from ConfigParser import SafeConfigParser +except ImportError: + # Python 3.x + from configparser import ConfigParser as SafeConfigParser def get_metadata_and_options(): config = SafeConfigParser() @@ -7,8 +12,8 @@ def get_metadata_and_options(): 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')) + metadata['py_modules'] = list(filter(None, metadata['py_modules'].split('\n'))) + metadata['classifiers'] = list(filter(None, metadata['classifiers'].split('\n'))) return metadata, options