From e2b7be6a1f4f313829ec1a0366151f0971383c2b Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 11 Feb 2015 14:57:41 +0000
Subject: [PATCH 10/10] NO-JIRA: Remove dependency of qdrouterd on proton
 python binding.

The dependency was introduced in error by a careless use of
    from .client import *
in qpid_dispatch.management.__init__.py
This was dragging in the client module if *any* module under qpid_dispatch.management
was imported.

git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658975 13f79535-47bb-0310-9956-ffa450edef68
---
 python/qpid_dispatch/management/__init__.py | 2 --
 tests/system_test.py                        | 2 +-
 tests/system_tests_management.py            | 2 +-
 tools/qdmanage                              | 2 +-
 tools/qdstat                                | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/python/qpid_dispatch/management/__init__.py b/python/qpid_dispatch/management/__init__.py
index 11adc7d..ce0dd0c 100644
--- a/python/qpid_dispatch/management/__init__.py
+++ b/python/qpid_dispatch/management/__init__.py
@@ -17,5 +17,3 @@
 # under the License
 #
 """AMQP management client package."""
-
-from .client import *
diff --git a/tests/system_test.py b/tests/system_test.py
index 128b2d3..48e740a 100644
--- a/tests/system_test.py
+++ b/tests/system_test.py
@@ -56,7 +56,7 @@ import os, time, socket, random, subprocess, shutil, unittest, __main__, re
 from copy import copy
 import proton
 from proton import Message
-from qpid_dispatch.management import Node
+from qpid_dispatch.management.client import Node
 from run import with_valgrind
 
 # Optional modules
diff --git a/tests/system_tests_management.py b/tests/system_tests_management.py
index 4d5339d..537f8b8 100644
--- a/tests/system_tests_management.py
+++ b/tests/system_tests_management.py
@@ -20,7 +20,7 @@
 """System tests for management of qdrouter"""
 
 import unittest, system_test, re, os
-from qpid_dispatch.management import Node, ManagementError, Url, BadRequestStatus, NotImplementedStatus, NotFoundStatus, ForbiddenStatus
+from qpid_dispatch.management.client import Node, ManagementError, Url, BadRequestStatus, NotImplementedStatus, NotFoundStatus, ForbiddenStatus
 from system_test import Qdrouterd, message, retry, wait_ports, Process
 from proton import ConnectionException
 from itertools import chain
diff --git a/tools/qdmanage b/tools/qdmanage
index 4bf067f..6dd5908 100755
--- a/tools/qdmanage
+++ b/tools/qdmanage
@@ -21,7 +21,7 @@
 
 import sys, json
 import  qpid_dispatch_site
-from qpid_dispatch.management import Node, Url
+from qpid_dispatch.management.client import Node, Url
 from collections import Mapping, Sequence
 from optparse import OptionGroup
 from qpid_dispatch_internal.tools.command import OptionParser, Option, UsageError, connection_options, check_args, main
diff --git a/tools/qdstat b/tools/qdstat
index f89f728..4a57ba4 100755
--- a/tools/qdstat
+++ b/tools/qdstat
@@ -27,7 +27,7 @@ import socket
 import re
 from proton import Messenger, Message, Timeout
 import  qpid_dispatch_site
-from qpid_dispatch.management import Url, Node, Entity
+from qpid_dispatch.management.client import Url, Node, Entity
 from qpid_dispatch_internal.management.qdrouter import QdSchema
 from qpid_dispatch_internal.tools import Display, Header, Sorter, YN, Commas, TimeLong
 from qpid_dispatch_internal.tools.command import connection_options, main, OptionParser
-- 
2.1.0