aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-07-14 23:37:52 +0000
committerPJ Eby <distutils-sig@python.org>2006-07-14 23:37:52 +0000
commit403e6845234a3eb83b5e2858edb5e204f6641842 (patch)
tree01e9f931f9a4924613e37efaeecf84eeaa3456ee /setuptools/dist.py
parentd9cf1dca48e1ad0e14c06a89ab92ffd3dc9e9df8 (diff)
downloadexternal_python_setuptools-403e6845234a3eb83b5e2858edb5e204f6641842.tar.gz
external_python_setuptools-403e6845234a3eb83b5e2858edb5e204f6641842.tar.bz2
external_python_setuptools-403e6845234a3eb83b5e2858edb5e204f6641842.zip
* Fixed ``AttributeError`` when trying to download a ``setup_requires``
dependency when a distribution lacks a ``dependency_links`` setting. * Made ``zip-safe`` and ``not-zip-safe`` flag files contain a single byte, so as to play better with packaging tools that complain about zero-length files. * Made ``setup.py develop`` respect the ``--no-deps`` option, which it previously was ignoring. (bug fixes backported from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4050659
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 724d5c5d..73269574 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -212,8 +212,8 @@ class Distribution(_Distribution):
self.dist_files = []
self.patch_missing_pkg_info(attrs)
# Make sure we have any eggs needed to interpret 'attrs'
- if attrs and 'dependency_links' in attrs:
- self.dependency_links = attrs.pop('dependency_links')
+ if attrs is not None:
+ self.dependency_links = attrs.pop('dependency_links', [])
assert_string_list(self,'dependency_links',self.dependency_links)
if attrs and 'setup_requires' in attrs:
self.fetch_build_eggs(attrs.pop('setup_requires'))