Author: bree
Date: Sat May 13 14:25:22 2006
New Revision: 3120
Modified:
azax/trunk/plugins/json/interfaces.py
Log:
Adapt to merge trunk of jsonserver
Modified: azax/trunk/plugins/json/interfaces.py
==============================================================================
--- azax/trunk/plugins/json/interfaces.py (original)
+++ azax/trunk/plugins/json/interfaces.py Sat May 13 14:25:22 2006
@@ -23,7 +23,10 @@
from zope.interface import Interface
if HAS_JSON:
- from Products.jsonserver.interfaces import IJsonRequest
+ try:
+ from Products.jsonserver.interfaces import IJsonRequest
+ except ImportError:
+ from Products.jsonserver.z2_compatibility.interfaces import
IJsonRequest
from Products.jsonserver.minjson.interfaces import IJSONStreamWriteable,
IJSONWriter
else:
# If jsonserver is not present, we just define interfaces
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
