[Zope-CVS] CVS: Products/FSDump - CHANGES.txt:1.11 Dumper.py:1.12

[Tres Seaver]

Update of /cvs-repository/Products/FSDump
In directory cvs.zope.org:/tmp/cvs-serv6057

Modified Files:
	CHANGES.txt Dumper.py 
Log Message:
 - Apply patch from Willi Langeburger for missing import of ConflictError.


=== Products/FSDump/CHANGES.txt 1.10 => 1.11 ===
--- Products/FSDump/CHANGES.txt:1.10	Thu Dec  9 14:38:13 2004
+++ Products/FSDump/CHANGES.txt	Mon Mar 14 13:49:33 2005
@@ -1,5 +1,10 @@
 FSDump Change Log
 
+  After FSDump 0.8.1
+
+    * Fix missing import of ConflictError (thanks to Willi Langenburger
+      for the patch).
+
   FSDump 0.8.1 (2004/12/09)
 
     * Repackaged to nest the actual products directory inside a version-


=== Products/FSDump/Dumper.py 1.11 => 1.12 ===
--- Products/FSDump/Dumper.py:1.11	Wed Nov 24 19:19:59 2004
+++ Products/FSDump/Dumper.py	Mon Mar 14 13:49:33 2005
@@ -18,6 +18,7 @@
 from Globals import InitializeClass
 from OFS.SimpleItem import SimpleItem
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from ZODB.POSException import ConflictError
 
 _wwwdir = os.path.join( package_home( globals() ), 'www' )