Normalize out pickle sizes / offsets.

src/ZODB/FileStorage/iterator.test

@@ -60,28 +60,28 @@ seems best and set the next record to that:
     >>> it.close()
 
     >>> it = ZODB.FileStorage.FileIterator('data.fs', tids[1])
-    Scan forward data.fs:4 looking for '\x03z\xbd\xd8\xd06\x9c\xcc'
+    Scan forward data.fs:<OFFSET> looking for '\x03z\xbd\xd8\xd06\x9c\xcc'
     >>> it.next().tid == tids[1]
     True
 
     >>> it.close()
 
     >>> it = ZODB.FileStorage.FileIterator('data.fs', tids[30])
-    Scan forward data.fs:4 looking for '\x03z\xbd\xd8\xdc\x96.\xcc'
+    Scan forward data.fs:<OFFSET> looking for '\x03z\xbd\xd8\xdc\x96.\xcc'
     >>> it.next().tid == tids[30]
     True
 
     >>> it.close()
 
     >>> it = ZODB.FileStorage.FileIterator('data.fs', tids[70])
-    Scan backward data.fs:117080 looking for '\x03z\xbd\xd8\xed\xa7>\xcc'
+    Scan backward data.fs:<OFFSET> looking for '\x03z\xbd\xd8\xed\xa7>\xcc'
     >>> it.next().tid == tids[70]
     True
 
     >>> it.close()
 
     >>> it = ZODB.FileStorage.FileIterator('data.fs', tids[-2])
-    Scan backward data.fs:117080 looking for '\x03z\xbd\xd8\xfa\x06\xd0\xcc'
+    Scan backward data.fs:<OFFSET> looking for '\x03z\xbd\xd8\xfa\x06\xd0\xcc'
     >>> it.next().tid == tids[-2]
     True
 
@@ -115,14 +115,14 @@ starting point, or just pick up where another iterator left off:
     >>> it.close()
 
     >>> it = ZODB.FileStorage.FileIterator('data.fs', tids[50], pos=poss[50])
-    Scan backward data.fs:35936 looking for '\x03z\xbd\xd8\xe5\x1e\xb6\xcc'
+    Scan backward data.fs:<OFFSET> looking for '\x03z\xbd\xd8\xe5\x1e\xb6\xcc'
     >>> it.next().tid == tids[50]
     True
 
     >>> it.close()
 
     >>> it = ZODB.FileStorage.FileIterator('data.fs', tids[49], pos=poss[50])
-    Scan backward data.fs:35936 looking for '\x03z\xbd\xd8\xe4\xb1|\xcc'
+    Scan backward data.fs:<OFFSET> looking for '\x03z\xbd\xd8\xe4\xb1|\xcc'
     >>> it.next().tid == tids[49]
     True
 

src/ZODB/FileStorage/tests.py

@@ -28,14 +28,8 @@ checker = renormalizing.RENormalizing([
     # Python 3 adds module name to exceptions.
     (re.compile("ZODB.POSException.POSKeyError"), r"POSKeyError"),
     (re.compile("ZODB.FileStorage.FileStorage.FileStorageQuotaError"),
-     r"FileStorageQuotaError"),
-    # Python 3 produces larger pickles, even when we use zodbpickle :(
-    # this changes all the offsets in iterator.test
-    (re.compile('data.fs:207766'), 'data.fs:117080'),
-    (re.compile('data.fs:57991'), 'data.fs:35936'),
-    # even with Pickler(bytes_as_strings=True) some of our pickles are larger
-    (re.compile('data.fs:117679'), 'data.fs:117080'),
-    (re.compile('data.fs:36241'), 'data.fs:35936'),
+                "FileStorageQuotaError"),
+    (re.compile('data.fs:[0-9]+'), 'data.fs:<OFFSET>'),
 ])
 
 def pack_keep_old():
@@ -195,11 +189,14 @@ cleanup
 def test_suite():
     return unittest.TestSuite((
         doctest.DocFileSuite(
-            'zconfig.txt', 'iterator.test',
-            setUp=ZODB.tests.util.setUp, tearDown=ZODB.tests.util.tearDown,
+            'zconfig.txt',
+            'iterator.test',
+            setUp=ZODB.tests.util.setUp,
+            tearDown=ZODB.tests.util.tearDown,
             checker=checker),
         doctest.DocTestSuite(
-            setUp=ZODB.tests.util.setUp, tearDown=ZODB.tests.util.tearDown,
+            setUp=ZODB.tests.util.setUp,
+            tearDown=ZODB.tests.util.tearDown,
             checker=checker),
         ))