Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7338717389 for ; Wed, 11 Feb 2015 14:57:43 +0000 (UTC) Received: (qmail 81027 invoked by uid 500); 11 Feb 2015 14:57:43 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 80965 invoked by uid 500); 11 Feb 2015 14:57:43 -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 80907 invoked by uid 99); 11 Feb 2015 14:57:43 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2015 14:57:43 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id C45BDAC010E for ; Wed, 11 Feb 2015 14:57:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1658975 - in /qpid/dispatch/trunk: python/qpid_dispatch/management/__init__.py tests/system_test.py tests/system_tests_management.py tools/qdmanage tools/qdstat Date: Wed, 11 Feb 2015 14:57:42 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150211145742.C45BDAC010E@hades.apache.org> Author: aconway Date: Wed Feb 11 14:57:41 2015 New Revision: 1658975 URL: http://svn.apache.org/r1658975 Log: 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. Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/__init__.py qpid/dispatch/trunk/tests/system_test.py qpid/dispatch/trunk/tests/system_tests_management.py qpid/dispatch/trunk/tools/qdmanage qpid/dispatch/trunk/tools/qdstat Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/__init__.py URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/__init__.py?rev=1658975&r1=1658974&r2=1658975&view=diff ============================================================================== --- qpid/dispatch/trunk/python/qpid_dispatch/management/__init__.py (original) +++ qpid/dispatch/trunk/python/qpid_dispatch/management/__init__.py Wed Feb 11 14:57:41 2015 @@ -17,5 +17,3 @@ # under the License # """AMQP management client package.""" - -from .client import * Modified: qpid/dispatch/trunk/tests/system_test.py URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_test.py?rev=1658975&r1=1658974&r2=1658975&view=diff ============================================================================== --- qpid/dispatch/trunk/tests/system_test.py (original) +++ qpid/dispatch/trunk/tests/system_test.py Wed Feb 11 14:57:41 2015 @@ -56,7 +56,7 @@ import os, time, socket, random, subproc 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 Modified: qpid/dispatch/trunk/tests/system_tests_management.py URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_management.py?rev=1658975&r1=1658974&r2=1658975&view=diff ============================================================================== --- qpid/dispatch/trunk/tests/system_tests_management.py (original) +++ qpid/dispatch/trunk/tests/system_tests_management.py Wed Feb 11 14:57:41 2015 @@ -20,7 +20,7 @@ """System tests for management of qdrouter""" import unittest, system_test, re, os, json, sys -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 qpid_dispatch_internal.management.qdrouter import QdSchema from qpid_dispatch_internal.compat import OrderedDict, dictify from system_test import Qdrouterd, message, retry, retry_exception, wait_ports, Process Modified: qpid/dispatch/trunk/tools/qdmanage URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdmanage?rev=1658975&r1=1658974&r2=1658975&view=diff ============================================================================== --- qpid/dispatch/trunk/tools/qdmanage (original) +++ qpid/dispatch/trunk/tools/qdmanage Wed Feb 11 14:57:41 2015 @@ -21,7 +21,7 @@ import sys, json, re 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 Modified: qpid/dispatch/trunk/tools/qdstat URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdstat?rev=1658975&r1=1658974&r2=1658975&view=diff ============================================================================== --- qpid/dispatch/trunk/tools/qdstat (original) +++ qpid/dispatch/trunk/tools/qdstat Wed Feb 11 14:57:41 2015 @@ -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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org