[CMF-checkins] CVS: CMF/CMFCore - SkinsContainer.py:1.9

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv11204/CMFCore

Modified Files:
	SkinsContainer.py 
Log Message:
- fixed an acquisition issue: attributes of the SkinsContainer itself should not be added to the skinnable object
(I'm not sure about all consequences of this change, but I guess I will get feedback if this breaks something.)


=== CMF/CMFCore/SkinsContainer.py 1.8 => 1.9 ===
--- CMF/CMFCore/SkinsContainer.py:1.8	Thu Feb  5 07:51:59 2004
+++ CMF/CMFCore/SkinsContainer.py	Fri Feb  6 05:02:59 2004
@@ -57,7 +57,7 @@
         """ Get a skin at the given path.
         """
         baseself = aq_base(self)
-        skinob = baseself
+        skinob = None
         parts = list( path.split(',') )
         parts.reverse()
         for part_path in parts:
@@ -83,7 +83,11 @@
                 # Build the final skinob by creating an object
                 # that puts the former skinob in the context
                 # of the new skinob.
-                skinob = partob.__of__(skinob)
+                partob = aq_base(partob)
+                if skinob is None:
+                    skinob = partob
+                else:
+                    skinob = partob.__of__(skinob)
         return skinob
 
     security.declarePrivate('getSkinByName')