[Zope3-checkins] CVS: Zope3/src/zope/fssync - merger.py:1.3

Guido van Rossum guido@python.org
Tue, 13 May 2003 17:47:16 -0400


Update of /cvs-repository/Zope3/src/zope/fssync
In directory cvs.zope.org:/tmp/cvs-serv21848

Modified Files:
	merger.py 
Log Message:
Clarifying comment about subclassing vs. containment.


=== Zope3/src/zope/fssync/merger.py 1.2 => 1.3 ===
--- Zope3/src/zope/fssync/merger.py:1.2	Tue May 13 10:10:05 2003
+++ Zope3/src/zope/fssync/merger.py	Tue May 13 17:47:15 2003
@@ -103,12 +103,15 @@
         preserved when the database is written back (not by the Merger
         class).  To delete all metadata for a file, call the dict's
         clear() method.
+
+        We pass in the metadata database rather than inheriting from
+        it, in part because this makes testing with a Mock metadata
+        database easier.
         """
         self.metadata = metadata
 
     def getentry(self, file):
         """Helper to abstract away the existence of self.metadata."""
-        # XXX Hmm...  This could be a subclass of class Metadata...
         return self.metadata.getentry(file)
 
     def merge_files(self, local, orig, remote, action, state):