Commit a17499ec authored by Jim Fulton's avatar Jim Fulton

Merge pull request #57 from zopefoundation/fs-empty-after-truncate

On Python 2 and Mac OS X, checkFlushAfterTruncate was failing.
parents 2ae41705 5272aa57
...@@ -26,7 +26,6 @@ from struct import pack ...@@ -26,7 +26,6 @@ from struct import pack
from struct import unpack from struct import unpack
from persistent.TimeStamp import TimeStamp from persistent.TimeStamp import TimeStamp
from six import PY3
from six import string_types as STRING_TYPES from six import string_types as STRING_TYPES
from zc.lockfile import LockFile from zc.lockfile import LockFile
from zope.interface import alsoProvides from zope.interface import alsoProvides
...@@ -2102,13 +2101,10 @@ class FilePool: ...@@ -2102,13 +2101,10 @@ class FilePool:
This is required if they contain data of rolled back transactions. This is required if they contain data of rolled back transactions.
""" """
# Unfortunately, Python 3.x has no API to flush read buffers, and
# the API is ineffective in Python 2 on Mac OS X.
with self.write_lock(): with self.write_lock():
if PY3: self.empty()
# Unfortunately, Python 3.x has no API to flush read buffers.
self.empty()
else:
for f in self._files:
f.flush()
def close(self): def close(self):
with self._cond: with self._cond:
......
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