[Python-checkins] python/dist/src/Lib/distutils core.py,1.48,1.49 cygwinccompiler.py,1.15,1.16 emxccompiler.py,1.2,1.3 sysconfig.py,1.46,1.47

[jhylton@users.sourceforge.net]

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

Modified Files:
	core.py cygwinccompiler.py emxccompiler.py sysconfig.py 
Log Message:
Fix unused local variables caught by pychecker.

Fixes a bug for Solaris pkgtool (bdist_pkgtool) that would have
prevented it from building subpackages.



Index: core.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/core.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** core.py	4 Jun 2002 20:14:42 -0000	1.48
--- core.py	4 Jun 2002 20:26:44 -0000	1.49
***************
*** 126,132 ****
          ok = dist.parse_command_line()
      except DistutilsArgError, msg:
!         script = os.path.basename(dist.script_name)
!         raise SystemExit, \
!               gen_usage(dist.script_name) + "\nerror: %s" % msg
  
      if DEBUG:
--- 126,130 ----
          ok = dist.parse_command_line()
      except DistutilsArgError, msg:
!         raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
  
      if DEBUG:

Index: cygwinccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/cygwinccompiler.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cygwinccompiler.py	4 Jun 2002 20:14:42 -0000	1.15
--- cygwinccompiler.py	4 Jun 2002 20:26:44 -0000	1.16
***************
*** 214,218 ****
              # generate the filenames for these files
              def_file = os.path.join(temp_dir, dll_name + ".def")
-             exp_file = os.path.join(temp_dir, dll_name + ".exp")
              lib_file = os.path.join(temp_dir, 'lib' + dll_name + ".a")
  
--- 214,217 ----
***************
*** 230,236 ****
              # dllwrap uses different options than gcc/ld
              if self.linker_dll == "dllwrap":
!                 extra_preargs.extend([#"--output-exp",exp_file,
!                                        "--output-lib",lib_file,
!                                      ])
                  # for dllwrap we have to use a special option
                  extra_preargs.extend(["--def", def_file])
--- 229,233 ----
              # dllwrap uses different options than gcc/ld
              if self.linker_dll == "dllwrap":
!                 extra_preargs.extend(["--output-lib", lib_file])
                  # for dllwrap we have to use a special option
                  extra_preargs.extend(["--def", def_file])
***************
*** 239,243 ****
                  # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
                  #extra_preargs.extend(["-Wl,--out-implib,%s" % lib_file])
!                 # for gcc/ld the def-file is specified as any other object files
                  objects.append(def_file)
  
--- 236,240 ----
                  # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
                  #extra_preargs.extend(["-Wl,--out-implib,%s" % lib_file])
!                 # for gcc/ld the def-file is specified as any object files
                  objects.append(def_file)
  

Index: emxccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/emxccompiler.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** emxccompiler.py	4 Jun 2002 20:14:42 -0000	1.2
--- emxccompiler.py	4 Jun 2002 20:26:44 -0000	1.3
***************
*** 175,183 ****
              # generate the filenames for these files
              def_file = os.path.join(temp_dir, dll_name + ".def")
-             lib_file = os.path.join(temp_dir, dll_name + ".lib")
         
              # Generate .def file
              contents = [
!                 "LIBRARY %s INITINSTANCE TERMINSTANCE" % os.path.splitext(os.path.basename(output_filename))[0],
                  "DATA MULTIPLE NONSHARED",
                  "EXPORTS"]
--- 175,183 ----
              # generate the filenames for these files
              def_file = os.path.join(temp_dir, dll_name + ".def")
         
              # Generate .def file
              contents = [
!                 "LIBRARY %s INITINSTANCE TERMINSTANCE" % \
!                 os.path.splitext(os.path.basename(output_filename))[0],
                  "DATA MULTIPLE NONSHARED",
                  "EXPORTS"]

Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** sysconfig.py	4 Jun 2002 15:28:21 -0000	1.46
--- sysconfig.py	4 Jun 2002 20:26:44 -0000	1.47
***************
*** 306,310 ****
          m = _findvar1_rx.search(s) or _findvar2_rx.search(s)
          if m:
-             name = m.group(1)
              (beg, end) = m.span()
              s = s[0:beg] + vars.get(m.group(1)) + s[end:]
--- 306,309 ----