[Python-checkins] r73759 - in python/branches/py3k: Lib/distutils/command/bdist_dumb.py Lib/distutils/tests/test_bdist_dumb.py

Thu Jul 2 15:02:21 CEST 2009

Author: tarek.ziade
Date: Thu Jul 2 15:02:21 2009
New Revision: 73759
Log:
Merged revisions 73756-73757 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r73756 | tarek.ziade | 2009年07月02日 14:47:54 +0200 (2009年7月02日) | 1 line
 
 raising bdist_dumb test coverage
........
 r73757 | tarek.ziade | 2009年07月02日 14:51:56 +0200 (2009年7月02日) | 1 line
 
 cleaned up the bdist_dumb module
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/distutils/command/bdist_dumb.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
Modified: python/branches/py3k/Lib/distutils/command/bdist_dumb.py
==============================================================================

--- python/branches/py3k/Lib/distutils/command/bdist_dumb.py	(original)
+++ python/branches/py3k/Lib/distutils/command/bdist_dumb.py	Thu Jul 2 15:02:21 2009
@@ -7,16 +7,17 @@
 __revision__ = "$Id$"
 
 import os
+
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import remove_tree, ensure_relative
-from distutils.errors import *
+from distutils.errors import DistutilsPlatformError
 from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb(Command):
 
- description = "create a \"dumb\" built distribution"
+ description = 'create a "dumb" built distribution'
 
 user_options = [('bdist-dir=', 'd',
 "temporary directory for creating the distribution"),
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py	Thu Jul 2 15:02:21 2009
@@ -71,6 +71,21 @@
 # now let's check what we have in the zip file
 # XXX to be done
 
+ def test_finalize_options(self):
+ pkg_dir, dist = self.create_dist()
+ os.chdir(pkg_dir)
+ cmd = bdist_dumb(dist)
+ self.assertEquals(cmd.bdist_dir, None)
+ cmd.finalize_options()
+
+ # bdist_dir is initialized to bdist_base/dumb if not set
+ base = cmd.get_finalized_command('bdist').bdist_base
+ self.assertEquals(cmd.bdist_dir, os.path.join(base, 'dumb'))
+
+ # the format is set to a default value depending on the os.name
+ default = cmd.default_format[os.name]
+ self.assertEquals(cmd.format, default)
+
 def test_suite():
 return unittest.makeSuite(BuildDumbTestCase)
 
