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

jhylton@users.sourceforge.net jhylton@users.sourceforge.net
Tue, 05 Nov 2002 12:11:11 -0800


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

Modified Files:
	sysconfig.py 
Log Message:
Remove use of string module and reflow a couple of long lines.


Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** sysconfig.py	5 Nov 2002 16:11:59 -0000	1.52
--- sysconfig.py	5 Nov 2002 20:11:08 -0000	1.53
***************
*** 15,19 ****
  import os
  import re
- import string
  import sys
  
--- 15,18 ----
***************
*** 214,218 ****
          if m:
              n, v = m.group(1, 2)
!             try: v = string.atoi(v)
              except ValueError: pass
              g[n] = v
--- 213,217 ----
          if m:
              n, v = m.group(1, 2)
!             try: v = int(v)
              except ValueError: pass
              g[n] = v
***************
*** 252,260 ****
          if m:
              n, v = m.group(1, 2)
!             v = string.strip(v)
              if "$" in v:
                  notdone[n] = v
              else:
!                 try: v = string.atoi(v)
                  except ValueError: pass
                  done[n] = v
--- 251,259 ----
          if m:
              n, v = m.group(1, 2)
!             v = v.strip()
              if "$" in v:
                  notdone[n] = v
              else:
!                 try: v = int(v)
                  except ValueError: pass
                  done[n] = v
***************
*** 273,279 ****
                          notdone[name] = value
                      else:
!                         try: value = string.atoi(value)
                          except ValueError:
!                             done[name] = string.strip(value)
                          else:
                              done[name] = value
--- 272,278 ----
                          notdone[name] = value
                      else:
!                         try: value = int(value)
                          except ValueError:
!                             done[name] = value.strip()
                          else:
                              done[name] = value
***************
*** 289,295 ****
                          notdone[name] = value
                      else:
!                         try: value = string.atoi(value)
                          except ValueError:
!                             done[name] = string.strip(value)
                          else:
                              done[name] = value
--- 288,294 ----
                          notdone[name] = value
                      else:
!                         try: value = int(value)
                          except ValueError:
!                             done[name] = value.strip()
                          else:
                              done[name] = value
***************
*** 370,375 ****
              # sense.
              python_lib = get_python_lib(standard_lib=1)
!             linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
!             linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
  
              # XXX this isn't the right place to do this: adding the Python
--- 369,375 ----
              # 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)
  
              # XXX this isn't the right place to do this: adding the Python