[Python-checkins] python/dist/src/Lib/distutils/command bdist_packager.py,1.6,1.7

[jhylton@users.sourceforge.net]

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

Modified Files:
	bdist_packager.py 
Log Message:
ensure_filename() only takes one argument.

Call ensure_string() with one arg too, since the second value passed
was the default.


Index: bdist_packager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_packager.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** bdist_packager.py	4 Jun 2002 20:40:03 -0000	1.6
--- bdist_packager.py	4 Jun 2002 20:45:17 -0000	1.7
***************
*** 68,83 ****
              raise DistutilsOptionError, "'%s' must be provided" % option
  
!     def ensure_script (self,arg):
          if not arg:
              return
          try:
!             self.ensure_string(arg, None)
          except:
              try:
!                 self.ensure_filename(arg, None)
              except:
!                 raise RuntimeError, \
!                     "cannot decipher script option (%s)" \
!                     % arg
  
      def write_script (self,path,attr,default=None):
--- 68,81 ----
              raise DistutilsOptionError, "'%s' must be provided" % option
  
!     def ensure_script(self, arg):
          if not arg:
              return
          try:
!             self.ensure_string(arg)
          except:
              try:
!                 self.ensure_filename(arg)
              except:
!                 raise RuntimeError, "cannot decipher script option (%s)" % arg
  
      def write_script (self,path,attr,default=None):