[Zope-Checkins] CVS: Zope/lib/python/App - Extensions.py:1.19.6.1 Product.py:1.59.4.3

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/App
In directory cvs.zope.org:/tmp/cvs-serv13741

Modified Files:
      Tag: Zope-2_6-branch
	Extensions.py Product.py 
Log Message:
Delayed import of the rotor module to suppress the warning.


=== Zope/lib/python/App/Extensions.py 1.19 => 1.19.6.1 ===
--- Zope/lib/python/App/Extensions.py:1.19	Wed Aug 14 17:31:40 2002
+++ Zope/lib/python/App/Extensions.py	Fri Nov  7 12:11:21 2003
@@ -17,7 +17,7 @@
 $Id$'''
 __version__='$Revision$'[11:-2]
 
-import os, zlib, rotor, imp
+import os, zlib, imp
 import Products
 path_split=os.path.split
 path_join=os.path.join
@@ -128,6 +128,7 @@
 
     elif p[-4:]=='.pyp':
         prod_id=module.split('.')[0]
+        import rotor
         data=zlib.decompress(
             rotor.newrotor(prod_id +' shshsh').decrypt(open(p,'rb').read())
             )


=== Zope/lib/python/App/Product.py 1.59.4.2 => 1.59.4.3 ===
--- Zope/lib/python/App/Product.py:1.59.4.2	Mon Jun  9 10:31:31 2003
+++ Zope/lib/python/App/Product.py	Fri Nov  7 12:11:21 2003
@@ -35,7 +35,7 @@
 
 
 import Globals, OFS.Folder, OFS.SimpleItem, os,  Acquisition, Products
-import re, zlib, Globals, cPickle, marshal, rotor
+import re, zlib, Globals, cPickle, marshal
 import ZClasses, ZClasses.ZClass, AccessControl.Owned
 from urllib import quote
 from cgi import escape
@@ -196,7 +196,7 @@
 
         id=self.id
 
-        import tar
+        import tar, rotor
         rot=rotor.newrotor(id+' shshsh')
         ar=tar.tgzarchive("%s-%s" % (id, self.version))
         prefix="Products/%s/" % self.id
@@ -436,6 +436,7 @@
     def __init__(self, f, rot):
         self._c=zlib.decompressobj()
         self._b=''
+        import rotor
         if type(rot) is type(''): rot=rotor.newrotor(rot)
         self._rot=rot
         rot.decrypt('')