aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-08-11 08:54:56 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-08-11 08:54:56 -0400
commite621ce6f3099b83548cede7425a5af25b0f0ec8c (patch)
treeab8cbfa15a2db750ca66e157e5aeba90344b3a7e
parentebff930a7530b053c6d058d6213f2673331b350e (diff)
downloadexternal_python_setuptools-e621ce6f3099b83548cede7425a5af25b0f0ec8c.tar.gz
external_python_setuptools-e621ce6f3099b83548cede7425a5af25b0f0ec8c.tar.bz2
external_python_setuptools-e621ce6f3099b83548cede7425a5af25b0f0ec8c.zip
Fix TypeError when no attrs were passed1.0b2
-rw-r--r--setuptools/dist.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index e9d0b5a2..9dbf04ba 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -254,7 +254,8 @@ class Distribution(_Distribution):
have_package_data = hasattr(self, "package_data")
if not have_package_data:
self.package_data = {}
- if 'features' in attrs or 'require_features' in attrs:
+ _attrs_dict = attrs or {}
+ if 'features' in _attrs_dict or 'require_features' in _attrs_dict:
Feature.warn_deprecated()
self.require_features = []
self.features = {}