diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:35:38 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:35:38 +0200 |
| commit | f4b206894378af9ed89a337f24684746bb40d11f (patch) | |
| tree | 4127226d8a1520f73688d1276766fb8e74e1e42c | |
| parent | c5335c63cc7406a64416421d7aea73a002d07177 (diff) | |
| parent | 877161a90666a528acaa1169d33db58abbf2c964 (diff) | |
| download | python-setuptools-git-f4b206894378af9ed89a337f24684746bb40d11f.tar.gz | |
#11565: Merge with 3.1.
| -rw-r--r-- | cmd.py | 2 | ||||
| -rw-r--r-- | cygwinccompiler.py | 2 | ||||
| -rw-r--r-- | tests/test_clean.py | 2 | ||||
| -rw-r--r-- | tests/test_install.py | 2 | ||||
| -rw-r--r-- | tests/test_sdist.py | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -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/cygwinccompiler.py b/cygwinccompiler.py index 95fa3ed3..536aa6b6 100644 --- a/cygwinccompiler.py +++ b/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/tests/test_clean.py b/tests/test_clean.py index 649855f7..eb8958bf 100644 --- a/tests/test_clean.py +++ b/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/tests/test_install.py b/tests/test_install.py index a76e3e7a..ed69b0cb 100644 --- a/tests/test_install.py +++ b/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/tests/test_sdist.py b/tests/test_sdist.py index eaf39a45..c7dd47fb 100644 --- a/tests/test_sdist.py +++ b/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() |