openstack/oslo.middleware
Code Issues Proposed changes

Merge "Update hacking version"

Browse Source
This commit is contained in:
Zuul 2019-03-26 09:31:36 +00:00 committed by Gerrit Code Review
commit c14cef7a3f
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oslo_middleware/base.py
View File

@ -17,16 +17,15 @@
import six import six
if six.PY2: from oslo_config import cfg
from inspect import getargspec as getfullargspec
else:
from inspect import getfullargspec
import webob.dec import webob.dec
import webob.request import webob.request
import webob.response import webob.response
from oslo_config import cfg if six.PY2:
from inspect import getargspec as getfullargspec
else:
from inspect import getfullargspec
class NoContentTypeResponse(webob.response.Response): class NoContentTypeResponse(webob.response.Response):

4
oslo_middleware/cors.py
View File

@ -140,8 +140,8 @@ class CORS(base.ConfigurableMiddleware):
allow_methods: List of HTTP methods to permit. allow_methods: List of HTTP methods to permit.
allow_headers: List of HTTP headers to permit from the client. allow_headers: List of HTTP headers to permit from the client.
""" """
if ('allowed_origin' not in local_conf if ('allowed_origin' not in local_conf and
and 'oslo_config_project' not in local_conf): 'oslo_config_project' not in local_conf):
raise TypeError("allowed_origin or oslo_config_project " raise TypeError("allowed_origin or oslo_config_project "
"is required") "is required")
return super(CORS, cls).factory(global_conf, **local_conf) return super(CORS, cls).factory(global_conf, **local_conf)

18
oslo_middleware/opts.py
View File

@ -12,6 +12,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import copy
import itertools
from oslo_middleware import cors
from oslo_middleware.healthcheck import opts as healthcheck_opts
from oslo_middleware import http_proxy_to_wsgi
from oslo_middleware import sizelimit
from oslo_middleware import ssl
__all__ = [ __all__ = [
'list_opts', 'list_opts',
@ -23,16 +31,6 @@ __all__ = [
] ]
import copy
import itertools
from oslo_middleware import cors
from oslo_middleware.healthcheck import opts as healthcheck_opts
from oslo_middleware import http_proxy_to_wsgi
from oslo_middleware import sizelimit
from oslo_middleware import ssl
def list_opts(): def list_opts():
"""Return a list of oslo.config options for ALL of the middleware classes. """Return a list of oslo.config options for ALL of the middleware classes.

2
test-requirements.txt
View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 hacking>=1.1.0,<1.2.0 # Apache-2.0
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT