Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZEO
Commits
503dccb1
Commit
503dccb1
authored
Jul 25, 2020
by
Jens Vagelpohl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- prevent deprecation warning and move to latest msgpack supporting Python 2
parent
763ebc9d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
setup.py
setup.py
+1
-1
src/ZEO/asyncio/marshal.py
src/ZEO/asyncio/marshal.py
+1
-1
tox.ini
tox.ini
+1
-1
No files found.
setup.py
View file @
503dccb1
...
@@ -35,7 +35,7 @@ tests_require = [
...
@@ -35,7 +35,7 @@ tests_require = [
'manuel'
,
'manuel'
,
'random2'
,
'random2'
,
'mock'
,
'mock'
,
'msgpack <
0.6
'
,
'msgpack <
1
'
,
'zope.testrunner'
,
'zope.testrunner'
,
]
]
...
...
src/ZEO/asyncio/marshal.py
View file @
503dccb1
...
@@ -66,7 +66,7 @@ def decoder(protocol):
...
@@ -66,7 +66,7 @@ def decoder(protocol):
from
msgpack
import
unpackb
from
msgpack
import
unpackb
def
msgpack_decode
(
data
):
def
msgpack_decode
(
data
):
"""Decodes msg and returns its parts"""
"""Decodes msg and returns its parts"""
return
unpackb
(
data
,
encoding
=
'utf-8'
,
use_list
=
False
)
return
unpackb
(
data
,
raw
=
False
,
use_list
=
False
)
return
msgpack_decode
return
msgpack_decode
else
:
else
:
assert
protocol
[:
1
]
==
b'Z'
assert
protocol
[:
1
]
==
b'Z'
...
...
tox.ini
View file @
503dccb1
...
@@ -21,7 +21,7 @@ deps =
...
@@ -21,7 +21,7 @@ deps =
zope.testing
zope.testing
zope.testrunner
zope.testrunner
mock
mock
msgpack
<
0.6
msgpack
<
1
# ZopeUndo is needed as soft-dependency for a regression test
# ZopeUndo is needed as soft-dependency for a regression test
ZopeUndo
ZopeUndo
...
...
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