Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
ZEO
Commits
28f7a924
Commit
28f7a924
authored
8 years ago
by
Jim Fulton
Browse files
Options
Download
Email Patches
Plain Diff
When checking protocol, need to ignore encoding character
parent
13438d92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
src/ZEO/ClientStorage.py
src/ZEO/ClientStorage.py
+1
-1
src/ZEO/StorageServer.py
src/ZEO/StorageServer.py
+1
-1
src/ZEO/tests/utils.py
src/ZEO/tests/utils.py
+1
-1
No files found.
src/ZEO/ClientStorage.py
View file @
28f7a924
...
...
@@ -383,7 +383,7 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage):
'interfaces'
,
()):
zope
.
interface
.
alsoProvides
(
self
,
iface
)
if
self
.
protocol_version
>=
b
'
Z
5'
:
if
self
.
protocol_version
[
1
:]
>=
b
'5'
:
self
.
ping
=
lambda
:
self
.
_call
(
'ping'
)
else
:
self
.
ping
=
lambda
:
self
.
_call
(
'lastTransaction'
)
...
...
This diff is collapsed.
Click to expand it.
src/ZEO/StorageServer.py
View file @
28f7a924
...
...
@@ -228,7 +228,7 @@ class ZEOStorage:
storage
=
self
.
storage
supportsUndo
=
(
getattr
(
storage
,
'supportsUndo'
,
lambda
:
False
)()
and
self
.
connection
.
protocol_version
>=
b
'
Z
310'
)
and
self
.
connection
.
protocol_version
[
1
:]
>=
b
'310'
)
# Communicate the backend storage interfaces to the client
storage_provides
=
zope
.
interface
.
providedBy
(
storage
)
...
...
This diff is collapsed.
Click to expand it.
src/ZEO/tests/utils.py
View file @
28f7a924
...
...
@@ -39,7 +39,7 @@ class StorageServer:
"""
def
__init__
(
self
,
test
,
storage
,
protocol_version
=
best_protocol_version
,
protocol_version
=
b
'Z'
+
best_protocol_version
,
**
kw
):
self
.
test
=
test
self
.
storage_server
=
ZEO
.
StorageServer
.
StorageServer
(
...
...
This diff is collapsed.
Click to expand it.
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