Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CB3CC200AF7 for ; Tue, 14 Jun 2016 17:58:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C9E35160A5F; Tue, 14 Jun 2016 15:58:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1F518160A47 for ; Tue, 14 Jun 2016 17:58:02 +0200 (CEST) Received: (qmail 19487 invoked by uid 500); 14 Jun 2016 15:58:02 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 19461 invoked by uid 99); 14 Jun 2016 15:58:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2016 15:58:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1FF0DFC74; Tue, 14 Jun 2016 15:58:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aconway@apache.org To: commits@qpid.apache.org Date: Tue, 14 Jun 2016 15:58:03 -0000 Message-Id: In-Reply-To: <6f1000c6d5b34d1a8a0e8e40b2347b05@git.apache.org> References: <6f1000c6d5b34d1a8a0e8e40b2347b05@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] qpid-dispatch git commit: NO-JIRA: Remove proton_future monkey-patch, ok since proton 0.10. archived-at: Tue, 14 Jun 2016 15:58:04 -0000 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 Authored: Wed Feb 17 09:51:26 2016 -0500 Committer: Alan Conway 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: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org