Revision 47ef53d5

b/snf-django-lib/snf_django/lib/api/__init__.py
60 60

  
61 61

  
62 62
def api_method(http_method=None, token_required=True, user_required=True,
63
               logger=None, format_allowed=True):
63
               logger=None, format_allowed=True, astakos_url=None):
64 64
    """Decorator function for views that implement an API method."""
65 65
    if not logger:
66 66
        logger = log
......
89 89
                # Authenticate
90 90
                if user_required:
91 91
                    assert(token_required), "Can not get user without token"
92
                    astakos = astakos_url or settings.ASTAKOS_URL
92 93
                    try:
93
                        astakos = AstakosClient(settings.ASTAKOS_URL,
94
                        astakos = AstakosClient(astakos,
94 95
                                                use_pool=True,
95 96
                                                logger=logger)
96 97
                        user_info = astakos.get_user_info(token)
......
166 167
            raise ValueError("Unknown serialization format '%s'" %
167 168
                             serialization)
168 169

  
169
    if settings.DEBUG or settings.TEST:
170
    if settings.DEBUG or getattr(settings, "TEST", False):
170 171
        response["Date"] = format_date_time(time())
171 172

  
172 173
    if not response.has_header("Content-Length"):
......
182 183
def render_fault(request, fault):
183 184
    """Render an API fault to an HTTP response."""
184 185
    # If running in debug mode add exception information to fault details
185
    if settings.DEBUG or settings.TEST:
186
    if settings.DEBUG or getattr(settings, "TEST", False):
186 187
        fault.details = format_exc()
187 188

  
188 189
    try:
b/snf-pithos-app/pithos/api/util.py
1015 1015
               format_allowed=False):
1016 1016
    def decorator(func):
1017 1017
        @api.api_method(http_method=http_method, user_required=user_required,
1018
                          logger=logger, format_allowed=format_allowed)
1018
                        logger=logger, format_allowed=format_allowed,
1019
                        astakos_url=ASTAKOS_URL)
1019 1020
        @wraps(func)
1020 1021
        def wrapper(request, *args, **kwargs):
1021 1022
            # The args variable may contain up to (account, container, object).

Also available in: Unified diff