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
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
Kirill Smelkov
ZEO
Commits
503dccb1
Commit
503dccb1
authored
4 years ago
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
master
x/iotrace
y/clear-cache-on-pack
No related merge requests found
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 = [
'manuel'
,
'random2'
,
'mock'
,
'msgpack <
0.6
'
,
'msgpack <
1
'
,
'zope.testrunner'
,
]
...
...
This diff is collapsed.
Click to expand it.
src/ZEO/asyncio/marshal.py
View file @
503dccb1
...
...
@@ -66,7 +66,7 @@ def decoder(protocol):
from
msgpack
import
unpackb
def
msgpack_decode
(
data
):
"""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
else
:
assert
protocol
[:
1
]
==
b'Z'
...
...
This diff is collapsed.
Click to expand it.
tox.ini
View file @
503dccb1
...
...
@@ -21,7 +21,7 @@ deps =
zope.testing
zope.testrunner
mock
msgpack
<
0.6
msgpack
<
1
# ZopeUndo is needed as soft-dependency for a regression test
ZopeUndo
...
...
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