You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2018/11/02 20:46:37 UTC
[17/50] qpid-proton git commit: PROTON-1934: [Python] Export Backoff
from reactor.py - Also some minor fixes to internal imports
PROTON-1934: [Python] Export Backoff from reactor.py
- Also some minor fixes to internal imports
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/4acc81ea
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/4acc81ea
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/4acc81ea
Branch: refs/heads/go1
Commit: 4acc81ea2e47688427160bee9d59d2428da49497
Parents: c2e3992
Author: Andrew Stitcher <as...@apache.org>
Authored: Wed Sep 12 16:51:43 2018 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Sep 12 17:01:47 2018 -0400
----------------------------------------------------------------------
python/proton/_compat.py | 4 ++--
python/proton/_handlers.py | 2 +-
python/proton/_reactor.py | 3 ++-
python/proton/reactor.py | 6 ++++--
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4acc81ea/python/proton/_compat.py
----------------------------------------------------------------------
diff --git a/python/proton/_compat.py b/python/proton/_compat.py
index 79bd2c1..4d9d070 100644
--- a/python/proton/_compat.py
+++ b/python/proton/_compat.py
@@ -27,11 +27,11 @@ import sys
try:
import Queue as queue
except ImportError:
- import queue
+ import queue # type: ignore
try:
from urlparse import urlparse, urlunparse
- from urllib import quote, unquote
+ from urllib import quote, unquote # type: ignore
except ImportError:
from urllib.parse import urlparse, urlunparse, quote, unquote
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4acc81ea/python/proton/_handlers.py
----------------------------------------------------------------------
diff --git a/python/proton/_handlers.py b/python/proton/_handlers.py
index 8b798f8..f8d5413 100644
--- a/python/proton/_handlers.py
+++ b/python/proton/_handlers.py
@@ -672,7 +672,7 @@ CFlowController = FlowController
CHandshaker = Handshaker
-from ._events import WrappedHandler
+from ._reactor_impl import WrappedHandler
from cproton import pn_iohandler
class IOHandler(WrappedHandler):
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4acc81ea/python/proton/_reactor.py
----------------------------------------------------------------------
diff --git a/python/proton/_reactor.py b/python/proton/_reactor.py
index 5a826bf..1d09b18 100644
--- a/python/proton/_reactor.py
+++ b/python/proton/_reactor.py
@@ -36,9 +36,10 @@ from cproton import PN_MILLIS_MAX, PN_PYREF, PN_ACCEPTED, \
from ._delivery import Delivery
from ._endpoints import Connection, Endpoint, Link, Session, Terminus
+from ._exceptions import SSLUnavailable
from ._data import Described, symbol, ulong
from ._message import Message
-from ._transport import Transport, SSL, SSLDomain, SSLUnavailable
+from ._transport import Transport, SSL, SSLDomain
from ._url import Url
from ._common import isstring, secs2millis, millis2secs, unicode2utf8, utf82unicode
from ._events import EventType, EventBase, Handler
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4acc81ea/python/proton/reactor.py
----------------------------------------------------------------------
diff --git a/python/proton/reactor.py b/python/proton/reactor.py
index 639cc5b..db1f826 100644
--- a/python/proton/reactor.py
+++ b/python/proton/reactor.py
@@ -21,7 +21,8 @@ from __future__ import absolute_import
from ._reactor import Container, ApplicationEvent, EventInjector, Handler,\
LinkOption, ReceiverOption, SenderOption,\
- AtLeastOnce, AtMostOnce, DynamicNodeProperties, Filter, Selector, DurableSubscription, Copy, Move
+ AtLeastOnce, AtMostOnce, DynamicNodeProperties, Filter, Selector, \
+ DurableSubscription, Copy, Move, Backoff
__all__ = [
'Container',
@@ -38,5 +39,6 @@ __all__ = [
'Selector',
'DurableSubscription',
'Copy',
- 'Move'
+ 'Move',
+ 'Backoff'
]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org