[Checkins] SVN: zope.app.publisher/trunk/ Backed out controversial XML-RPC skin changes.

[Christian Theune]

Log message for revision 82484:
  Backed out controversial XML-RPC skin changes.
  

Changed:
  U   zope.app.publisher/trunk/CHANGES.txt
  U   zope.app.publisher/trunk/setup.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metaconfigure.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metadirectives.py

-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt	2007-12-28 13:20:17 UTC (rev 82483)
+++ zope.app.publisher/trunk/CHANGES.txt	2007-12-28 13:40:58 UTC (rev 82484)
@@ -2,9 +2,11 @@
 Changes
 =======
 
-3.5.0 (???)
-===========
+After 3.5.0a3
+=============
 
+- Backed out the changes for the controversial XML-RPC skin support.
+
 3.5.0a3 (2007-11-27)
 ====================
 
@@ -23,20 +25,3 @@
 
 - Added a `layer` attribute to `xmlrpc:view`. This works just like layers for
   `browser:view` etc. but uses the `IXMLRPCSkinType`.
-
-3.4.0b1 (2007-08-21)
-====================
-
-- <browser:menuItem> can now be registered for classes
-
-- Fixed a bug about xmlrpc:view: Omitting a permission was (widely)
-  documented to be allowed when a name is given and should incorporate the
-  original security settings of the view class. This did not work at all and
-  the permission was always required. It now works as described.
-
-Before 3.4
-==========
-
-This package was part of the Zope 3 distribution and did not have its own
-CHANGES.txt. For earlier changes please refer to either our subversion log or
-the CHANGES.txt of earlier Zope 3 releases.

Modified: zope.app.publisher/trunk/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2007-12-28 13:20:17 UTC (rev 82483)
+++ zope.app.publisher/trunk/setup.py	2007-12-28 13:40:58 UTC (rev 82484)
@@ -19,7 +19,7 @@
                     open('CHANGES.txt').read())
 
 setup(name='zope.app.publisher',
-      version = '3.5.0a4',
+      version = '3.5dev',
       url='http://pypi.python.org/pypi/zope.app.publisher/',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
@@ -55,10 +55,10 @@
                         'zope.interface',
                         'zope.location',
                         'zope.pagetemplate',
-                        'zope.publisher>=3.5.0a1.dev-r78727',
+                        'zope.publisher',
                         'zope.schema',
                         'zope.security',
-                        'zope.traversing>=3.5.0a1.dev-r78730',
+                        'zope.traversing',
                         ],
       extras_require={
           'test': ['zope.testing',

Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metaconfigure.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metaconfigure.py	2007-12-28 13:20:17 UTC (rev 82483)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metaconfigure.py	2007-12-28 13:40:58 UTC (rev 82484)
@@ -26,7 +26,7 @@
 from zope.app.publisher.xmlrpc import MethodPublisher
 
 def view(_context, for_=None, interface=None, methods=None,
-         class_=None,  permission=None, name=None, layer=IXMLRPCRequest):
+         class_=None,  permission=None, name=None):
 
     interface = interface or []
     methods = methods or []
@@ -77,18 +77,17 @@
             # of the original class
             def proxyView(context, request, class_=class_):
                 view = class_(context, request)
-                view.__Security_checker__ = getCheckerForInstancesOf(
-                    original_class)
+                view.__Security_checker__ = getCheckerForInstancesOf(original_class)
                 return view
             class_ = proxyView
             class_.factory = original_class
 
         # Register the new view.
         _context.action(
-            discriminator = ('view', for_, name, layer),
+            discriminator = ('view', for_, name, IXMLRPCRequest),
             callable = handler,
             args = ('registerAdapter',
-                    class_, (for_, layer), Interface, name,
+                    class_, (for_, IXMLRPCRequest), Interface, name,
                     _context.info)
             )
     else:
@@ -105,10 +104,10 @@
                      '__call__': getattr(class_, name)}
             new_class = type(class_.__name__, (class_,), cdict)
             _context.action(
-                discriminator = ('view', for_, name, layer),
+                discriminator = ('view', for_, name, IXMLRPCRequest),
                 callable = handler,
                 args = ('registerAdapter',
-                        new_class, (for_, layer), Interface, name,
+                        new_class, (for_, IXMLRPCRequest), Interface, name,
                         _context.info)
                 )
 

Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metadirectives.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metadirectives.py	2007-12-28 13:20:17 UTC (rev 82483)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/metadirectives.py	2007-12-28 13:40:58 UTC (rev 82484)
@@ -84,10 +84,3 @@
         """,
         required=False,
         )
-
-    layer = zope.configuration.fields.GlobalInterface(
-        title=u"The layer the view is declared for",
-        description=u"The default layer for which the default view is "
-                    u"applicable. By default it is applied to all layers.",
-        required=False
-        )