Commit 703f290f authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch '4-nxd' into 4-nxd+MVCC-load-before

* 4-nxd:
  [ZODB4] Fix unbound local error when using the fsoids.py script  (#295)
parents 8e7eab33 e4f5174e
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
4.4.6 (unreleased) 4.4.6 (unreleased)
================== ==================
- Fix UnboundLocalError when running fsoids.py script.
See `issue 268 <https://github.com/zopefoundation/ZODB/issues/285>`_.
- Fixed: When opening FileStorages in read-only mode, non-existent - Fixed: When opening FileStorages in read-only mode, non-existent
files were silently created. Creating a read-only file-storage files were silently created. Creating a read-only file-storage
against a non-existent file errors. against a non-existent file errors.
......
...@@ -688,7 +688,7 @@ def get_refs(a_pickle): ...@@ -688,7 +688,7 @@ def get_refs(a_pickle):
if isinstance(reference, tuple): if isinstance(reference, tuple):
oid, klass = reference oid, klass = reference
elif isinstance(reference, (bytes, str)): elif isinstance(reference, (bytes, str)):
data, klass = reference, None oid, klass = reference, None
else: else:
assert isinstance(reference, list) assert isinstance(reference, list)
continue continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment