more review cleanup

3 files changed, 12 insertions, 13 deletions

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/044_add_network_priority.py b/nova/db/sqlalchemy/migrate_repo/versions/044_add_network_priority.py
index e69380199..e3ee6a85f 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/044_add_network_priority.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/044_add_network_priority.py
@@ -25,13 +25,11 @@ meta = MetaData()
 # Add priority column to networks table
 priority = Column('priority', Integer())
 
+networks = Table('networks', meta, autoload=True)
 
 def upgrade(migrate_engine):
     meta.bind = migrate_engine
 
-    # grab tables and (column for dropping later)
-    networks = Table('networks', meta, autoload=True)
-
     try:
         networks.create_column(priority)
     except Exception:
diff --git a/nova/network/quantum/melange_connection.py b/nova/network/quantum/melange_connection.py
index 5a79eff77..d5a1901aa 100644
--- a/nova/network/quantum/melange_connection.py
+++ b/nova/network/quantum/melange_connection.py
@@ -50,13 +50,13 @@ class MelangeConnection(object):
         self.use_ssl = use_ssl
         self.version = "v0.1"
 
-    def get(self, path, params={}, headers={}):
+    def get(self, path, params=None, headers=None):
         return self.do_request("GET", path, params=params, headers=headers)
 
-    def post(self, path, body=None, headers={}):
+    def post(self, path, body=None, headers=None):
         return self.do_request("POST", path, body=body, headers=headers)
 
-    def delete(self, path, headers={}):
+    def delete(self, path, headers=None):
         return self.do_request("DELETE", path, headers=headers)
 
     def _get_connection(self):
@@ -65,12 +65,13 @@ class MelangeConnection(object):
         else:
             return httplib.HTTPConnection(self.host, self.port)
 
-    def do_request(self, method, path, body=None, headers={}, params={}):
-
-        url = "/%s/%s.json?%s" % (self.version,
-                                  path,
-                                  urllib.urlencode(params))
+    def do_request(self, method, path, body=None, headers=None, params=None):
+        headers = headers or {}
+        params = params or {}
 
+        url = "/%s/%s.json" % (self.version, path)
+        if params:
+            url += "?%s" % urllib.urlencode(params)
         try:
             connection = self._get_connection()
             connection.request(method, url, body, headers)
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index 0b1a1f204..0feec9b99 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -277,10 +277,10 @@ class QuantumTestCaseBase(object):
                         nw_info[1][0]['cidr_v6'].startswith("2001:1db9:"))
 
         # v6 address
-        self.assertTrue(\
+        self.assertTrue(
             nw_info[0][1]['ip6s'][0]['ip'].startswith("2001:1dbb:") or
             nw_info[1][1]['ip6s'][0]['ip'].startswith("2001:1dbb:"))
-        self.assertTrue(\
+        self.assertTrue(
             nw_info[0][1]['ip6s'][0]['ip'].startswith("2001:1db9:") or
             nw_info[1][1]['ip6s'][0]['ip'].startswith("2001:1db9:"))