Whitespace cleanup
parent
6519cfbb9e
commit
86b19bb9e7
|
@ -25,7 +25,8 @@ except ImportError: #pragma: no cover
|
|||
import urllib
|
||||
import urlparse
|
||||
urllib.parse = urlparse
|
||||
urllib.parse.urlencode = urllib.urlencode #@UndefinedVariable
|
||||
urllib.parse.urlencode = urllib.urlencode
|
||||
|
||||
|
||||
def allow(*methods):
|
||||
'''Specify the allowed HTTP verbs for a controller callable
|
||||
|
|
|
@ -28,6 +28,7 @@ import milla.dispatch.traversal
|
|||
|
||||
__all__ = ['Application']
|
||||
|
||||
|
||||
class Application(object):
|
||||
'''Represents a Milla web application
|
||||
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
|
||||
:Created: Mar 3, 2011
|
||||
:Author: dustin
|
||||
:Updated: $Date$
|
||||
:Updater: $Author$
|
||||
'''
|
||||
|
||||
from functools import wraps
|
||||
|
@ -24,10 +22,13 @@ from milla.auth import RequestValidator, NotAuthorized, permissions
|
|||
import milla
|
||||
import pkg_resources
|
||||
|
||||
|
||||
__all__ = ['auth_required', 'require_perms']
|
||||
|
||||
|
||||
VALIDATOR_EP_GROUP = 'milla.request_validator'
|
||||
|
||||
|
||||
def _find_request(*args, **kwargs):
|
||||
try:
|
||||
return kwargs['request']
|
||||
|
@ -36,6 +37,7 @@ def _find_request(*args, **kwargs):
|
|||
if isinstance(arg, milla.Request):
|
||||
return arg
|
||||
|
||||
|
||||
def _validate_request(func, requirement, *args, **kwargs):
|
||||
request = _find_request(*args, **kwargs)
|
||||
ep_name = request.config.get('request_validator', 'default')
|
||||
|
@ -55,6 +57,7 @@ def _validate_request(func, requirement, *args, **kwargs):
|
|||
return e(request)
|
||||
return func(*args, **kwargs)
|
||||
|
||||
|
||||
def auth_required(func):
|
||||
'''Simple decorator to enforce authentication for a controller
|
||||
|
||||
|
@ -88,6 +91,7 @@ def auth_required(func):
|
|||
return _validate_request(func, None, *args, **kwargs)
|
||||
return wrapper
|
||||
|
||||
|
||||
class require_perms(object):
|
||||
'''Decorator that requires the user have certain permissions
|
||||
|
||||
|
|
Loading…
Reference in New Issue