[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 30609 from 3.4 branch.

[Tim Peters]

Log message for revision 30610:
  Merge rev 30609 from 3.4 branch.
  
  Port from ZODB 3.2.
  
  referencesf():  Use %r instead of %s format in the error message, else
  the pickle shown is full of unprintable characters.
  

Changed:
  U   ZODB/trunk/NEWS.txt
  U   ZODB/trunk/src/ZODB/serialize.py

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-06-02 21:27:02 UTC (rev 30609)
+++ ZODB/trunk/NEWS.txt	2005-06-02 21:28:14 UTC (rev 30610)
@@ -43,7 +43,14 @@
   has its own copy, and the C code hadn't been compiled in ZODB since before
   ZODB 3.3.
 
+Error reporting
+---------------
 
+- In the unlikely event that ``referencesf()`` reports an unpickling error
+  (for example, a corrupt database can cause this), the message it
+  produces no longer contains unprintable characters.
+
+
 What's new in ZODB3 3.4b1?
 ==========================
 Release date: 19-May-2005

Modified: ZODB/trunk/src/ZODB/serialize.py
===================================================================
--- ZODB/trunk/src/ZODB/serialize.py	2005-06-02 21:27:02 UTC (rev 30609)
+++ ZODB/trunk/src/ZODB/serialize.py	2005-06-02 21:28:14 UTC (rev 30610)
@@ -514,7 +514,7 @@
         u.persistent_load = []
         u.noload()
         if len(p) > f.tell():
-            raise ValueError, 'Error unpickling, %s' % p
+            raise ValueError, 'Error unpickling %r' % p
 
 
     # References may be: