aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Holth <dholth@fastmail.fm>2012-06-30 12:34:31 -0400
committerDaniel Holth <dholth@fastmail.fm>2012-06-30 12:34:31 -0400
commit0d5901c018dbccaa9bffc8902796b40a546f7f3d (patch)
treee3dfb09a3c1697c291b3793cc35c11837b581e56
parent7afb6a596a2d16b4d74b1b890eb9ca44d11197bd (diff)
downloadexternal_python_setuptools-0d5901c018dbccaa9bffc8902796b40a546f7f3d.tar.gz
external_python_setuptools-0d5901c018dbccaa9bffc8902796b40a546f7f3d.tar.bz2
external_python_setuptools-0d5901c018dbccaa9bffc8902796b40a546f7f3d.zip
handle missing provides-extra or requires-dist
--HG-- branch : distribute extra : rebase_source : 99392449586f9f299abfd1627ba60b9752caf26d
-rw-r--r--pkg_resources.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 652079ec..285aa1bb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2495,7 +2495,7 @@ class DistInfoDistribution(Distribution):
reqs = []
# Including any condition expressions
- for req in self._parsed_pkg_info.get_all('Requires-Dist'):
+ for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
distvers, mark = self._preparse_requirement(req)
parsed = parse_requirements(distvers).next()
parsed.marker_fn = as_function(mark)
@@ -2509,7 +2509,7 @@ class DistInfoDistribution(Distribution):
common = set(reqs_for_extra(None))
dm[None].extend(common)
- for extra in self._parsed_pkg_info.get_all('Provides-Extra'):
+ for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
extra = safe_extra(extra.strip())
dm[extra] = list(set(reqs_for_extra(extra)) - common)