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

[jwashin at codespeak.net]

Author: jwashin
Date: Thu May 11 18:31:04 2006
New Revision: 27088

Added:
   z3/jsonserver/branch/merge/concatresource/concatresource-configure.zcml
   z3/jsonserver/branch/merge/concatresource/concatresource-meta.zcml
Modified:
   z3/jsonserver/branch/merge/concatresource/__init__.py
   z3/jsonserver/branch/merge/concatresource/concatfileresource.py
Log:
conditional imports for z3 compatibility.  files for etc/package-includes


Modified: z3/jsonserver/branch/merge/concatresource/__init__.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/__init__.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/__init__.py	Thu May 11 18:31:04 2006
@@ -1,9 +1,11 @@
 '''\
 Product init
 '''
-
 # alias myself to Products, directly
-import sys, Products
-if not hasattr(Products, 'concatresource'):
+try:
+    import sys, Products
+    if not hasattr(Products, 'concatresource'):
     # only 1st import is aliased.
-    Products.concatresource = sys.modules['Products.concatresource'] = sys.modules[globals()['__name__']]
+        Products.concatresource = sys.modules['Products.concatresource'] = sys.modules[globals()['__name__']]
+except ImportError:
+    pass

Modified: z3/jsonserver/branch/merge/concatresource/concatfileresource.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/concatfileresource.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/concatfileresource.py	Thu May 11 18:31:04 2006
@@ -9,7 +9,10 @@
 from zope.interface import implements
 from interfaces import IContextFile
 # we are aliased to Products, hence the following absolute import
-from Products.concatresource.interfaces import IConcatResourceAddon
+try:
+    from Products.concatresource.interfaces import IConcatResourceAddon
+except ImportError:
+    from interfaces import IConcatResourceAddon
 from fileresource import File
 from compression import compress
 import time
@@ -18,7 +21,7 @@
 
 class ConcatFiles(object):
     '''A resource that concatenates files and compresses the result
-    
+
     It is also possible to extend the statically given list via
     a utility.
     '''
@@ -50,7 +53,7 @@
             extend = registry.getAddonFiles()
         pathlist = self.pathlist_base + extend
         return pathlist
-        
+
     def getFilesList(self):
         'Gets the list of files'
         ## # XXX We have two choices:
@@ -70,13 +73,13 @@
         else:
             fileslist = self.fileslist
         return fileslist
-        
+
     def getLastMod(self):
         # We take in consideration that the pathlist
         # itself could have changed too.
-        return max([f.getLastMod() for f in self.getFilesList()] + 
+        return max([f.getLastMod() for f in self.getFilesList()] +
             [self.fileslist_changed])
-            
+
     def getContents(self):
         fileslist = self.getFilesList()
         assert fileslist, 'Must contain at least one resource.'

Added: z3/jsonserver/branch/merge/concatresource/concatresource-configure.zcml
==============================================================================
--- (empty file)
+++ z3/jsonserver/branch/merge/concatresource/concatresource-configure.zcml	Thu May 11 18:31:04 2006
@@ -0,0 +1 @@
+<include package="jsonserver.concatresource" />

Added: z3/jsonserver/branch/merge/concatresource/concatresource-meta.zcml
==============================================================================
--- (empty file)
+++ z3/jsonserver/branch/merge/concatresource/concatresource-meta.zcml	Thu May 11 18:31:04 2006
@@ -0,0 +1,2 @@
+
+<include package="jsonserver.concatresource" file="meta.zcml" />
\ No newline at end of file