Commit b27fc068 authored by Jason R. Coombs's avatar Jason R. Coombs

Feed the hobgoblins (delint).

parent 2ef95509
...@@ -141,7 +141,7 @@ def distros_for_filename(filename, metadata=None): ...@@ -141,7 +141,7 @@ def distros_for_filename(filename, metadata=None):
def interpret_distro_name( def interpret_distro_name(
location, basename, metadata, py_version=None, precedence=SOURCE_DIST, location, basename, metadata, py_version=None, precedence=SOURCE_DIST,
platform=None platform=None
): ):
"""Generate alternative interpretations of a source distro name """Generate alternative interpretations of a source distro name
Note: if `location` is a filesystem filename, you should call Note: if `location` is a filesystem filename, you should call
...@@ -292,7 +292,7 @@ class PackageIndex(Environment): ...@@ -292,7 +292,7 @@ class PackageIndex(Environment):
def __init__( def __init__(
self, index_url="https://pypi.python.org/simple", hosts=('*',), self, index_url="https://pypi.python.org/simple", hosts=('*',),
ca_bundle=None, verify_ssl=True, *args, **kw ca_bundle=None, verify_ssl=True, *args, **kw
): ):
Environment.__init__(self, *args, **kw) Environment.__init__(self, *args, **kw)
self.index_url = index_url + "/" [:not index_url.endswith('/')] self.index_url = index_url + "/" [:not index_url.endswith('/')]
self.scanned_urls = {} self.scanned_urls = {}
...@@ -346,7 +346,8 @@ class PackageIndex(Environment): ...@@ -346,7 +346,8 @@ class PackageIndex(Environment):
base = f.url # handle redirects base = f.url # handle redirects
page = f.read() page = f.read()
if not isinstance(page, str): # We are in Python 3 and got bytes. We want str. if not isinstance(page, str):
# In Python 3 and got bytes but want str.
if isinstance(f, urllib.error.HTTPError): if isinstance(f, urllib.error.HTTPError):
# Errors have no charset, assume latin1: # Errors have no charset, assume latin1:
charset = 'latin-1' charset = 'latin-1'
...@@ -381,7 +382,8 @@ class PackageIndex(Environment): ...@@ -381,7 +382,8 @@ class PackageIndex(Environment):
is_file = s and s.group(1).lower() == 'file' is_file = s and s.group(1).lower() == 'file'
if is_file or self.allows(urllib.parse.urlparse(url)[1]): if is_file or self.allows(urllib.parse.urlparse(url)[1]):
return True return True
msg = ("\nNote: Bypassing %s (disallowed host; see " msg = (
"\nNote: Bypassing %s (disallowed host; see "
"http://bit.ly/2hrImnY for details).\n") "http://bit.ly/2hrImnY for details).\n")
if fatal: if fatal:
raise DistutilsError(msg % url) raise DistutilsError(msg % url)
...@@ -500,15 +502,16 @@ class PackageIndex(Environment): ...@@ -500,15 +502,16 @@ class PackageIndex(Environment):
""" """
checker is a ContentChecker checker is a ContentChecker
""" """
checker.report(self.debug, checker.report(
self.debug,
"Validating %%s checksum for %s" % filename) "Validating %%s checksum for %s" % filename)
if not checker.is_valid(): if not checker.is_valid():
tfp.close() tfp.close()
os.unlink(filename) os.unlink(filename)
raise DistutilsError( raise DistutilsError(
"%s validation failed for %s; " "%s validation failed for %s; "
"possible download problem?" % ( "possible download problem?"
checker.hash.name, os.path.basename(filename)) % (checker.hash.name, os.path.basename(filename))
) )
def add_find_links(self, urls): def add_find_links(self, urls):
...@@ -536,7 +539,8 @@ class PackageIndex(Environment): ...@@ -536,7 +539,8 @@ class PackageIndex(Environment):
if self[requirement.key]: # we've seen at least one distro if self[requirement.key]: # we've seen at least one distro
meth, msg = self.info, "Couldn't retrieve index page for %r" meth, msg = self.info, "Couldn't retrieve index page for %r"
else: # no distros seen for this name, might be misspelled else: # no distros seen for this name, might be misspelled
meth, msg = (self.warn, meth, msg = (
self.warn,
"Couldn't find index page for %r (maybe misspelled?)") "Couldn't find index page for %r (maybe misspelled?)")
meth(msg, requirement.unsafe_name) meth(msg, requirement.unsafe_name)
self.scan_all() self.scan_all()
...@@ -577,8 +581,7 @@ class PackageIndex(Environment): ...@@ -577,8 +581,7 @@ class PackageIndex(Environment):
def fetch_distribution( def fetch_distribution(
self, requirement, tmpdir, force_scan=False, source=False, self, requirement, tmpdir, force_scan=False, source=False,
develop_ok=False, local_index=None develop_ok=False, local_index=None):
):
"""Obtain a distribution suitable for fulfilling `requirement` """Obtain a distribution suitable for fulfilling `requirement`
`requirement` must be a ``pkg_resources.Requirement`` instance. `requirement` must be a ``pkg_resources.Requirement`` instance.
...@@ -609,12 +612,19 @@ class PackageIndex(Environment): ...@@ -609,12 +612,19 @@ class PackageIndex(Environment):
if dist.precedence == DEVELOP_DIST and not develop_ok: if dist.precedence == DEVELOP_DIST and not develop_ok:
if dist not in skipped: if dist not in skipped:
self.warn("Skipping development or system egg: %s", dist) self.warn(
"Skipping development or system egg: %s", dist,
)
skipped[dist] = 1 skipped[dist] = 1
continue continue
if dist in req and (dist.precedence <= SOURCE_DIST or not source): test = (
dist.download_location = self.download(dist.location, tmpdir) dist in req
and (dist.precedence <= SOURCE_DIST or not source)
)
if test:
loc = self.download(dist.location, tmpdir)
dist.download_location = loc
if os.path.exists(dist.download_location): if os.path.exists(dist.download_location):
return dist return dist
...@@ -704,7 +714,7 @@ class PackageIndex(Environment): ...@@ -704,7 +714,7 @@ class PackageIndex(Environment):
def _download_to(self, url, filename): def _download_to(self, url, filename):
self.info("Downloading %s", url) self.info("Downloading %s", url)
# Download the file # Download the file
fp, info = None, None fp = None
try: try:
checker = HashChecker.from_url(url) checker = HashChecker.from_url(url)
fp = self.open_url(strip_fragment(url)) fp = self.open_url(strip_fragment(url))
...@@ -1103,7 +1113,8 @@ def local_open(url): ...@@ -1103,7 +1113,8 @@ def local_open(url):
f += '/' f += '/'
files.append('<a href="{name}">{name}</a>'.format(name=f)) files.append('<a href="{name}">{name}</a>'.format(name=f))
else: else:
tmpl = ("<html><head><title>{url}</title>" tmpl = (
"<html><head><title>{url}</title>"
"</head><body>{files}</body></html>") "</head><body>{files}</body></html>")
body = tmpl.format(url=url, files='\n'.join(files)) body = tmpl.format(url=url, files='\n'.join(files))
status, message = 200, "OK" status, message = 200, "OK"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment