[Python-checkins] distutils2: Let “python2.4 setup.py build” work (util imports hashlib)

eric.araujo python-checkins at python.org
Mon Sep 19 15:12:39 CEST 2011


http://hg.python.org/distutils2/rev/f07fce09ada8
changeset:   1151:f07fce09ada8
user:        Éric Araujo <merwok at netwok.org>
date:        Sun Sep 18 22:34:35 2011 +0200
summary:
  Let “python2.4 setup.py build” work (util imports hashlib)

files:
  setup.py |  22 +++++++++++++---------
  1 files changed, 13 insertions(+), 9 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -7,17 +7,21 @@
 from distutils import sysconfig
 from distutils.core import setup, Extension
 from distutils.ccompiler import new_compiler
-try:
-    from configparser import RawConfigParser
-except ImportError: #<3.0
-    from ConfigParser import RawConfigParser
+from ConfigParser import RawConfigParser
+
+
+def split_multiline(value):
+    return [element for element in (line.strip() for line in value.split('\n'))
+            if element]
+
+def split_elements(value):
+    return [v.strip() for v in value.split(',')]
+
+def split_files(value):
+    return [str(v) for v in split_multiline(value)]
+
 
 def cfg_to_args(path='setup.cfg'):
-    from distutils2.util import split_multiline
-    def split_elements(value):
-        return [ v.strip() for v in value.split(',') ]
-    def split_files(value):
-        return [ str(v) for v in split_multiline(value) ]
     opts_to_args =  {
         'metadata': (
             ('name', 'name', None),

-- 
Repository URL: http://hg.python.org/distutils2


More information about the Python-checkins mailing list