diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 17:59:07 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 17:59:07 -0400 |
| commit | ccd343460af8687cf1f336b6f841f2620e23dbb6 (patch) | |
| tree | 508926ba6000408609f1f127ce4561a523c923a0 | |
| parent | 2d41e46537438e915b90f540cdcf7587245c81de (diff) | |
| parent | b32d14d3b015e4d46f17b3b5ad946eada64137ba (diff) | |
| download | python-setuptools-git-ccd343460af8687cf1f336b6f841f2620e23dbb6.tar.gz | |
Merge 3.3, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
| -rw-r--r-- | command/install.py | 4 | ||||
| -rw-r--r-- | tests/test_install.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/command/install.py b/command/install.py index 04326a17..cfc5d5e4 100644 --- a/command/install.py +++ b/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/tests/test_install.py b/tests/test_install.py index 47d630cc..3cf2c734 100644 --- a/tests/test_install.py +++ b/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' |