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

[reebalazs at codespeak.net]

Author: reebalazs
Date: Thu Apr 20 08:24:15 2006
New Revision: 26014

Modified:
   z3/jsonserver/branch/merge/concatresource/concatresource.py
Log:
Adjust Five import to Zope 2.9 / Five 1.3

Modified: z3/jsonserver/branch/merge/concatresource/concatresource.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/concatresource.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/concatresource.py	Thu Apr 20 08:24:15 2006
@@ -13,7 +13,14 @@
     from zope.app.publisher.browser.resource import Resource
 else:
     __five__ = True
-    from Products.Five.resource import Resource
+    try:
+        # Zope 2.8 / Five 1.0.2
+        from Products.Five.resource import Resource
+        __five_pre_1_3_ = True
+    except ImportError:
+        # Zope 2.9 / Five 1.3
+        from Products.Five.browser.resource import Resource
+        __five_pre_1_3__ = False
 
 class GenericResource(BrowserView, Resource):
     """A publishable resource"""