summaryrefslogtreecommitdiff
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
commit5e3c6e9b3bab55a9332e521a90a1b4303277f4a1 (patch)
tree1b18e2d365cf5174fbe6163416af781fc81d97d4
parent9d37958a4beca50d250e21675d3787eeee24f386 (diff)
downloadpython-setuptools-bitbucket-1.0b2.tar.gz
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 = {}