[Zope-CVS] CVS: Products/ZopeVersionControl - nonversioned.py:1.3

[Shane Hathaway]

Update of /cvs-repository/Products/ZopeVersionControl
In directory cvs.zope.org:/tmp/cvs-serv1506

Modified Files:
	nonversioned.py 
Log Message:
'if isAVersionableResource()' should be 'if not isAVersionableResource()'.

Expanded comments to hopefully clarify what's going on here, and to
avoid more mix-ups.  There is a misnomer: things that are
"non-versionable" really do end up in the version repository, but only
as part of a "versionable" parent.  Therefore, this code looks for
non-versionable objects and includes them in their parent's version
history.


=== Products/ZopeVersionControl/nonversioned.py 1.2 => 1.3 ===
--- Products/ZopeVersionControl/nonversioned.py:1.2	Tue Feb 24 13:36:54 2004
+++ Products/ZopeVersionControl/nonversioned.py	Fri Mar 12 16:12:11 2004
@@ -131,13 +131,14 @@
         contents = {}
         attributes = StandardNonVersionedDataAdapter.getNonVersionedData(self)
         for name, value in self.obj.objectItems():
-            if value is not None and isProxy is not None:
-                if isAVersionableResource(value):
-                    # Version the state of subobjects that won't be
-                    # versioned independently.
-                    continue
+            if not isAVersionableResource(value):
+                # This object should include the state of subobjects
+                # that won't be versioned independently.
+                continue
+            if isProxy is not None:
                 if isProxy(value):
-                    # Version references in their containers.
+                    # This object should include the state of
+                    # subobjects that are references.
                     continue
             contents[name] = aq_base(value)
         return {'contents': contents, 'attributes': attributes}