Merge pull request #3790 from jwilk/spelling

Fix a bunch of typos

.travis.yml

@@ -40,7 +40,7 @@ script: .travis/run.sh
 notifications:
   irc:
     channels:
-      # This is set to a secure variable to prevent forks from notifiying the
+      # This is set to a secure variable to prevent forks from notifying the
       # IRC channel whenever they fail a build. This can be removed when travis
       # implements https://github.com/travis-ci/travis-ci/issues/1094.
       # The actual value here is: irc.freenode.org#pypa-dev

CHANGES.txt

@@ -74,7 +74,7 @@
   :pull:`3495`).
 
 * Correct the behavior where interpreter specific tags (such as cp34) were
-  being used on later versions of the same interprter instead of only for that
+  being used on later versions of the same interpreter instead of only for that
   specific interpreter (:issue:`3472`).
 
 * Fix an issue where pip would erroneously install a 64 bit wheel on a 32 bit
@@ -272,11 +272,11 @@
   cached files to them.
 
 * Move the pip version check until *after* any installs have been performed,
-  thus removing the extraenous warning when upgrading pip.
+  thus removing the extraneous warning when upgrading pip.
 
 * Added debug logging when using a cached wheel.
 
-* Respect platlib by default on platforms that have it separated from purlib.
+* Respect platlib by default on platforms that have it separated from purelib.
 
 * Upgrade packaging to 15.3.
 
@@ -485,7 +485,7 @@
 * Fix an issue where distutils installed projects were not actually uninstalled
   and deprecate attempting to uninstall them altogether.
 
-* Retry deleting directories incase a process like an antivirus is holding the
+* Retry deleting directories in case a process like an antivirus is holding the
   directory open temporarily.
 
 * Fix an issue where pip would hide the cursor on Windows but would not reshow
@@ -639,7 +639,7 @@
 
 * Added a virtualenv-specific configuration file. (:pull:`1364`)
 
-* Added site-wide configuation files. (:pull:`1978`)
+* Added site-wide configuration files. (:pull:`1978`)
 
 * Added an automatic check to warn if there is an updated version of pip
   available (:pull:`2049`).
@@ -882,7 +882,7 @@
 * Fixed :issue:`1006`, error when installing local projects with symlinks in
   Python 3. (:pull:`1311`)
 
-* The previously hidden ``--log-file`` otion, is now shown as a general option.
+* The previously hidden ``--log-file`` option, is now shown as a general option.
   (:pull:`1316`)
 
 
@@ -953,7 +953,7 @@
 
 
 * Fixed a major backward incompatible change of parsing URLs to externally
-  hosted packages that got accidentily included in 1.3.
+  hosted packages that got accidentally included in 1.3.
 
 
 **1.3 (2013-03-07)**
@@ -1145,7 +1145,7 @@
 
 * Fixed :issue:`366` - pip throws IndexError when it calls `scraped_rel_links`
 
-* Fixed :issue:`22` - pip search should set and return a userful shell status code
+* Fixed :issue:`22` - pip search should set and return a useful shell status code
 
 * Fixed :issue:`351` and :issue:`365` - added global ``--exists-action`` command line
   option to easier script file exists conflicts, e.g. from editable
@@ -1331,7 +1331,7 @@
   override this location with the ``$PIP_LOG_FILE`` environment variable.
   For a complete (appended) logfile use the separate ``'--log'`` command line
   option.
-* Fixed an issue with Git that left an editable packge as a checkout of a
+* Fixed an issue with Git that left an editable package as a checkout of a
   remote branch, even if the default behaviour would have been fine, too.
 * Fixed installing from a Git tag with older versions of Git.
 * Expand "~" in logfile and download cache paths.

pip/__init__.py

@@ -36,7 +36,7 @@ __version__ = "8.2.0.dev0"
 
 logger = logging.getLogger(__name__)
 
-# Hide the InsecureRequestWArning from urllib3
+# Hide the InsecureRequestWarning from urllib3
 warnings.filterwarnings("ignore", category=InsecureRequestWarning)
 
 

pip/baseparser.py

@@ -273,7 +273,7 @@ class ConfigOptionParser(CustomOptionParser):
                 yield (_environ_prefix_re.sub("", key).lower(), val)
 
     def get_default_values(self):
-        """Overridding to make updating the defaults after instantiation of
+        """Overriding to make updating the defaults after instantiation of
         the option parser possible, _update_defaults() does the dirty work."""
         if not self.process_default_values:
             # Old, pre-Optik 1.5 behaviour.

pip/commands/show.py

@@ -102,7 +102,7 @@ def search_packages_info(query):
                     'home-page', 'author', 'author-email', 'license'):
             package[key] = pkg_info_dict.get(key)
 
-        # It looks like FeedParser can not deal with repeated headers
+        # It looks like FeedParser cannot deal with repeated headers
         classifiers = []
         for line in metadata.splitlines():
             if not line:

pip/compat/__init__.py

@@ -115,7 +115,7 @@ def get_path_uid(path):
         file_uid = os.fstat(fd).st_uid
         os.close(fd)
     else:  # AIX and Jython
-        # WARNING: time of check vulnerabity, but best we can do w/o NOFOLLOW
+        # WARNING: time of check vulnerability, but best we can do w/o NOFOLLOW
         if not os.path.islink(path):
             # older versions of Jython don't have `os.fstat`
             file_uid = os.stat(path).st_uid

pip/download.py

@@ -200,8 +200,8 @@ class MultiDomainBasicAuth(AuthBase):
         return None, None
 
     def __nonzero__(self):
-        # needed in order to evalue authentication object to False when we have
-        # no credentials, prevents failure to load .netrc files
+        # needed in order to evaluate authentication object to False when we
+        # have no credentials, prevents failure to load .netrc files
         return bool(self.passwords)
 
     def __bool__(self):
@@ -339,7 +339,7 @@ class PipSession(requests.Session):
             total=retries,
 
             # A 503 error from PyPI typically means that the Fastly -> Origin
-            # connection got interupted in some way. A 503 error in general
+            # connection got interrupted in some way. A 503 error in general
             # is typically considered a transient error so we'll go ahead and
             # retry it.
             status_forcelist=[503],
@@ -687,7 +687,7 @@ def unpack_file_url(link, location, download_dir=None, hashes=None):
         return
 
     # If --require-hashes is off, `hashes` is either empty, the
-    # link's embeddded hash, or MissingHashes; it is required to
+    # link's embedded hash, or MissingHashes; it is required to
     # match. If --require-hashes is on, we are satisfied by any
     # hash in `hashes` matching: a URL-based or an option-based
     # one; no internet-sourced hash will be in `hashes`.

pip/pep425tags.py

@@ -125,7 +125,7 @@ def get_platform():
     if sys.platform == 'darwin':
         # distutils.util.get_platform() returns the release based on the value
         # of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may
-        # be signficantly older than the user's current machine.
+        # be significantly older than the user's current machine.
         release, _, machine = platform.mac_ver()
         split_ver = release.split('.')
 

pip/req/req_file.py

@@ -135,7 +135,7 @@ def process_line(line, filename, line_number, finder=None, comes_from=None,
         defaults.format_control = finder.format_control
     args_str, options_str = break_args_options(line)
     if sys.version_info < (2, 7, 3):
-        # Priori to 2.7.3, shlex can not deal with unicode entries
+        # Prior to 2.7.3, shlex cannot deal with unicode entries
         options_str = options_str.encode('utf8')
     opts, _ = parser.parse_args(shlex.split(options_str), defaults)
 

pip/utils/appdirs.py

@@ -115,7 +115,7 @@ def user_config_dir(appname, roaming=True):
         Win *:                  same as user_data_dir
 
     For Unix, we follow the XDG spec and support $XDG_CONFIG_HOME.
-    That means, by deafult "~/.config/<AppName>".
+    That means, by default "~/.config/<AppName>".
     """
     if WINDOWS:
         path = user_data_dir(appname, roaming=roaming)

pip/utils/deprecation.py

@@ -1,5 +1,5 @@
 """
-A module that implments tooling to enable easy warnings about deprecations.
+A module that implements tooling to enable easy warnings about deprecations.
 """
 from __future__ import absolute_import
 

pip/vcs/__init__.py

@@ -106,7 +106,7 @@ class VersionControl(object):
     def _is_local_repository(self, repo):
         """
            posix absolute paths start with os.path.sep,
-           win32 ones ones start with drive (like c:\\folder)
+           win32 ones start with drive (like c:\\folder)
         """
         drive, tail = os.path.splitdrive(repo)
         return repo.startswith(os.path.sep) or drive

pip/wheel.py

@@ -440,7 +440,7 @@ if __name__ == '__main__':
     # Because setuptools and pip are bundled with _ensurepip and virtualenv,
     # we need to use universal wheels. So, as a stopgap until Metadata 2.0, we
     # override the versioned entry points in the wheel and generate the
-    # correct ones. This code is purely a short-term measure until Metadat 2.0
+    # correct ones. This code is purely a short-term measure until Metadata 2.0
     # is available.
     #
     # To add the level of hack in this section of code, in order to support

tests/functional/test_install.py

@@ -323,7 +323,7 @@ def test_editable_install_from_local_directory_with_no_setup_py(script, data):
 @pytest.mark.xfail
 def test_install_argparse_shadowed(script, data):
     # When argparse is in the stdlib, we support installing it
-    # even though thats pretty useless because older packages did need to
+    # even though that's pretty useless because older packages did need to
     # depend on it, and not having its metadata will cause pkg_resources
     # requirements checks to fail // trigger easy-install, both of which are
     # bad.

tests/functional/test_install_reqs.py

@@ -169,7 +169,7 @@ def test_install_local_editable_with_extras(script, data):
 
 
 @pytest.mark.network
-def test_install_collected_dependancies_first(script):
+def test_install_collected_dependencies_first(script):
     result = script.pip(
         'install', 'paramiko',
     )

tests/functional/test_list.py

@@ -566,7 +566,7 @@ def test_outdated_formats(script, data):
 
 def test_list_freeze(script, data):
     """
-    Test freeze formating of list command
+    Test freeze formatting of list command
 
     """
     script.pip(
@@ -580,7 +580,7 @@ def test_list_freeze(script, data):
 
 def test_list_json(script, data):
     """
-    Test json formating of list command
+    Test json formatting of list command
 
     """
     script.pip(

tests/unit/test_req.py

@@ -401,7 +401,7 @@ class TestInstallRequirement(object):
 
     def test_markers(self):
         for line in (
-            # recommanded syntax
+            # recommended syntax
             'mock3; python_version >= "3"',
             # with more spaces
             'mock3 ; python_version >= "3" ',

tests/unit/test_req_uninstall.py

@@ -18,8 +18,8 @@ class TestUninstallPathSet(object):
         monkeypatch.setattr(pip.req.req_uninstall, 'is_local', mock_is_local)
         # Fix case for windows tests
         file_extant = os.path.normcase(os.path.join(tmpdir, 'foo'))
-        file_nonexistant = os.path.normcase(
-            os.path.join(tmpdir, 'nonexistant'))
+        file_nonexistent = os.path.normcase(
+            os.path.join(tmpdir, 'nonexistent'))
         with open(file_extant, 'w'):
             pass
 
@@ -28,7 +28,7 @@ class TestUninstallPathSet(object):
         ups.add(file_extant)
         assert ups.paths == set([file_extant])
 
-        ups.add(file_nonexistant)
+        ups.add(file_nonexistent)
         assert ups.paths == set([file_extant])
 
     @pytest.mark.skipif("sys.platform == 'win32'")

tests/unit/test_utils.py

@@ -300,7 +300,7 @@ class TestUnpackArchives(object):
         return stat.S_IMODE(os.stat(path).st_mode)
 
     def confirm_files(self):
-        # expections based on 022 umask set above and the unpack logic that
+        # expectations based on 022 umask set above and the unpack logic that
         # sets execute permissions, not preservation
         for fname, expected_mode, test in [
                 ('file.txt', 0o644, os.path.isfile),