diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
commit | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch) | |
tree | dd97578d333a72ac825c0e7ad64e4367d8dfe248 /Lib/distutils | |
parent | cc4a4842643d6415ca4a449e9d0557cfb029715a (diff) | |
parent | 13925008dc11f2a235627dc8c0440c0ce99171d9 (diff) | |
download | cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2 |
#11565: Merge with 3.1.
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/cmd.py | 2 | ||||
-rw-r--r-- | Lib/distutils/cygwinccompiler.py | 2 | ||||
-rw-r--r-- | Lib/distutils/tests/test_clean.py | 2 | ||||
-rw-r--r-- | Lib/distutils/tests/test_install.py | 2 | ||||
-rw-r--r-- | Lib/distutils/tests/test_sdist.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py index ae4efc7..5b1d085 100644 --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -359,7 +359,7 @@ class Command: not self.force, dry_run=self.dry_run) def move_file (self, src, dst, level=1): - """Move a file respectin dry-run flag.""" + """Move a file respecting dry-run flag.""" return file_util.move_file(src, dst, dry_run=self.dry_run) def spawn(self, cmd, search_path=1, level=1): diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py index 95fa3ed..536aa6b 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -155,7 +155,7 @@ class CygwinCCompiler(UnixCCompiler): self.dll_libraries = get_msvcr() def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - """Compiles the source by spawing GCC and windres if needed.""" + """Compiles the source by spawning GCC and windres if needed.""" if ext == '.rc' or ext == '.res': # gcc needs '.res' and '.rc' compiled to object files !!! try: diff --git a/Lib/distutils/tests/test_clean.py b/Lib/distutils/tests/test_clean.py index 649855f..eb8958b 100644 --- a/Lib/distutils/tests/test_clean.py +++ b/Lib/distutils/tests/test_clean.py @@ -39,7 +39,7 @@ class cleanTestCase(support.TempdirManager, self.assertTrue(not os.path.exists(path), '%s was not removed' % path) - # let's run the command again (should spit warnings but suceed) + # let's run the command again (should spit warnings but succeed) cmd.all = 1 cmd.ensure_finalized() cmd.run() diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py index a76e3e7..ed69b0c 100644 --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -62,7 +62,7 @@ class InstallTestCase(support.TempdirManager, if sys.version < '2.6': return - # preparing the environement for the test + # preparing the environment for the test self.old_user_base = site.USER_BASE self.old_user_site = site.USER_SITE self.tmpdir = self.mkdtemp() diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index eaf39a4..c7dd47f 100644 --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -311,7 +311,7 @@ class SDistTestCase(PyPIRCCommandTestCase): # adding a file self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#') - # make sure build_py is reinitinialized, like a fresh run + # make sure build_py is reinitialized, like a fresh run build_py = dist.get_command_obj('build_py') build_py.finalized = False build_py.ensure_finalized() |