[Zope-Coders] Re: [Zope-Checkins] CVS: Zope/lib/python/BTrees - __init__.py:1.3.84.3

[Andreas Jung]

This checkin breaks the 2.5 branch again:

yetix@/develop/DC/sandboxes/Zope-2_5-branch(109)% python2.1 -c "from 
BTrees.IIBTree import IIBTree"
Traceback (most recent call last):
  File "<string>", line 1, in ?
  File 
"/develop/DC/sandboxes/Zope-2_5-branch/lib/python/BTrees/__init__.py", line 
11, in ?
    import Interfaces
  File 
"/empty/develop/DC/sandboxes/Zope-2_5-branch/lib/python/BTrees/Interfaces.p
y", line 16, in ?
    from Interface import Interface
ImportError: cannot import name Interface

Andreas

--On Dienstag, 24. September 2002 13:30 -0400 Jeremy Hylton 
<jeremy@zope.com> wrote:

> Update of /cvs-repository/Zope/lib/python/BTrees
> In directory cvs.zope.org:/tmp/cvs-serv17163
>
> Modified Files:
>       Tag: Zope-2_5-branch
> 	__init__.py
> Log Message:
> Properly restore __init__.py as it existed before 2.6 backport.
>
> The version of the file here is the same as revision 1.3/1.5 which was
> used for the 2.5 release and is still current on the HEAD.  The only
> thing that went wrong on the branch is that the __init__.py from the
> tests subdirectory was accidentally checked in over top of the
> __init__.py from the top-level.
>
>
> === Zope/lib/python/BTrees/__init__.py 1.3.84.2 => 1.3.84.3 ===
> --- Zope/lib/python/BTrees/__init__.py:1.3.84.2	Tue Sep 24 13:02:31 2002
> +++ Zope/lib/python/BTrees/__init__.py	Tue Sep 24 13:30:41 2002
> @@ -1 +1,13 @@
>  import ZODB
> +
> +try: import intSet
> +except: pass
> +else: del intSet
> +
> +# Register interfaces
> +try: import Interface
> +except ImportError: pass # Don't register interfaces if no scarecrow
> +else:
> +    import Interfaces
> +    del Interfaces
> +    del Interface
>
>
> _______________________________________________
> Zope-Checkins maillist  -  Zope-Checkins@zope.org
> http://lists.zope.org/mailman/listinfo/zope-checkins