Branch merge
diff --git a/Doc/library/packaging.pypi.simple.rst b/Doc/library/packaging.pypi.simple.rst
index 92b3270..9153738 100644
--- a/Doc/library/packaging.pypi.simple.rst
+++ b/Doc/library/packaging.pypi.simple.rst
@@ -24,7 +24,7 @@
prefer_final=False, prefer_source=True, \
hosts=('*',), follow_externals=False, \
mirrors_url=None, mirrors=None, timeout=15, \
- mirrors_max_tries=0, verbose=False)
+ mirrors_max_tries=0)
*index_url* is the address of the index to use for requests.
diff --git a/Lib/packaging/command/install_dist.py b/Lib/packaging/command/install_dist.py
index 4fbca7e..ce7015e 100644
--- a/Lib/packaging/command/install_dist.py
+++ b/Lib/packaging/command/install_dist.py
@@ -176,7 +176,6 @@
self.installer = None
self.requested = None
self.no_record = None
- self.no_resources = None
# -- Option finalizing methods -------------------------------------
# (This is rather more involved than for most commands,
diff --git a/Lib/packaging/pypi/simple.py b/Lib/packaging/pypi/simple.py
index 9faabaa..e01e033 100644
--- a/Lib/packaging/pypi/simple.py
+++ b/Lib/packaging/pypi/simple.py
@@ -119,10 +119,9 @@
def __init__(self, index_url=DEFAULT_SIMPLE_INDEX_URL, prefer_final=False,
prefer_source=True, hosts=DEFAULT_HOSTS,
follow_externals=False, mirrors_url=None, mirrors=None,
- timeout=SOCKET_TIMEOUT, mirrors_max_tries=0, verbose=False):
+ timeout=SOCKET_TIMEOUT, mirrors_max_tries=0):
super(Crawler, self).__init__(prefer_final, prefer_source)
self.follow_externals = follow_externals
- self.verbose = verbose
# mirroring attributes.
parsed = urllib.parse.urlparse(index_url)
@@ -322,9 +321,8 @@
infos = get_infos_from_url(link, project_name,
is_external=self.index_url not in url)
except CantParseArchiveName as e:
- if self.verbose:
- logger.warning(
- "version has not been parsed: %s", e)
+ logger.warning(
+ "version has not been parsed: %s", e)
else:
self._register_release(release_info=infos)
else:
diff --git a/Lib/packaging/tests/test_pypi_dist.py b/Lib/packaging/tests/test_pypi_dist.py
index ff9a16e..43c8cbe 100644
--- a/Lib/packaging/tests/test_pypi_dist.py
+++ b/Lib/packaging/tests/test_pypi_dist.py
@@ -1,6 +1,7 @@
"""Tests for the packaging.pypi.dist module."""
import os
+import shutil
from packaging.version import VersionPredicate
from packaging.pypi.dist import (ReleaseInfo, ReleasesList, DistInfo,
split_archive_name, get_infos_from_url)
@@ -185,6 +186,7 @@
dist2 = Dist(url=url)
# doing an unpack
dist2_there = dist2.unpack()
+ self.addCleanup(shutil.rmtree, dist2_there)
dist2_result = os.listdir(dist2_there)
self.assertIn('paf', dist2_result)
os.remove(os.path.join(dist2_there, 'paf'))