QPID-2261: make code compliant with Python PEP-8 style

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@903717 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 27 insertions, 27 deletions

diff --git a/qpid/python/qmf2/tests/agent_discovery.py b/qpid/python/qmf2/tests/agent_discovery.py
index 277018f297..ce346d84e6 100644
--- a/qpid/python/qmf2/tests/agent_discovery.py
+++ b/qpid/python/qmf2/tests/agent_discovery.py
@@ -134,7 +134,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
         self.console.enable_agent_discovery()
 
         agent1_found = agent2_found = False
@@ -177,7 +177,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         query = qmf2.common.QmfQuery.create_predicate(
                            qmf2.common.QmfQuery.TARGET_AGENT,
@@ -223,7 +223,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
         self.console.enable_agent_discovery()
 
         agent1_found = agent2_found = False
@@ -316,7 +316,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         agent1 = self.console.find_agent("agent1", timeout=3)
         self.assertTrue(agent1 and agent1.get_name() == "agent1")
@@ -327,7 +327,7 @@ class BaseTest(unittest.TestCase):
         agent2 = self.console.find_agent("agent2", timeout=3)
         self.assertTrue(agent2 and agent2.get_name() == "agent2")
 
-        self.console.removeConnection(self.conn, 10)
+        self.console.remove_connection(self.conn, 10)
         self.console.destroy(10)
 
 
@@ -349,7 +349,7 @@ class BaseTest(unittest.TestCase):
                                              self.broker.user,
                                              self.broker.password)
             conn.connect()
-            console.addConnection(conn)
+            console.add_connection(conn)
             console.enable_agent_discovery()
             self.consoles.append(console)
 
@@ -453,7 +453,7 @@ class BaseTest(unittest.TestCase):
                                              self.broker.user,
                                              self.broker.password)
             conn.connect()
-            console.addConnection(conn)
+            console.add_connection(conn)
             self.consoles.append(console)
 
         agent1 = self.consoles[0].find_agent("agent1", timeout=3)
diff --git a/qpid/python/qmf2/tests/basic_method.py b/qpid/python/qmf2/tests/basic_method.py
index 3db3af1d96..a12bbe7c4a 100644
--- a/qpid/python/qmf2/tests/basic_method.py
+++ b/qpid/python/qmf2/tests/basic_method.py
@@ -240,7 +240,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
@@ -253,7 +253,7 @@ class BaseTest(unittest.TestCase):
                       {QmfQuery.CMP_EQ: [SchemaClassId.KEY_PACKAGE,
                                          "MyPackage"]}]}))
 
-            obj_list = self.console.doQuery(agent, query)
+            obj_list = self.console.do_query(agent, query)
             self.assertTrue(len(obj_list) == 2)
             for obj in obj_list:
                 mr = obj.invoke_method( "set_meth", {"arg_int": -99,
@@ -290,7 +290,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
@@ -303,7 +303,7 @@ class BaseTest(unittest.TestCase):
                       {QmfQuery.CMP_EQ: [SchemaClassId.KEY_PACKAGE,
                                          "MyPackage"]}]}))
 
-            obj_list = self.console.doQuery(agent, query)
+            obj_list = self.console.do_query(agent, query)
             self.assertTrue(len(obj_list) == 2)
             for obj in obj_list:
                 self.failUnlessRaises(ValueError,
@@ -327,14 +327,14 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
             self.assertTrue(agent and agent.get_name() == aname)
 
             query = QmfQuery.create_id(QmfQuery.TARGET_OBJECT, "01545")
-            obj_list = self.console.doQuery(agent, query)
+            obj_list = self.console.do_query(agent, query)
 
             self.assertTrue(isinstance(obj_list, type([])))
             self.assertTrue(len(obj_list) == 1)
diff --git a/qpid/python/qmf2/tests/basic_query.py b/qpid/python/qmf2/tests/basic_query.py
index 4c55878d2c..61002976a2 100644
--- a/qpid/python/qmf2/tests/basic_query.py
+++ b/qpid/python/qmf2/tests/basic_query.py
@@ -187,14 +187,14 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
             self.assertTrue(agent and agent.get_name() == aname)
 
             query = QmfQuery.create_wildcard(QmfQuery.TARGET_OBJECT_ID)
-            oid_list = self.console.doQuery(agent, query)
+            oid_list = self.console.do_query(agent, query)
 
             self.assertTrue(isinstance(oid_list, type([])), 
                             "Unexpected return type")
@@ -219,7 +219,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
@@ -227,7 +227,7 @@ class BaseTest(unittest.TestCase):
 
             for oid in ['100a name', '99another name', '01545']:
                 query = QmfQuery.create_id(QmfQuery.TARGET_OBJECT, oid)
-                obj_list = self.console.doQuery(agent, query)
+                obj_list = self.console.do_query(agent, query)
 
                 self.assertTrue(isinstance(obj_list, type([])), 
                                 "Unexpected return type")
@@ -261,14 +261,14 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
             self.assertTrue(agent and agent.get_name() == aname)
 
             query = QmfQuery.create_wildcard(QmfQuery.TARGET_PACKAGES)
-            package_list = self.console.doQuery(agent, query)
+            package_list = self.console.do_query(agent, query)
             self.assertTrue(len(package_list) == 1)
             self.assertTrue('MyPackage' in package_list)
 
@@ -289,7 +289,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
@@ -300,7 +300,7 @@ class BaseTest(unittest.TestCase):
                     {QmfQuery.CMP_EQ: [SchemaClassId.KEY_PACKAGE, 
                                        "MyPackage"]}))
 
-            schema_list = self.console.doQuery(agent, query)
+            schema_list = self.console.do_query(agent, query)
             self.assertTrue(len(schema_list))
             for schema in schema_list:
                 self.assertTrue(schema.get_class_id().get_package_name() ==
@@ -323,7 +323,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for aname in ["agent1", "agent2"]:
             agent = self.console.find_agent(aname, timeout=3)
@@ -334,7 +334,7 @@ class BaseTest(unittest.TestCase):
                     {QmfQuery.CMP_EQ: [SchemaClassId.KEY_PACKAGE, 
                                        "No-Such-Package"]}))
 
-            schema_list = self.console.doQuery(agent, query)
+            schema_list = self.console.do_query(agent, query)
             self.assertTrue(len(schema_list) == 0)
 
         self.console.destroy(10)
diff --git a/qpid/python/qmf2/tests/events.py b/qpid/python/qmf2/tests/events.py
index 25c749cffa..9ee6b6af8d 100644
--- a/qpid/python/qmf2/tests/events.py
+++ b/qpid/python/qmf2/tests/events.py
@@ -168,7 +168,7 @@ class BaseTest(unittest.TestCase):
         except qpid.messaging.ConnectError, e:
             raise Skipped(e)
 
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         # find the agents
         for aname in ["agent1", "agent2"]:
diff --git a/qpid/python/qmf2/tests/obj_gets.py b/qpid/python/qmf2/tests/obj_gets.py
index f9be25409f..50d585a718 100644
--- a/qpid/python/qmf2/tests/obj_gets.py
+++ b/qpid/python/qmf2/tests/obj_gets.py
@@ -213,7 +213,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         for agent_app in self.agents:
             aname = agent_app.agent.get_name()
@@ -271,7 +271,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         agent_list = []
         for agent_app in self.agents:
@@ -343,7 +343,7 @@ class BaseTest(unittest.TestCase):
                                               self.broker.user,
                                               self.broker.password)
         self.conn.connect()
-        self.console.addConnection(self.conn)
+        self.console.add_connection(self.conn)
 
         agent_list = []
         for agent_app in self.agents: