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
a2e12be7
Commit
a2e12be7
authored
Mar 27, 2018
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add zodbpickle to server_find_global. Fixes #107
parent
711232ff
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
CHANGES.rst
CHANGES.rst
+3
-1
src/ZEO/asyncio/marshal.py
src/ZEO/asyncio/marshal.py
+3
-2
No files found.
CHANGES.rst
View file @
a2e12be7
...
@@ -4,7 +4,9 @@ Changelog
...
@@ -4,7 +4,9 @@ Changelog
5.1.2 (unreleased)
5.1.2 (unreleased)
------------------
------------------
- Nothing changed yet.
- Allow ``zodbpickle.binary`` to be used in RPC requests, which is
necessary for compatibility with ZODB 5.4.0 on Python 2. See `issue
107 <https://github.com/zopefoundation/ZEO/issues/107>`_.
5.1.1 (2017-12-18)
5.1.1 (2017-12-18)
...
...
src/ZEO/asyncio/marshal.py
View file @
a2e12be7
...
@@ -156,9 +156,10 @@ def find_global(module, name):
...
@@ -156,9 +156,10 @@ def find_global(module, name):
def
server_find_global
(
module
,
name
):
def
server_find_global
(
module
,
name
):
"""Helper for message unpickler"""
"""Helper for message unpickler"""
if
module
not
in
(
'ZopeUndo.Prefix'
,
'copy_reg'
,
'__builtin__'
,
'zodbpickle'
):
raise
ImportError
(
"Module not allowed: %s"
%
(
module
,))
try
:
try
:
if
module
not
in
(
'ZopeUndo.Prefix'
,
'copy_reg'
,
'__builtin__'
):
raise
ImportError
m
=
__import__
(
module
,
_globals
,
_globals
,
_silly
)
m
=
__import__
(
module
,
_globals
,
_globals
,
_silly
)
except
ImportError
as
msg
:
except
ImportError
as
msg
:
raise
ImportError
(
"import error %s: %s"
%
(
module
,
msg
))
raise
ImportError
(
"import error %s: %s"
%
(
module
,
msg
))
...
...
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