diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:59:07 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:59:07 (GMT) |
| commit | 16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba (patch) | |
| tree | 794a55c65c29332c5994e97428d4ee96d1f5256b /Lib/distutils | |
| parent | 16c41d8520b7993cffa576f9021ff712d80ab825 (diff) | |
| parent | 98472b839674a78b0cbb09f50a61f70019591a4a (diff) | |
| download | cpython-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.zip cpython-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.tar.gz cpython-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.tar.bz2 | |
Merge 3.3, 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 04326a1..cfc5d5e 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -263,8 +263,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 47d630c..3cf2c73 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' |