[Checkins] SVN: zope.fssync/trunk/ improved reporting of unpickling errors

[Thomas Lotze]

Log message for revision 130208:
  improved reporting of unpickling errors

Changed:
  U   zope.fssync/trunk/CHANGES.txt
  U   zope.fssync/trunk/src/zope/fssync/README.txt
  U   zope.fssync/trunk/src/zope/fssync/task.py

-=-
Modified: zope.fssync/trunk/CHANGES.txt
===================================================================
--- zope.fssync/trunk/CHANGES.txt	2013-04-24 21:29:30 UTC (rev 130207)
+++ zope.fssync/trunk/CHANGES.txt	2013-04-29 14:54:12 UTC (rev 130208)
@@ -4,7 +4,7 @@
 3.6.1 (unreleased)
 ------------------
 
-- ...
+- Improved reporting of unpickling errors.
 
 
 3.6.0 (2012-03-15)

Modified: zope.fssync/trunk/src/zope/fssync/README.txt
===================================================================
--- zope.fssync/trunk/src/zope/fssync/README.txt	2013-04-24 21:29:30 UTC (rev 130207)
+++ zope.fssync/trunk/src/zope/fssync/README.txt	2013-04-29 14:54:12 UTC (rev 130208)
@@ -823,7 +823,7 @@
     >>> commit.perform(target, 'root', 'test')
     Traceback (most recent call last):
         ...
-    Exception: 1,2,3
+    Exception: test: '1', '2', '3'
 
 Notice that if we encounter multiple exceptions we print them all
 out at the end.
@@ -834,8 +834,8 @@
     Traceback (most recent call last):
         ...
     Exceptions:
-        1,2,3
-        1,2,3
+        test: '1', '2', '3'
+        test: '1', '2', '3'
 
     >>> commit.synchNew = old_sync_new
     >>> commit.synchOld = old_sync_old

Modified: zope.fssync/trunk/src/zope/fssync/task.py
===================================================================
--- zope.fssync/trunk/src/zope/fssync/task.py	2013-04-24 21:29:30 UTC (rev 130207)
+++ zope.fssync/trunk/src/zope/fssync/task.py	2013-04-29 14:54:12 UTC (rev 130208)
@@ -235,14 +235,16 @@
                 try:
                     self.synchNew(container, key, fspath, add_callback)
                 except Exception, e:
-                    self.errors.append(','.join(e.args))
+                    self.errors.append('%s: %s' % (
+                        fspath, ', '.join(repr(x) for x in e.args)))
                     return
             else:
                 try:
                     modified = self.synchOld(container, key, fspath,
                         add_callback)
                 except Exception, e:
-                    self.errors.append(','.join(e.args))
+                    self.errors.append('%s: %s' % (
+                        fspath, ', '.join(repr(x) for x in e.args)))
                     return
                 if modified:
                     modifications.append(modified)