diff options
Diffstat (limited to 'pip/_vendor/distlib/index.py')
| -rw-r--r-- | pip/_vendor/distlib/index.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pip/_vendor/distlib/index.py b/pip/_vendor/distlib/index.py index 73037c97b..6803dd283 100644 --- a/pip/_vendor/distlib/index.py +++ b/pip/_vendor/distlib/index.py @@ -51,7 +51,9 @@ class PackageIndex(object): self.gpg_home = None self.rpc_proxy = None with open(os.devnull, 'w') as sink: - for s in ('gpg2', 'gpg'): + # Use gpg by default rather than gpg2, as gpg2 insists on + # prompting for passwords + for s in ('gpg', 'gpg2'): try: rc = subprocess.check_call([s, '--version'], stdout=sink, stderr=sink) @@ -74,7 +76,7 @@ class PackageIndex(object): def read_configuration(self): """ Read the PyPI access configuration as supported by distutils, getting - PyPI to do the acutal work. This populates ``username``, ``password``, + PyPI to do the actual work. This populates ``username``, ``password``, ``realm`` and ``url`` attributes from the configuration. """ # get distutils to do the work @@ -276,7 +278,7 @@ class PackageIndex(object): sha256_digest = hashlib.sha256(file_data).hexdigest() d.update({ ':action': 'file_upload', - 'protcol_version': '1', + 'protocol_version': '1', 'filetype': filetype, 'pyversion': pyversion, 'md5_digest': md5_digest, |