diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-03-08 08:24:33 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-03-08 08:24:33 -0500 |
| commit | e4460fad043f4fa0edc7b7e1eef0b209f4588fe5 (patch) | |
| tree | 378259e8207d745cf82ef53309ba08c93090a541 /setuptools/__init__.py | |
| parent | 3e99a57dcc3f2f0d9cc3f7f40077039bfd7a45a4 (diff) | |
| download | python-setuptools-git-e4460fad043f4fa0edc7b7e1eef0b209f4588fe5.tar.gz | |
Backout b17e9a0ea116 and 50725de303ef, restoring Feature model. Fixes #161 and re-opens #65.
--HG--
extra : amend_source : f14bc0bf6c9f04e16d30ce0abf7bcb944f41ebea
Diffstat (limited to 'setuptools/__init__.py')
| -rw-r--r-- | setuptools/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index fb2fffc0..fc9b7b93 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -9,11 +9,11 @@ from distutils.util import convert_path import setuptools.version from setuptools.extension import Extension -from setuptools.dist import Distribution, _get_unpatched +from setuptools.dist import Distribution, Feature, _get_unpatched from setuptools.depends import Require __all__ = [ - 'setup', 'Distribution', 'Command', 'Extension', 'Require', + 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'find_packages' ] |