[Python-checkins] cpython: Remove two unneeded attributes in packaging

eric.araujo python-checkins at python.org
Wed Sep 21 16:36:43 CEST 2011


http://hg.python.org/cpython/rev/04a0af3ce5dc
changeset:   72439:04a0af3ce5dc
user:        Éric Araujo <merwok at netwok.org>
date:        Wed Sep 21 16:28:03 2011 +0200
summary:
  Remove two unneeded attributes in packaging

files:
  Doc/library/packaging.pypi.simple.rst |  2 +-
  Lib/packaging/command/install_dist.py |  1 -
  Lib/packaging/pypi/simple.py          |  8 +++-----
  3 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/Doc/library/packaging.pypi.simple.rst b/Doc/library/packaging.pypi.simple.rst
--- 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
--- 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
--- 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:

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list