Merge "expose middleware through oslo.middleware"

2 files changed, 24 insertions, 1 deletions

diff --git a/oslo/middleware/__init__.py b/oslo/middleware/__init__.py
index e69de29..5289943 100644
--- a/oslo/middleware/__init__.py
+++ b/oslo/middleware/__init__.py
@@ -0,0 +1,23 @@
+#    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.
+
+__all__ = ['CatchErrors',
+           'CorrelationId',
+           'Debug',
+           'RequestId',
+           'RequestBodySizeLimiter']
+
+from oslo.middleware.catch_errors import CatchErrors
+from oslo.middleware.correlation_id import CorrelationId
+from oslo.middleware.debug import Debug
+from oslo.middleware.request_id import RequestId
+from oslo.middleware.sizelimit import RequestBodySizeLimiter
diff --git a/tox.ini b/tox.ini
index eabaf32..dd19526 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,7 +34,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 show-source = True
 ignore = E123,E125,H305,H803,H904
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,__init__.py
 
 [hacking]
 import_exceptions = oslo.middleware.i18n