Bug 925372: remove deprecated webob attributes

(and also specify stable webob version in pip-requires)

Change-Id: Id8dd53368f88042b71fc73a5f94803e635c4140b

diff --git a/quantum/api/networks.py b/quantum/api/networks.py
index 9ad883e6df7f172d41646d40c5fe6b856d82e33d..29263807bfdb8b9b6899fdbfc2bd080b2294462c 100644 (file)
--- a/quantum/api/networks.py
+++ b/quantum/api/networks.py
@@ -79,7 +79,7 @@ class Controller(common.QuantumController):
 
         """
         filter_opts = {}
-        filter_opts.update(request.str_GET)
+        filter_opts.update(request.GET)
         networks = self._plugin.get_all_networks(tenant_id,
                                                  filter_opts=filter_opts)
         # Inefficient, API-layer filtering

diff --git a/quantum/api/ports.py b/quantum/api/ports.py
index d9b15c0e80d4ec8be0eb9fe279deb5c8da655599..09ee212df53d1d34e231732568b586546f623716 100644 (file)
--- a/quantum/api/ports.py
+++ b/quantum/api/ports.py
@@ -58,7 +58,7 @@ class Controller(common.QuantumController):
         of ports returned by the plugin
         """
         filter_opts = {}
-        filter_opts.update(request.str_GET)
+        filter_opts.update(request.GET)
         port_list = self._plugin.get_all_ports(tenant_id,
                                                network_id,
                                                filter_opts=filter_opts)

diff --git a/tools/pip-requires b/tools/pip-requires
index 3d63fac1e1beb3621be346a90a838bda59e1fcf4..572e82853416e77f26bdc96fe07da147a02da1c0 100644 (file)
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -6,7 +6,7 @@ lxml==2.3
 python-gflags==1.3
 simplejson
 sqlalchemy
-webob==1.0.8
+webob==1.1.1
 webtest
 
 distribute>=0.6.24