Switch to oslo.middleware

Change-Id: I35f76724768c163b57728914f0ed700f1bc13e29

6 files changed, 3 insertions, 61 deletions

diff --git a/openstack-common.conf b/openstack-common.conf
index 187ae23..ae43e3f 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,8 +1,6 @@
 [DEFAULT]
 
 # The list of modules to copy from oslo-incubator.git
-module=middleware/base
-module=middleware/__init__
 module=context
 
 script = tools/run_cross_tests.sh
diff --git a/oslo/messaging/notify/middleware.py b/oslo/messaging/notify/middleware.py
index ae62ef2..76e95ad 100644
--- a/oslo/messaging/notify/middleware.py
+++ b/oslo/messaging/notify/middleware.py
@@ -29,7 +29,7 @@ from oslo import messaging
 from oslo.messaging._i18n import _LE
 from oslo.messaging import notify
 from oslo.messaging.openstack.common import context
-from oslo.messaging.openstack.common.middleware import base
+from oslo.middleware import base
 
 LOG = logging.getLogger(__name__)
 
diff --git a/oslo/messaging/openstack/common/middleware/__init__.py b/oslo/messaging/openstack/common/middleware/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/oslo/messaging/openstack/common/middleware/__init__.py
+++ /dev/null
diff --git a/oslo/messaging/openstack/common/middleware/base.py b/oslo/messaging/openstack/common/middleware/base.py
deleted file mode 100644
index 464a1cc..0000000
--- a/oslo/messaging/openstack/common/middleware/base.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Base class(es) for WSGI Middleware."""
-
-import webob.dec
-
-
-class Middleware(object):
-    """Base WSGI middleware wrapper.
-
-    These classes require an application to be initialized that will be called
-    next.  By default the middleware will simply call its wrapped app, or you
-    can override __call__ to customize its behavior.
-    """
-
-    @classmethod
-    def factory(cls, global_conf, **local_conf):
-        """Factory method for paste.deploy."""
-        return cls
-
-    def __init__(self, application):
-        self.application = application
-
-    def process_request(self, req):
-        """Called on each request.
-
-        If this returns None, the next application down the stack will be
-        executed. If it returns a response then that response will be returned
-        and execution will stop here.
-        """
-        return None
-
-    def process_response(self, response):
-        """Do whatever you'd like to the response."""
-        return response
-
-    @webob.dec.wsgify
-    def __call__(self, req):
-        response = self.process_request(req)
-        if response:
-            return response
-        response = req.get_response(self.application)
-        return self.process_response(response)
diff --git a/requirements-py3.txt b/requirements-py3.txt
index 5876f77..ab76b4a 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -18,4 +18,4 @@ PyYAML>=3.1.0
 kombu>=2.5.0
 
 # middleware
-WebOb>=1.2.3
+oslo.middleware>=0.1.0
diff --git a/requirements.txt b/requirements.txt
index de99e5a..29e4b89 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,4 +25,4 @@ PyYAML>=3.1.0
 kombu>=2.5.0
 
 # middleware
-WebOb>=1.2.3
+oslo.middleware>=0.1.0