summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Hylton <jeremy@alum.mit.edu>2002-06-04 20:45:17 (GMT)
committerJeremy Hylton <jeremy@alum.mit.edu>2002-06-04 20:45:17 (GMT)
commitec772744c7802fe7591b542ebe1116124b6f9312 (patch)
tree35bda1bf41a03b7681fa1fdd4d532b5fc9b3a086
parentadb2b385438f23f48988a080ac44c3b7bb1b38e9 (diff)
downloadcpython-ec772744c7802fe7591b542ebe1116124b6f9312.zip
cpython-ec772744c7802fe7591b542ebe1116124b6f9312.tar.gz
cpython-ec772744c7802fe7591b542ebe1116124b6f9312.tar.bz2
ensure_filename() only takes one argument.
Call ensure_string() with one arg too, since the second value passed was the default.
-rw-r--r--Lib/distutils/command/bdist_packager.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/Lib/distutils/command/bdist_packager.py b/Lib/distutils/command/bdist_packager.py
index 12efeaa..1960425 100644
--- a/Lib/distutils/command/bdist_packager.py
+++ b/Lib/distutils/command/bdist_packager.py
@@ -67,18 +67,16 @@ class bdist_packager (Command):
if val is None:
raise DistutilsOptionError, "'%s' must be provided" % option
- def ensure_script (self,arg):
+ def ensure_script(self, arg):
if not arg:
return
try:
- self.ensure_string(arg, None)
+ self.ensure_string(arg)
except:
try:
- self.ensure_filename(arg, None)
+ self.ensure_filename(arg)
except:
- raise RuntimeError, \
- "cannot decipher script option (%s)" \
- % arg
+ raise RuntimeError, "cannot decipher script option (%s)" % arg
def write_script (self,path,attr,default=None):
""" write the script specified in attr to path. if attr is None,