[Zope3-dev] Merge complete

[Tim Peters]

[Stephan Richter]
> I just checked in the merged 'srichter-blow-services' branch. This lifts the
> check-in ban. Thank you all for your patience (in advance).

Congratulations, Stephan!  That looked like a whale of a lot of work.

There is one test failure under Python 2.3.5 on Windows, a bunch of
mismatches in the doctest zope/deprecation/README.txt.  Best
once-glance guess is that you just can't expect the ellipsis pattern:

/.../README.txt:1:

to match a full filepath across platforms.  For example, on my Windows
box, the path starts with "C:", and uses backslashes instead of
forward slashes.  Detailed listing attached.  I hope it's as shallow
as it looks.
-------------- next part --------------
======================================================================
FAIL: C:\Code\Zope3\src\zope\deprecation\README.txt
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\Code\Zope3\src\zope\testing\doctest.py", line 2187, in runTest
    raise self.failureException(self.format_failure(new.getvalue()))
AssertionError: Failed doctest test for README.txt
  File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 0

----------------------------------------------------------------------
File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 34, in README.txt
Failed example:
    tests.demo1
Expected:
    /.../README.txt:1: DeprecationWarning: demo1: demo1 is no more.
    ...
    1
Got:
    C:\Code\Zope3\src\zope\deprecation\README.txt:1: DeprecationWarning: demo1: demo1 is no more.
      ===============
    1
----------------------------------------------------------------------
File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 40, in README.txt
Failed example:
    zope.deprecation.tests.demo2
Expected:
    /.../README.txt:1: DeprecationWarning: demo2: demo2 is no more.
    ...
    2
Got:
    C:\Code\Zope3\src\zope\deprecation\README.txt:1: DeprecationWarning: demo2: demo2 is no more.
      ===============
    2
----------------------------------------------------------------------
File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 50, in README.txt
Failed example:
    from zope.deprecation.tests import demo3
Expected:
    /.../README.txt:1: DeprecationWarning: demo3: demo3 is no more.
    ...
Got:
    C:\Code\Zope3\src\zope\deprecation\README.txt:1: DeprecationWarning: demo3: demo3 is no more.
      ===============
----------------------------------------------------------------------
File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 83, in README.txt
Failed example:
    my.foo
Expected:
    /.../README.txt:1: DeprecationWarning: foo is no more.
    ...
    1
Got:
    C:\Code\Zope3\src\zope\deprecation\README.txt:1: DeprecationWarning: foo is no more.
      ===============
    1
----------------------------------------------------------------------
File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 89, in README.txt
Failed example:
    my.blah()
Expected:
    /.../README.txt:1: DeprecationWarning: blah() is no more.
    ...
    3
Got:
    C:\Code\Zope3\src\zope\deprecation\README.txt:1: DeprecationWarning: blah() is no more.
      ===============
    3
----------------------------------------------------------------------
File "C:\Code\Zope3\src\zope\deprecation\README.txt", line 115, in README.txt
Failed example:
    foo.bar
Expected:
    /.../README.txt:1: DeprecationWarning: bar is no more.
    ...
    1
Got:
    C:\Code\Zope3\src\zope\deprecation\README.txt:1: DeprecationWarning: bar is no more.
      ===============
    1


----------------------------------------------------------------------
Ran 6865 tests in 1500.156s

FAILED (failures=1)