[z3-checkins] r39247 - z3/jsonserver/branch/merge/concatresource

[hannosch at codespeak.net]

Author: hannosch
Date: Tue Feb 20 23:00:49 2007
New Revision: 39247

Modified:
   z3/jsonserver/branch/merge/concatresource/meta.py
Log:
Fixed deprecation warning for the provideAdapter method on Zope >= 3.3.


Modified: z3/jsonserver/branch/merge/concatresource/meta.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/meta.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/meta.py	Tue Feb 20 23:00:49 2007
@@ -26,6 +26,12 @@
     _layer = 'default'
     __pre_3_2__ = True
 
+try:
+    from zope.component import zcml
+    __pre_3_3__ = False
+except:
+    __pre_3_3__ = True
+
 # z3 only
 allowed_names = ('GET', 'HEAD', 'publishTraverse', 'browserDefault',
                  'request', '__call__')
@@ -91,9 +97,17 @@
                     name, IBrowserRequest, factory, layer),
             )
     else:
-        _context.action(
-            discriminator = ('resource', name, IBrowserRequest, layer),
-            callable = handler,
-            args = ('provideAdapter',
-                (layer,), Interface, name, factory, _context.info),
-        )
+        if __pre_3_3__:
+            _context.action(
+                discriminator = ('resource', name, IBrowserRequest, layer),
+                callable = handler,
+                args = ('provideAdapter',
+                    (layer,), Interface, name, factory, _context.info),
+                )
+        else:
+            _context.action(
+                discriminator = ('resource', name, IBrowserRequest, layer),
+                callable = handler,
+                args = ('registerAdapter',
+                    factory, (layer,), Interface, name, _context.info),
+                )