[Zope-CVS] CVS: Products/Basket - utils.py:1.20

[Chris McDonough]

Update of /cvs-repository/Products/Basket
In directory cvs.zope.org:/tmp/cvs-serv29619

Modified Files:
	utils.py 
Log Message:
set_misc_data was putting misc_ from packages in the wrong misc_ ... although you can't really blame it.


=== Products/Basket/utils.py 1.19 => 1.20 ===
--- Products/Basket/utils.py:1.19	Wed Nov  9 15:12:21 2005
+++ Products/Basket/utils.py	Wed Nov  9 16:44:33 2005
@@ -361,11 +361,13 @@
         # Install items into the misc_ namespace, used by products
         # and the framework itself to store common static resources
         # like icon images.
-        misc_=pgetattr(self.package, 'misc_', {})
-        if misc_:
-            if isinstance(misc_, dict):
-                misc_ = Misc_(self.productname, misc_)
-            Application.misc_.__dict__[self.productname]=misc_
+        miscattr = pgetattr(self.package, 'misc_', {})
+        if miscattr:
+            if isinstance(miscattr, dict):
+                miscob = Misc_(self.productname, miscattr)
+            else:
+                miscob = miscattr
+            Application.misc_.misc_.__dict__[self.productname] = miscob
 
     def set_package_ac_permissions(self):
         # Support old-old-style product metadata. Older products may
@@ -405,7 +407,7 @@
                         else:
                             self.new_permissions[permission]=[name]
 
-    def install(self, raise_exc=1, log_exc=1):
+    def install(self, raise_exc=True, log_exc=True):
         __traceback_info__ = self.productname
 
         package = self.package