Hi Gustavo, thanks for looking at this, and James too. I've added a test now, and refactored the definition of has_zope and its companions into the tests.zope package rather than in tests.zope.zstorm. If this isn't really what you're looking for, let's have a chat on IRC before I head off into the wild again. Incremental diff: === modified file 'test' --- test 2009-02-05 10:16:40 +0000 +++ test 2009-03-05 21:50:46 +0000 @@ -66,7 +66,7 @@ elif relpath == os.path.join("tests", "zope", "README.txt"): # Special case the inclusion of the Zope-dependent # ZStorm doctest. - from tests.zope.zstorm import has_zope + from tests.zope import has_zope if has_zope: doctests.append(relpath) elif filename.endswith(".txt"): === modified file 'tests/zope/__init__.py' --- tests/zope/__init__.py 2007-08-05 21:59:54 +0000 +++ tests/zope/__init__.py 2009-03-05 21:50:34 +0000 @@ -17,3 +17,25 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see . # + +__all__ = [ + 'has_transaction', + 'has_zope', + 'has_zope_component', + ] + +try: + import transaction +except ImportError: + has_transaction = False +else: + has_transaction = True + +try: + import zope.component +except ImportError: + has_zope_component = False +else: + has_zope_component = True + +has_zope = has_transaction and has_zope_component === added file 'tests/zope/adapters.py' --- tests/zope/adapters.py 1970-01-01 00:00:00 +0000 +++ tests/zope/adapters.py 2009-03-05 21:49:47 +0000 @@ -0,0 +1,57 @@ +# +# Copyright (c) 2006, 2007 Canonical +# +# Written by Gustavo Niemeyer