[Zope3-dev] Merge complete

[Tim Peters]

[Stephan Richter]
> Yes, it is. However, I cannot say
> 
> ...README.txt:1:
> 
> since doctests then think `README.txt:1:` is continued Python input. Any ideas
> on how to fix this?

LOL!  You can never win.

I checked in a hack that works -- replace it if you like (I was
confused by the test output because these parts looked like part of a
traceback without actually being a traceback; so I changed test.py's
monkey-patching of warning.showwarning() to print

    From tests.py's showwarning():

first.  Then I'm not baffled by the test output, and the first line of
expected output in these cases no longer needs an ellipsis).