- removed 'Main' and 'Zope' wrappers for Test.publish

doc/CHANGES.rst

@@ -11,6 +11,10 @@ Trunk (unreleased)
 Restructuring
 +++++++++++++
 
+- ZPublisher: Removed 'Main' and 'Zope' wrappers for Test.publish.
+  If anybody really used them, he can easily use ZPublisher.test instead. In
+  the long run ZPublisher.test and ZPublisher.Test might also be removed.
+
 - Moved AccessControl, DocumentTemplate (incl. TreeDisplay) and
   Products.ZCTextIndex to their own distributions. This removes the last
   direct C extensions from the Zope2 distribution.

src/ZPublisher/__init__.py

@@ -28,16 +28,3 @@ def test(*args, **kw):
     import Test
     test=Test.publish
     return apply(test, args, kw)
-
-def Main(*args, **kw):
-    global test
-    import Test
-    test=Test.publish
-    return apply(test, ('Main',)+args, kw)
-
-# What can we say. ;/
-def Zope(*args, **kw):
-    global test
-    import Test
-    test=Test.publish
-    return apply(test, ('Zope',)+args, kw)