[Python-checkins] python/dist/src/Lib/distutils sysconfig.py,1.53,1.54

[akuchling@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv25377

Modified Files:
	sysconfig.py 
Log Message:
Back out part of rev. 1.53, restoring the use of the string module.
The two long lines have been reflowed differently; hopefully someone on 
BeOS can test them.  Rev. 1.53 also converted string.atoi() to int(); I've 
left that alone.


Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** sysconfig.py	5 Nov 2002 20:11:08 -0000	1.53
--- sysconfig.py	13 Nov 2002 17:03:05 -0000	1.54
***************
*** 15,18 ****
--- 15,19 ----
  import os
  import re
+ import string
  import sys
  
***************
*** 251,255 ****
          if m:
              n, v = m.group(1, 2)
!             v = v.strip()
              if "$" in v:
                  notdone[n] = v
--- 252,256 ----
          if m:
              n, v = m.group(1, 2)
!             v = string.strip(v)
              if "$" in v:
                  notdone[n] = v
***************
*** 274,278 ****
                          try: value = int(value)
                          except ValueError:
!                             done[name] = value.strip()
                          else:
                              done[name] = value
--- 275,279 ----
                          try: value = int(value)
                          except ValueError:
!                             done[name] = string.strip(value)
                          else:
                              done[name] = value
***************
*** 290,294 ****
                          try: value = int(value)
                          except ValueError:
!                             done[name] = value.strip()
                          else:
                              done[name] = value
--- 291,295 ----
                          try: value = int(value)
                          except ValueError:
!                             done[name] = string.strip(value)
                          else:
                              done[name] = value
***************
*** 369,373 ****
              # sense.
              python_lib = get_python_lib(standard_lib=1)
!             linkerscript_name = os.path.basename(g['LDSHARED'].split()[0])
              linkerscript = os.path.join(python_lib, 'config',
                                          linkerscript_name)
--- 370,375 ----
              # sense.
              python_lib = get_python_lib(standard_lib=1)
!             linkerscript_path = string.split(g['LDSHARED'])[0]
!             linkerscript_name = os.path.basename(linkerscript_path)
              linkerscript = os.path.join(python_lib, 'config',
                                          linkerscript_name)