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

[hannosch at codespeak.net]

Author: hannosch
Date: Mon Feb 12 10:19:19 2007
New Revision: 38535

Modified:
   z3/jsonserver/branch/merge/concatresource/cachingadapter.py
   z3/jsonserver/branch/merge/concatresource/concatfileresource.py
   z3/jsonserver/branch/merge/concatresource/directives.py
   z3/jsonserver/branch/merge/concatresource/fileresource.py
   z3/jsonserver/branch/merge/concatresource/meta.py
   z3/jsonserver/branch/merge/concatresource/resource.py
Log:
Added some conditional imports in order to surpress deprecation warnings in Zope 2.10


Modified: z3/jsonserver/branch/merge/concatresource/cachingadapter.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/cachingadapter.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/cachingadapter.py	Mon Feb 12 10:19:19 2007
@@ -1,8 +1,13 @@
-
 from time import time
 from interfaces import ICachedResource
 from zope.interface import implements
-from zope.app.datetimeutils import rfc1123_date
+
+try:
+    from zope.datetime import rfc1123_date
+except ImportError:
+    # Zope < 2.10
+    from zope.app.datetimeutils import rfc1123_date
+
 
 class CachedResource(object):
     'Adapts a ContextFile to a cached resource'

Modified: z3/jsonserver/branch/merge/concatresource/concatfileresource.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/concatfileresource.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/concatfileresource.py	Mon Feb 12 10:19:19 2007
@@ -14,7 +14,11 @@
 from compression import compress
 import time
 import zope.component
-from zope.component.exceptions import ComponentLookupError
+try:
+    from zope.component.interfaces import ComponentLookupError
+except ImportError:
+    # Zope < 2.10
+    from zope.component.exceptions import ComponentLookupError
 
 class ConcatFiles(object):
     '''A resource that concatenates files and compresses the result

Modified: z3/jsonserver/branch/merge/concatresource/directives.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/directives.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/directives.py	Mon Feb 12 10:19:19 2007
@@ -2,11 +2,17 @@
 from zope.configuration.fields import GlobalObject, Tokens, Path, \
      PythonIdentifier, MessageID
 from zope.schema import TextLine, Text, Id, Choice, Float
-from zope.app.security.fields import Permission
 from fields import PathList
 from zope.app.component.metadirectives import IBasicViewInformation
 from zope.app.publisher.browser.metadirectives import IBasicResourceInformation
 
+try:
+    from zope.security.zcml import Permission
+except ImportError:
+    # Zope < 2.10
+    from zope.app.security.fields import Permission
+
+
 class IConcatResourceDirective(IBasicResourceInformation):
     """
     Defines a concatenated browser resource

Modified: z3/jsonserver/branch/merge/concatresource/fileresource.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/fileresource.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/fileresource.py	Mon Feb 12 10:19:19 2007
@@ -7,10 +7,14 @@
 
 from zope.interface import implements
 try:
-    # XXX ??? What zope version needs this?
-    from zope.app.contenttypes import guess_content_type
-except ImportError:
-    from zope.app.content_types import guess_content_type
+    from zope.contenttype import guess_content_type
+except ImportError: # BBB: Zope < 2.10
+    try:
+        # XXX ??? What zope version needs this?
+        from zope.app.contenttypes import guess_content_type
+    except ImportError:
+        from zope.app.content_types import guess_content_type
+
 import os
 from interfaces import IContextFile
 

Modified: z3/jsonserver/branch/merge/concatresource/meta.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/meta.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/meta.py	Mon Feb 12 10:19:19 2007
@@ -18,13 +18,13 @@
         initializeClass
 
 try:
-    from zope.app.servicenames import Presentation
-    _layer = 'default'
-    __pre_3_2__ = True
-except:
     from zope.publisher.interfaces.browser import IDefaultBrowserLayer
     _layer = IDefaultBrowserLayer
     __pre_3_2__ = False
+except ImportError:
+    from zope.app.servicenames import Presentation
+    _layer = 'default'
+    __pre_3_2__ = True
 
 # z3 only
 allowed_names = ('GET', 'HEAD', 'publishTraverse', 'browserDefault',

Modified: z3/jsonserver/branch/merge/concatresource/resource.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/resource.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/resource.py	Mon Feb 12 10:19:19 2007
@@ -1,12 +1,18 @@
-from zope.app.publisher.browser import BrowserView
 from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.app.datetimeutils import time as timeFromDateTimeString
 from zope.interface import implements
 from concatfileresource import ConcatFiles
 from interfaces import ICachedResource
 import cachingadapter   # force adapter registration
 
 try:
+    from zope.publisher.browser import BrowserView
+    from zope.datetime import time as timeFromDateTimeString
+except ImportError:
+    # Zope < 2.10
+    from zope.app.publisher.browser import BrowserView
+    from zope.app.datetimeutils import time as timeFromDateTimeString
+
+try:
     import Products.Five
 except ImportError:
     __five__ = False