Commit 39bd6496 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent b1015fdd
...@@ -46,7 +46,7 @@ import threading ...@@ -46,7 +46,7 @@ import threading
from persistent import Persistent from persistent import Persistent
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
from ZODB.utils import z64, u64, p64 from ZODB.utils import z64, u64, p64
from zodbtools.util import ashex as h, fromhex # XXX -> use "ashex" from zodbtools.util import ashex, fromhex
from six import reraise from six import reraise
...@@ -337,8 +337,8 @@ def _path(wc, obj, at=None): ...@@ -337,8 +337,8 @@ def _path(wc, obj, at=None):
#assert type(obj) is ZBigFile XXX import cycle #assert type(obj) is ZBigFile XXX import cycle
objtypestr = type(obj).__module__ + "." + type(obj).__name__ objtypestr = type(obj).__module__ + "." + type(obj).__name__
assert objtypestr == "wendelin.bigfile.file_zodb.ZBigFile", objtypestr assert objtypestr == "wendelin.bigfile.file_zodb.ZBigFile", objtypestr
head = "head/" if at is None else ("@%s/" % h(at)) head = "head/" if at is None else ("@%s/" % ashex(at))
obj = "%s/bigfile/%s" % (head, h(obj._p_oid)) obj = "%s/bigfile/%s" % (head, ashex(obj._p_oid))
at = None at = None
assert isinstance(obj, str) assert isinstance(obj, str)
assert at is None # must not be used with str assert at is None # must not be used with str
......
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