Commit b12dbdaf authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 5722638c
...@@ -55,7 +55,6 @@ from golang import sync, context ...@@ -55,7 +55,6 @@ from golang import sync, context
from golang.gcompat import qq from golang.gcompat import qq
from persistent import Persistent from persistent import Persistent
from ZODB.FileStorage import FileStorage
from zodbtools.util import ashex as h from zodbtools.util import ashex as h
from .client._wcfs import \ from .client._wcfs import \
...@@ -87,7 +86,7 @@ class WCFS(_WCFS): ...@@ -87,7 +86,7 @@ class WCFS(_WCFS):
# ---- WCFS raw file access ---- XXX -> wcfs_test.py ? (used only there) # ---- WCFS raw file access (primarily for tests) ----
# _path returns path for object on wcfs. # _path returns path for object on wcfs.
# - str: wcfs root + obj; # - str: wcfs root + obj;
...@@ -109,7 +108,7 @@ def _path(wc, obj, at=None): ...@@ -109,7 +108,7 @@ def _path(wc, obj, at=None):
@func(WCFS) @func(WCFS)
def _read(wc, obj, at=None): def _read(wc, obj, at=None):
path = wc._path(obj, at=at) path = wc._path(obj, at=at)
with open(path, 'rb') as f: # XXX -> readfile with open(path, 'rb') as f:
return f.read() return f.read()
# _stat stats file corresponding to obj on wcfs. # _stat stats file corresponding to obj on wcfs.
...@@ -308,7 +307,7 @@ def serve(zurl, optv, exec_=False): ...@@ -308,7 +307,7 @@ def serve(zurl, optv, exec_=False):
mntpt = _mntpt_4zurl(zurl) mntpt = _mntpt_4zurl(zurl)
# try opening .wcfs - it is an error if we can do it. # try opening .wcfs - it is an error if we can do it.
# XXX -> option to wcfs itself? # XXX -> option to wcfs itself to verify wcfs/something is already mounted?
try: try:
f = open(mntpt + "/.wcfs/zurl") f = open(mntpt + "/.wcfs/zurl")
except IOError as e: except IOError as e:
......
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