NO-JIRA: Remove proton_future monkey-patch, ok since proton 0.10.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1c3c1f5b Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1c3c1f5b Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1c3c1f5b Branch: refs/heads/master Commit: 1c3c1f5bee068ade245f087224a6b2ef8fab784f Parents: 1ddb7d0 Author: Alan Conway <[email protected]> Authored: Wed Feb 17 09:51:26 2016 -0500 Committer: Alan Conway <[email protected]> Committed: Tue Jun 14 11:51:12 2016 -0400 ---------------------------------------------------------------------- python/qpid_dispatch/management/client.py | 6 +- .../proton_future/__init__.py | 3908 ------------------ .../proton_future/handlers.py | 442 -- .../proton_future/reactors.py | 833 ---- .../proton_future/utils.py | 173 - python/qpid_dispatch_internal/tools/command.py | 6 +- 6 files changed, 2 insertions(+), 5366 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1c3c1f5b/python/qpid_dispatch/management/client.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/client.py b/python/qpid_dispatch/management/client.py index 6b42436..e920287 100644 --- a/python/qpid_dispatch/management/client.py +++ b/python/qpid_dispatch/management/client.py @@ -26,11 +26,7 @@ import proton from proton import Url from .error import * # import all error symbols for convenience to users. from .entity import EntityBase, clean_dict -try: - from proton.utils import SyncRequestResponse, BlockingConnection -except ImportError: - from qpid_dispatch_internal.proton_future.utils import SyncRequestResponse, BlockingConnection - +from proton.utils import SyncRequestResponse, BlockingConnection class Entity(EntityBase): """ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
