diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:58:27 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:58:27 (GMT) |
| commit | 98472b839674a78b0cbb09f50a61f70019591a4a (patch) | |
| tree | 7644852bcc4bcb5833aec9b1dfd8a419f60d0446 /Lib/distutils | |
| parent | 09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff) | |
| parent | c30b7b16ea03ad094917615940cd1a9ef53c4904 (diff) | |
| download | cpython-98472b839674a78b0cbb09f50a61f70019591a4a.zip cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.gz cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.bz2 | |
Merge 3.2, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/install.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_install.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 0161898..9b1c36a 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -278,8 +278,8 @@ class install(Command): if self.user and (self.prefix or self.exec_prefix or self.home or self.install_base or self.install_platbase): - raise DistutilsOptionError("can't combine user with with prefix/" - "exec_prefix/home or install_(plat)base") + raise DistutilsOptionError("can't combine user with prefix, " + "exec_prefix/home, or install_(plat)base") # Next, stuff that's wrong (or dubious) only on certain platforms. if os.name != "posix": diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py index cb2e1f2..1bd31e2 100644 --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -165,7 +165,7 @@ class InstallTestCase(support.TempdirManager, cmd.home = 'home' self.assertRaises(DistutilsOptionError, cmd.finalize_options) - # can't combine user with with prefix/exec_prefix/home or + # can't combine user with prefix/exec_prefix/home or # install_(plat)base cmd.prefix = None cmd.user = 'user' |