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
b823ccde
Commit
b823ccde
authored
Mar 28, 2018
by
Jim Fulton
Committed by
GitHub
Mar 28, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #110 from zopefoundation/issue104
Rename all 'async' to 'async_' for compatibility with Python 3.7.
parents
5d50e0c1
69394388
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
79 additions
and
59 deletions
+79
-59
.travis.yml
.travis.yml
+2
-2
CHANGES.rst
CHANGES.rst
+8
-1
setup.py
setup.py
+1
-0
src/ZEO/ClientStorage.py
src/ZEO/ClientStorage.py
+1
-1
src/ZEO/StorageServer.py
src/ZEO/StorageServer.py
+2
-2
src/ZEO/asyncio/client.py
src/ZEO/asyncio/client.py
+4
-4
src/ZEO/asyncio/marshal.py
src/ZEO/asyncio/marshal.py
+5
-2
src/ZEO/asyncio/server.py
src/ZEO/asyncio/server.py
+5
-5
src/ZEO/asyncio/testing.py
src/ZEO/asyncio/testing.py
+4
-1
src/ZEO/asyncio/tests.py
src/ZEO/asyncio/tests.py
+8
-8
src/ZEO/tests/ConnectionTests.py
src/ZEO/tests/ConnectionTests.py
+7
-6
src/ZEO/tests/ZEO4/zrpc/connection.py
src/ZEO/tests/ZEO4/zrpc/connection.py
+11
-11
src/ZEO/tests/ZEO4/zrpc/marshal.py
src/ZEO/tests/ZEO4/zrpc/marshal.py
+8
-3
src/ZEO/tests/testConversionSupport.py
src/ZEO/tests/testConversionSupport.py
+1
-3
src/ZEO/tests/testTransactionBuffer.py
src/ZEO/tests/testTransactionBuffer.py
+1
-0
src/ZEO/tests/testZEO.py
src/ZEO/tests/testZEO.py
+7
-6
src/ZEO/tests/testZEO2.py
src/ZEO/tests/testZEO2.py
+2
-2
src/ZEO/tests/utils.py
src/ZEO/tests/utils.py
+2
-2
No files found.
.travis.yml
View file @
b823ccde
...
@@ -13,10 +13,10 @@ matrix:
...
@@ -13,10 +13,10 @@ matrix:
-
os
:
linux
-
os
:
linux
python
:
3.6
python
:
3.6
-
os
:
linux
-
os
:
linux
python
:
3.
4
python
:
3.
6
env
:
ZEO_MTACCEPTOR=1
env
:
ZEO_MTACCEPTOR=1
-
os
:
linux
-
os
:
linux
python
:
3.
5
python
:
3.
6
env
:
ZEO_MSGPACK=1 ZEO_MTACCEPTOR=1
env
:
ZEO_MSGPACK=1 ZEO_MTACCEPTOR=1
-
os
:
linux
-
os
:
linux
python
:
2.7
python
:
2.7
...
...
CHANGES.rst
View file @
b823ccde
...
@@ -12,6 +12,14 @@ Changelog
...
@@ -12,6 +12,14 @@ Changelog
aren't supported on Windows. See `issue 107
aren't supported on Windows. See `issue 107
<https://github.com/zopefoundation/ZEO/issues/107>`_.
<https://github.com/zopefoundation/ZEO/issues/107>`_.
- Renamed all ``async`` attributes to ``async_`` for compatibility
with Python 3.7. See `issue 104
<https://github.com/zopefoundation/ZEO/issues/104>`_.
- Fix: Client-side updates for ZODB 5.4.0 or databases that already
had ``zodbpickle.binary`` OIDs. See `issue 113
<https://github.com/zopefoundation/ZEO/issues/113>`_.
5.1.2 (2018-03-27)
5.1.2 (2018-03-27)
------------------
------------------
...
@@ -21,7 +29,6 @@ Changelog
...
@@ -21,7 +29,6 @@ Changelog
necessary for compatibility with ZODB 5.4.0 on Python 2. See `issue
necessary for compatibility with ZODB 5.4.0 on Python 2. See `issue
107 <https://github.com/zopefoundation/ZEO/issues/107>`_.)
107 <https://github.com/zopefoundation/ZEO/issues/107>`_.)
5.1.1 (2017-12-18)
5.1.1 (2017-12-18)
------------------
------------------
...
...
setup.py
View file @
b823ccde
...
@@ -33,6 +33,7 @@ tests_require = [
...
@@ -33,6 +33,7 @@ tests_require = [
'random2'
,
'random2'
,
'mock'
,
'mock'
,
'msgpack-python'
,
'msgpack-python'
,
'zope.testrunner'
,
]
]
classifiers
=
"""
classifiers
=
"""
...
...
src/ZEO/ClientStorage.py
View file @
b823ccde
...
@@ -271,7 +271,7 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage):
...
@@ -271,7 +271,7 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage):
credentials
=
credentials
,
credentials
=
credentials
,
)
)
self
.
_call
=
self
.
_server
.
call
self
.
_call
=
self
.
_server
.
call
self
.
_async
=
self
.
_server
.
async
self
.
_async
=
self
.
_server
.
async
_
self
.
_async_iter
=
self
.
_server
.
async_iter
self
.
_async_iter
=
self
.
_server
.
async_iter
self
.
_wait
=
self
.
_server
.
wait
self
.
_wait
=
self
.
_server
.
wait
...
...
src/ZEO/StorageServer.py
View file @
b823ccde
...
@@ -104,7 +104,7 @@ class ZEOStorage(object):
...
@@ -104,7 +104,7 @@ class ZEOStorage(object):
self
.
connected
=
True
self
.
connected
=
True
assert
conn
.
protocol_version
is
not
None
assert
conn
.
protocol_version
is
not
None
self
.
log_label
=
_addr_label
(
conn
.
addr
)
self
.
log_label
=
_addr_label
(
conn
.
addr
)
self
.
async
=
conn
.
async
self
.
async
_
=
conn
.
async_
self
.
async_threadsafe
=
conn
.
async_threadsafe
self
.
async_threadsafe
=
conn
.
async_threadsafe
def
notify_disconnected
(
self
):
def
notify_disconnected
(
self
):
...
@@ -337,7 +337,7 @@ class ZEOStorage(object):
...
@@ -337,7 +337,7 @@ class ZEOStorage(object):
self
.
stats
.
commits
+=
1
self
.
stats
.
commits
+=
1
self
.
storage
.
tpc_finish
(
self
.
transaction
,
self
.
_invalidate
)
self
.
storage
.
tpc_finish
(
self
.
transaction
,
self
.
_invalidate
)
self
.
async
(
'info'
,
self
.
get_size_info
())
self
.
async
_
(
'info'
,
self
.
get_size_info
())
# Note that the tid is still current because we still hold the
# Note that the tid is still current because we still hold the
# commit lock. We'll relinquish it in _clear_transaction.
# commit lock. We'll relinquish it in _clear_transaction.
tid
=
self
.
storage
.
lastTransaction
()
tid
=
self
.
storage
.
lastTransaction
()
...
...
src/ZEO/asyncio/client.py
View file @
b823ccde
...
@@ -203,10 +203,10 @@ class Protocol(base.Protocol):
...
@@ -203,10 +203,10 @@ class Protocol(base.Protocol):
exception_type_type
=
type
(
Exception
)
exception_type_type
=
type
(
Exception
)
def
message_received
(
self
,
data
):
def
message_received
(
self
,
data
):
msgid
,
async
,
name
,
args
=
self
.
decode
(
data
)
msgid
,
async
_
,
name
,
args
=
self
.
decode
(
data
)
if
name
==
'.reply'
:
if
name
==
'.reply'
:
future
=
self
.
futures
.
pop
(
msgid
)
future
=
self
.
futures
.
pop
(
msgid
)
if
(
async
)
:
# ZEO 5 exception
if
async_
:
# ZEO 5 exception
class_
,
args
=
args
class_
,
args
=
args
factory
=
exc_factories
.
get
(
class_
)
factory
=
exc_factories
.
get
(
class_
)
if
factory
:
if
factory
:
...
@@ -231,7 +231,7 @@ class Protocol(base.Protocol):
...
@@ -231,7 +231,7 @@ class Protocol(base.Protocol):
else
:
else
:
future
.
set_result
(
args
)
future
.
set_result
(
args
)
else
:
else
:
assert
async
# clients only get async calls
assert
async
_
# clients only get async calls
if
name
in
self
.
client_methods
:
if
name
in
self
.
client_methods
:
getattr
(
self
.
client
,
name
)(
*
args
)
getattr
(
self
.
client
,
name
)(
*
args
)
else
:
else
:
...
@@ -770,7 +770,7 @@ class ClientRunner(object):
...
@@ -770,7 +770,7 @@ class ClientRunner(object):
self
.
call_threadsafe
,
result
,
True
,
method
,
args
)
self
.
call_threadsafe
,
result
,
True
,
method
,
args
)
return
result
return
result
def
async
(
self
,
method
,
*
args
):
def
async
_
(
self
,
method
,
*
args
):
return
self
.
__call
(
self
.
call_async_threadsafe
,
method
,
args
)
return
self
.
__call
(
self
.
call_async_threadsafe
,
method
,
args
)
def
async_iter
(
self
,
it
):
def
async_iter
(
self
,
it
):
...
...
src/ZEO/asyncio/marshal.py
View file @
b823ccde
...
@@ -24,6 +24,7 @@ import logging
...
@@ -24,6 +24,7 @@ import logging
from
.._compat
import
Unpickler
,
Pickler
,
BytesIO
,
PY3
,
PYPY
from
.._compat
import
Unpickler
,
Pickler
,
BytesIO
,
PY3
,
PYPY
from
..shortrepr
import
short_repr
from
..shortrepr
import
short_repr
PY2
=
not
PY3
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
def
encoder
(
protocol
,
server
=
False
):
def
encoder
(
protocol
,
server
=
False
):
...
@@ -132,6 +133,8 @@ _silly = ('__doc__',)
...
@@ -132,6 +133,8 @@ _silly = ('__doc__',)
exception_type_type
=
type
(
Exception
)
exception_type_type
=
type
(
Exception
)
_SAFE_MODULE_NAMES
=
(
'ZopeUndo.Prefix'
,
'copy_reg'
,
'__builtin__'
,
'zodbpickle'
)
def
find_global
(
module
,
name
):
def
find_global
(
module
,
name
):
"""Helper for message unpickler"""
"""Helper for message unpickler"""
try
:
try
:
...
@@ -144,7 +147,7 @@ def find_global(module, name):
...
@@ -144,7 +147,7 @@ def find_global(module, name):
except
AttributeError
:
except
AttributeError
:
raise
ImportError
(
"module %s has no global %s"
%
(
module
,
name
))
raise
ImportError
(
"module %s has no global %s"
%
(
module
,
name
))
safe
=
getattr
(
r
,
'__no_side_effects__'
,
0
)
safe
=
getattr
(
r
,
'__no_side_effects__'
,
0
)
or
(
PY2
and
module
in
_SAFE_MODULE_NAMES
)
if
safe
:
if
safe
:
return
r
return
r
...
@@ -156,7 +159,7 @@ def find_global(module, name):
...
@@ -156,7 +159,7 @@ 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'
)
:
if
module
not
in
_SAFE_MODULE_NAMES
:
raise
ImportError
(
"Module not allowed: %s"
%
(
module
,))
raise
ImportError
(
"Module not allowed: %s"
%
(
module
,))
try
:
try
:
...
...
src/ZEO/asyncio/server.py
View file @
b823ccde
...
@@ -86,7 +86,7 @@ class ServerProtocol(base.Protocol):
...
@@ -86,7 +86,7 @@ class ServerProtocol(base.Protocol):
def
message_received
(
self
,
message
):
def
message_received
(
self
,
message
):
try
:
try
:
message_id
,
async
,
name
,
args
=
self
.
decode
(
message
)
message_id
,
async
_
,
name
,
args
=
self
.
decode
(
message
)
except
Exception
:
except
Exception
:
logger
.
exception
(
"Can't deserialize message"
)
logger
.
exception
(
"Can't deserialize message"
)
self
.
close
()
self
.
close
()
...
@@ -104,13 +104,13 @@ class ServerProtocol(base.Protocol):
...
@@ -104,13 +104,13 @@ class ServerProtocol(base.Protocol):
except
Exception
as
exc
:
except
Exception
as
exc
:
if
not
isinstance
(
exc
,
self
.
unlogged_exception_types
):
if
not
isinstance
(
exc
,
self
.
unlogged_exception_types
):
logger
.
exception
(
logger
.
exception
(
"Bad %srequest, %r"
,
'async '
if
async
else
''
,
name
)
"Bad %srequest, %r"
,
'async '
if
async
_
else
''
,
name
)
if
async
:
if
async
_
:
return
self
.
close
()
# No way to recover/cry for help
return
self
.
close
()
# No way to recover/cry for help
else
:
else
:
return
self
.
send_error
(
message_id
,
exc
)
return
self
.
send_error
(
message_id
,
exc
)
if
not
async
:
if
not
async
_
:
self
.
send_reply
(
message_id
,
result
)
self
.
send_reply
(
message_id
,
result
)
def
send_reply
(
self
,
message_id
,
result
,
send_error
=
False
,
flag
=
0
):
def
send_reply
(
self
,
message_id
,
result
,
send_error
=
False
,
flag
=
0
):
...
@@ -138,7 +138,7 @@ class ServerProtocol(base.Protocol):
...
@@ -138,7 +138,7 @@ class ServerProtocol(base.Protocol):
"""
"""
self
.
send_reply
(
message_id
,
reduce_exception
(
exc
),
send_error
,
2
)
self
.
send_reply
(
message_id
,
reduce_exception
(
exc
),
send_error
,
2
)
def
async
(
self
,
method
,
*
args
):
def
async
_
(
self
,
method
,
*
args
):
self
.
call_async
(
method
,
args
)
self
.
call_async
(
method
,
args
)
def
async_threadsafe
(
self
,
method
,
*
args
):
def
async_threadsafe
(
self
,
method
,
*
args
):
...
...
src/ZEO/asyncio/testing.py
View file @
b823ccde
...
@@ -167,7 +167,10 @@ class ClientRunner(object):
...
@@ -167,7 +167,10 @@ class ClientRunner(object):
def
call
(
self
,
method
,
*
args
,
**
kw
):
def
call
(
self
,
method
,
*
args
,
**
kw
):
return
getattr
(
self
,
method
)(
*
args
)
return
getattr
(
self
,
method
)(
*
args
)
async
=
async_iter
=
call
async
_
=
async_iter
=
call
def
wait
(
self
,
timeout
=
None
):
def
wait
(
self
,
timeout
=
None
):
pass
pass
def
close
(
self
):
pass
src/ZEO/asyncio/tests.py
View file @
b823ccde
...
@@ -112,9 +112,9 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
...
@@ -112,9 +112,9 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
return
(
wrapper
,
cache
,
self
.
loop
,
self
.
client
,
protocol
,
transport
)
return
(
wrapper
,
cache
,
self
.
loop
,
self
.
client
,
protocol
,
transport
)
def
respond
(
self
,
message_id
,
result
,
async
=
False
):
def
respond
(
self
,
message_id
,
result
,
async
_
=
False
):
self
.
loop
.
protocol
.
data_received
(
self
.
loop
.
protocol
.
data_received
(
sized
(
self
.
encode
(
message_id
,
async
,
'.reply'
,
result
)))
sized
(
self
.
encode
(
message_id
,
async
_
,
'.reply'
,
result
)))
def
wait_for_result
(
self
,
future
,
timeout
):
def
wait_for_result
(
self
,
future
,
timeout
):
if
future
.
done
()
and
future
.
exception
()
is
not
None
:
if
future
.
done
()
and
future
.
exception
()
is
not
None
:
...
@@ -160,7 +160,7 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
...
@@ -160,7 +160,7 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
self
.
assertFalse
(
f1
.
done
())
self
.
assertFalse
(
f1
.
done
())
# If we try to make an async call, we get an immediate error:
# If we try to make an async call, we get an immediate error:
self
.
assertRaises
(
ClientDisconnected
,
self
.
async
,
'bar'
,
3
,
4
)
self
.
assertRaises
(
ClientDisconnected
,
self
.
async
_
,
'bar'
,
3
,
4
)
# The wrapper object (ClientStorage) hasn't been notified:
# The wrapper object (ClientStorage) hasn't been notified:
self
.
assertFalse
(
wrapper
.
notify_connected
.
called
)
self
.
assertFalse
(
wrapper
.
notify_connected
.
called
)
...
@@ -191,7 +191,7 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
...
@@ -191,7 +191,7 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
self
.
assertEqual
(
f1
.
result
(),
42
)
self
.
assertEqual
(
f1
.
result
(),
42
)
# Now we can make async calls:
# Now we can make async calls:
f2
=
self
.
async
(
'bar'
,
3
,
4
)
f2
=
self
.
async
_
(
'bar'
,
3
,
4
)
self
.
assertTrue
(
f2
.
done
()
and
f2
.
exception
()
is
None
)
self
.
assertTrue
(
f2
.
done
()
and
f2
.
exception
()
is
None
)
self
.
assertEqual
(
self
.
pop
(),
(
0
,
True
,
'bar'
,
(
3
,
4
)))
self
.
assertEqual
(
self
.
pop
(),
(
0
,
True
,
'bar'
,
(
3
,
4
)))
...
@@ -581,10 +581,10 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
...
@@ -581,10 +581,10 @@ class ClientTests(Base, setupstack.TestCase, ClientRunner):
# Give the transport a small capacity:
# Give the transport a small capacity:
transport
.
capacity
=
2
transport
.
capacity
=
2
self
.
async
(
'foo'
)
self
.
async
_
(
'foo'
)
self
.
async
(
'bar'
)
self
.
async
_
(
'bar'
)
self
.
async
(
'baz'
)
self
.
async
_
(
'baz'
)
self
.
async
(
'splat'
)
self
.
async
_
(
'splat'
)
# The first 2 were sent, but the remaining were queued.
# The first 2 were sent, but the remaining were queued.
self
.
assertEqual
(
self
.
pop
(),
self
.
assertEqual
(
self
.
pop
(),
...
...
src/ZEO/tests/ConnectionTests.py
View file @
b823ccde
...
@@ -965,13 +965,14 @@ class TimeoutTests(CommonSetupTearDown):
...
@@ -965,13 +965,14 @@ class TimeoutTests(CommonSetupTearDown):
self
.
assertRaises
(
ClientDisconnected
,
storage
.
tpc_finish
,
txn
)
self
.
assertRaises
(
ClientDisconnected
,
storage
.
tpc_finish
,
txn
)
# Make sure it's logged as CRITICAL
# Make sure it's logged as CRITICAL
for
line
in
open
(
"server.log"
):
with
open
(
"server.log"
)
as
f
:
if
((
'Transaction timeout after'
in
line
)
and
for
line
in
f
:
(
'CRITICAL ZEO.StorageServer'
in
line
)
if
((
'Transaction timeout after'
in
line
)
and
(
'CRITICAL ZEO.StorageServer'
in
line
)
):
):
break
break
else
:
else
:
self
.
assertTrue
(
False
,
'bad logging'
)
self
.
fail
(
'bad logging'
)
storage
.
close
()
storage
.
close
()
...
...
src/ZEO/tests/ZEO4/zrpc/connection.py
View file @
b823ccde
...
@@ -418,10 +418,10 @@ class Connection(smac.SizedMessageAsyncConnection, object):
...
@@ -418,10 +418,10 @@ class Connection(smac.SizedMessageAsyncConnection, object):
# will raise an exception. The exception will ultimately
# will raise an exception. The exception will ultimately
# result in asycnore calling handle_error(), which will
# result in asycnore calling handle_error(), which will
# close the connection.
# close the connection.
msgid
,
async
,
name
,
args
=
self
.
decode
(
message
)
msgid
,
async
_
,
name
,
args
=
self
.
decode
(
message
)
if
debug_zrpc
:
if
debug_zrpc
:
self
.
log
(
"recv msg: %s, %s, %s, %s"
%
(
msgid
,
async
,
name
,
self
.
log
(
"recv msg: %s, %s, %s, %s"
%
(
msgid
,
async
_
,
name
,
short_repr
(
args
)),
short_repr
(
args
)),
level
=
TRACE
)
level
=
TRACE
)
...
@@ -446,12 +446,12 @@ class Connection(smac.SizedMessageAsyncConnection, object):
...
@@ -446,12 +446,12 @@ class Connection(smac.SizedMessageAsyncConnection, object):
self
.
send_reply
(
msgid
,
ret
)
self
.
send_reply
(
msgid
,
ret
)
elif
name
==
REPLY
:
elif
name
==
REPLY
:
assert
not
async
assert
not
async
_
self
.
handle_reply
(
msgid
,
args
)
self
.
handle_reply
(
msgid
,
args
)
else
:
else
:
self
.
handle_request
(
msgid
,
async
,
name
,
args
)
self
.
handle_request
(
msgid
,
async
_
,
name
,
args
)
def
handle_request
(
self
,
msgid
,
async
,
name
,
args
):
def
handle_request
(
self
,
msgid
,
async
_
,
name
,
args
):
obj
=
self
.
obj
obj
=
self
.
obj
if
name
.
startswith
(
'_'
)
or
not
hasattr
(
obj
,
name
):
if
name
.
startswith
(
'_'
)
or
not
hasattr
(
obj
,
name
):
...
@@ -482,14 +482,14 @@ class Connection(smac.SizedMessageAsyncConnection, object):
...
@@ -482,14 +482,14 @@ class Connection(smac.SizedMessageAsyncConnection, object):
self
.
log
(
"%s() raised exception: %s"
%
(
name
,
msg
),
self
.
log
(
"%s() raised exception: %s"
%
(
name
,
msg
),
logging
.
ERROR
,
exc_info
=
True
)
logging
.
ERROR
,
exc_info
=
True
)
error
=
sys
.
exc_info
()[:
2
]
error
=
sys
.
exc_info
()[:
2
]
if
async
:
if
async
_
:
self
.
log
(
"Asynchronous call raised exception: %s"
%
self
,
self
.
log
(
"Asynchronous call raised exception: %s"
%
self
,
level
=
logging
.
ERROR
,
exc_info
=
True
)
level
=
logging
.
ERROR
,
exc_info
=
True
)
else
:
else
:
self
.
return_error
(
msgid
,
*
error
)
self
.
return_error
(
msgid
,
*
error
)
return
return
if
async
:
if
async
_
:
if
ret
is
not
None
:
if
ret
is
not
None
:
raise
ZRPCError
(
"async method %s returned value %s"
%
raise
ZRPCError
(
"async method %s returned value %s"
%
(
name
,
short_repr
(
ret
)))
(
name
,
short_repr
(
ret
)))
...
@@ -543,17 +543,17 @@ class Connection(smac.SizedMessageAsyncConnection, object):
...
@@ -543,17 +543,17 @@ class Connection(smac.SizedMessageAsyncConnection, object):
else
:
else
:
self
.
__super_setSessionKey
(
key
)
self
.
__super_setSessionKey
(
key
)
def
send_call
(
self
,
method
,
args
,
async
=
False
):
def
send_call
(
self
,
method
,
args
,
async
_
=
False
):
# send a message and return its msgid
# send a message and return its msgid
if
async
:
if
async
_
:
msgid
=
0
msgid
=
0
else
:
else
:
msgid
=
self
.
_new_msgid
()
msgid
=
self
.
_new_msgid
()
if
debug_zrpc
:
if
debug_zrpc
:
self
.
log
(
"send msg: %d, %d, %s, ..."
%
(
msgid
,
async
,
method
),
self
.
log
(
"send msg: %d, %d, %s, ..."
%
(
msgid
,
async
_
,
method
),
level
=
TRACE
)
level
=
TRACE
)
buf
=
self
.
encode
(
msgid
,
async
,
method
,
args
)
buf
=
self
.
encode
(
msgid
,
async
_
,
method
,
args
)
self
.
message_output
(
buf
)
self
.
message_output
(
buf
)
return
msgid
return
msgid
...
...
src/ZEO/tests/ZEO4/zrpc/marshal.py
View file @
b823ccde
...
@@ -17,6 +17,8 @@ from ZEO._compat import Unpickler, Pickler, BytesIO, PY3, PYPY
...
@@ -17,6 +17,8 @@ from ZEO._compat import Unpickler, Pickler, BytesIO, PY3, PYPY
from
.error
import
ZRPCError
from
.error
import
ZRPCError
from
.log
import
log
,
short_repr
from
.log
import
log
,
short_repr
PY2
=
not
PY3
def
encode
(
*
args
):
# args: (msgid, flags, name, args)
def
encode
(
*
args
):
# args: (msgid, flags, name, args)
# (We used to have a global pickler, but that's not thread-safe. :-( )
# (We used to have a global pickler, but that's not thread-safe. :-( )
...
@@ -106,6 +108,8 @@ _silly = ('__doc__',)
...
@@ -106,6 +108,8 @@ _silly = ('__doc__',)
exception_type_type
=
type
(
Exception
)
exception_type_type
=
type
(
Exception
)
_SAFE_MODULE_NAMES
=
(
'ZopeUndo.Prefix'
,
'copy_reg'
,
'__builtin__'
,
'zodbpickle'
)
def
find_global
(
module
,
name
):
def
find_global
(
module
,
name
):
"""Helper for message unpickler"""
"""Helper for message unpickler"""
try
:
try
:
...
@@ -118,7 +122,7 @@ def find_global(module, name):
...
@@ -118,7 +122,7 @@ def find_global(module, name):
except
AttributeError
:
except
AttributeError
:
raise
ZRPCError
(
"module %s has no global %s"
%
(
module
,
name
))
raise
ZRPCError
(
"module %s has no global %s"
%
(
module
,
name
))
safe
=
getattr
(
r
,
'__no_side_effects__'
,
0
)
safe
=
getattr
(
r
,
'__no_side_effects__'
,
0
)
or
(
PY2
and
module
in
_SAFE_MODULE_NAMES
)
if
safe
:
if
safe
:
return
r
return
r
...
@@ -130,9 +134,10 @@ def find_global(module, name):
...
@@ -130,9 +134,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
_SAFE_MODULE_NAMES
:
raise
ImportError
(
"Module not allowed: %s"
%
(
module
,))
try
:
try
:
if
module
!=
'ZopeUndo.Prefix'
:
raise
ImportError
m
=
__import__
(
module
,
_globals
,
_globals
,
_silly
)
m
=
__import__
(
module
,
_globals
,
_globals
,
_silly
)
except
ImportError
as
msg
:
except
ImportError
as
msg
:
raise
ZRPCError
(
"import error %s: %s"
%
(
module
,
msg
))
raise
ZRPCError
(
"import error %s: %s"
%
(
module
,
msg
))
...
...
src/ZEO/tests/testConversionSupport.py
View file @
b823ccde
...
@@ -60,7 +60,7 @@ class FakeConnection(object):
...
@@ -60,7 +60,7 @@ class FakeConnection(object):
addr
=
'test'
addr
=
'test'
call_soon_threadsafe
=
lambda
f
,
*
a
:
f
(
*
a
)
call_soon_threadsafe
=
lambda
f
,
*
a
:
f
(
*
a
)
async
=
async_threadsafe
=
None
async
_
=
async_threadsafe
=
None
def
test_server_record_iternext
():
def
test_server_record_iternext
():
"""
"""
...
@@ -123,8 +123,6 @@ First, fake out the connection manager so we can make a connection:
...
@@ -123,8 +123,6 @@ First, fake out the connection manager so we can make a connection:
...
...
... return oid, oid*8, 'data ' + oid, next
... return oid, oid*8, 'data ' + oid, next
...
...
... def close(self):
... pass
>>> client = ZEO.client(
>>> client = ZEO.client(
... '', wait=False, _client_factory=Client)
... '', wait=False, _client_factory=Client)
...
...
src/ZEO/tests/testTransactionBuffer.py
View file @
b823ccde
...
@@ -40,6 +40,7 @@ class TransBufTests(unittest.TestCase):
...
@@ -40,6 +40,7 @@ class TransBufTests(unittest.TestCase):
store
(
tbuf
)
store
(
tbuf
)
for
o
in
tbuf
:
for
o
in
tbuf
:
pass
pass
tbuf
.
close
()
def
checkOrderPreserved
(
self
):
def
checkOrderPreserved
(
self
):
tbuf
=
TransactionBuffer
(
0
)
tbuf
=
TransactionBuffer
(
0
)
...
...
src/ZEO/tests/testZEO.py
View file @
b823ccde
...
@@ -801,11 +801,11 @@ class FauxConn(object):
...
@@ -801,11 +801,11 @@ class FauxConn(object):
peer_protocol_version
=
protocol_version
peer_protocol_version
=
protocol_version
serials
=
[]
serials
=
[]
def
async
(
self
,
method
,
*
args
):
def
async
_
(
self
,
method
,
*
args
):
if
method
==
'serialnos'
:
if
method
==
'serialnos'
:
self
.
serials
.
extend
(
args
[
0
])
self
.
serials
.
extend
(
args
[
0
])
call_soon_threadsafe
=
async_threadsafe
=
async
call_soon_threadsafe
=
async_threadsafe
=
async
_
class
StorageServerWrapper
(
object
):
class
StorageServerWrapper
(
object
):
...
@@ -1353,10 +1353,11 @@ You can specify the client label via a configuration file as well:
...
@@ -1353,10 +1353,11 @@ You can specify the client label via a configuration file as well:
>>> db.close()
>>> db.close()
>>> @wait_until
>>> @wait_until
... def check_for_test_label_2():
... def check_for_test_label_2():
... for line in open('server.log'):
... with open('server.log') as f:
... if 'test-label-2' in line:
... for line in f:
... print(line.split()[1:4])
... if 'test-label-2' in line:
... return True
... print(line.split()[1:4])
... return True
['INFO', 'ZEO.StorageServer', '(test-label-2']
['INFO', 'ZEO.StorageServer', '(test-label-2']
"""
"""
...
...
src/ZEO/tests/testZEO2.py
View file @
b823ccde
...
@@ -500,8 +500,8 @@ def test_suite():
...
@@ -500,8 +500,8 @@ def test_suite():
doctest
.
DocTestSuite
(
doctest
.
DocTestSuite
(
setUp
=
ZODB
.
tests
.
util
.
setUp
,
tearDown
=
setupstack
.
tearDown
,
setUp
=
ZODB
.
tests
.
util
.
setUp
,
tearDown
=
setupstack
.
tearDown
,
checker
=
renormalizing
.
RENormalizing
([
checker
=
renormalizing
.
RENormalizing
([
(
re
.
compile
(
'
\
d+/
t
est-addr'
),
''
),
(
re
.
compile
(
r
'\
d+/
test-addr'
),
''
),
(
re
.
compile
(
"'lock_time':
\
d+.
\
d+"
),
'lock_time'
),
(
re
.
compile
(
r
"'lock_time': \
d+.
\d+"
),
'lock_time'
),
(
re
.
compile
(
r"'start': '[^\n]+'"
),
'start'
),
(
re
.
compile
(
r"'start': '[^\n]+'"
),
'start'
),
(
re
.
compile
(
'ZODB.POSException.StorageTransactionError'
),
(
re
.
compile
(
'ZODB.POSException.StorageTransactionError'
),
'StorageTransactionError'
),
'StorageTransactionError'
),
...
...
src/ZEO/tests/utils.py
View file @
b823ccde
...
@@ -25,10 +25,10 @@ class ServerProtocol(object):
...
@@ -25,10 +25,10 @@ class ServerProtocol(object):
def
call_soon_threadsafe
(
self
,
func
,
*
args
):
def
call_soon_threadsafe
(
self
,
func
,
*
args
):
func
(
*
args
)
func
(
*
args
)
def
async
(
self
,
*
args
):
def
async
_
(
self
,
*
args
):
self
.
calls
.
append
(
args
)
self
.
calls
.
append
(
args
)
async_threadsafe
=
async
async_threadsafe
=
async
_
class
StorageServer
(
object
):
class
StorageServer
(
object
):
"""Create a client interface to a StorageServer.
"""Create a client interface to a StorageServer.
...
...
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