Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
ZODB
Commits
93992272
Commit
93992272
authored
Feb 11, 2008
by
Christian Theune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #190884: Wrong reference to `POSKeyError` caused NameError.
parent
ce252850
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
NEWS.txt
NEWS.txt
+2
-0
src/ZEO/ClientStorage.py
src/ZEO/ClientStorage.py
+2
-3
src/ZEO/tests/testZEO.py
src/ZEO/tests/testZEO.py
+5
-0
No files found.
NEWS.txt
View file @
93992272
...
@@ -33,6 +33,8 @@ General
...
@@ -33,6 +33,8 @@ General
ZEO
ZEO
---
---
- (???) Fixed bug #190884: Wrong reference to `POSKeyError` caused NameError.
- (???) Fixed bug in transaction buffer: a tuple was unpacked incorrectly in
- (???) Fixed bug in transaction buffer: a tuple was unpacked incorrectly in
`clear`.
`clear`.
...
...
src/ZEO/ClientStorage.py
View file @
93992272
...
@@ -973,7 +973,7 @@ class ClientStorage(object):
...
@@ -973,7 +973,7 @@ class ClientStorage(object):
if
self
.
shared_blob_dir
:
if
self
.
shared_blob_dir
:
# We're using a server shared cache. If the file isn't
# We're using a server shared cache. If the file isn't
# here, it's not anywhere.
# here, it's not anywhere.
raise
POSKeyError
(
"No blob file"
,
oid
,
serial
)
raise
POS
Exception
.
POS
KeyError
(
"No blob file"
,
oid
,
serial
)
# First, we'll create the directory for this oid, if it doesn't exist.
# First, we'll create the directory for this oid, if it doesn't exist.
targetpath
=
self
.
fshelper
.
getPathForOID
(
oid
)
targetpath
=
self
.
fshelper
.
getPathForOID
(
oid
)
...
@@ -1028,11 +1028,10 @@ class ClientStorage(object):
...
@@ -1028,11 +1028,10 @@ class ClientStorage(object):
return
blob_filename
return
blob_filename
# Ask the server to send it to us. When this function
# Ask the server to send it to us. When this function
# returns, it will have been sent. (The rec
ie
ving will
# returns, it will have been sent. (The rec
ei
ving will
# have been handled by the asyncore thread.)
# have been handled by the asyncore thread.)
self
.
_server
.
sendBlob
(
oid
,
serial
)
self
.
_server
.
sendBlob
(
oid
,
serial
)
if
self
.
_have_blob
(
blob_filename
,
oid
,
serial
):
if
self
.
_have_blob
(
blob_filename
,
oid
,
serial
):
return
blob_filename
return
blob_filename
...
...
src/ZEO/tests/testZEO.py
View file @
93992272
...
@@ -678,6 +678,11 @@ class BlobWritableCacheTests(GenericTests, CommonBlobTests):
...
@@ -678,6 +678,11 @@ class BlobWritableCacheTests(GenericTests, CommonBlobTests):
self
.
shared_blob_dir
=
True
self
.
shared_blob_dir
=
True
super
(
BlobWritableCacheTests
,
self
).
setUp
()
super
(
BlobWritableCacheTests
,
self
).
setUp
()
def
checkLoadNonExistingBlob
(
self
):
# Regression test for #189542
self
.
assertRaises
(
ZODB
.
POSException
.
POSKeyError
,
self
.
_storage
.
loadBlob
,
'foo'
,
'foo'
)
class
StorageServerClientWrapper
:
class
StorageServerClientWrapper
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment