utils: PEP8ness (#31114)

passerelle/utils/__init__.py

@@ -18,7 +18,6 @@ from functools import wraps
 import hashlib
 import json
 import re
-import logging
 from itertools import islice, chain
 import warnings
 
@@ -28,9 +27,8 @@ from urllib3.exceptions import InsecureRequestWarning
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
-from django.core.serializers.json import DjangoJSONEncoder
-from django.http import HttpRequest, HttpResponse, HttpResponseBadRequest
+from django.core.exceptions import PermissionDenied
+from django.http import HttpResponse, HttpResponseBadRequest
 from django.template import Template, Context
 from django.utils.decorators import available_attrs
 from django.views.generic.detail import SingleObjectMixin
@@ -44,8 +42,10 @@ from passerelle.base.context_processors import template_vars
 from passerelle.base.models import ApiUser, AccessRight, BaseResource
 from passerelle.base.signature import check_query, check_url
 
+# legacy import, other modules keep importing to_json from passerelle.utils
 from .jsonresponse import to_json
 
+
 def get_template_vars():
     """
     returns the template vars as dict, to be used in apps code
@@ -53,6 +53,7 @@ def get_template_vars():
     from django.http import HttpRequest
     return template_vars(HttpRequest())
 
+
 def render_template_vars(value):
     """
     renders the template vars in a string
@@ -90,15 +91,13 @@ def get_request_users(request):
                 users.append(signature_user)
 
     elif 'apikey' in request.GET:
-        users.extend(ApiUser.objects.filter(keytype='API',
-            key=request.GET['apikey']))
+        users.extend(ApiUser.objects.filter(keytype='API', key=request.GET['apikey']))
 
-    elif request.META.has_key('HTTP_AUTHORIZATION'):
-        (scheme, param) = request.META['HTTP_AUTHORIZATION'].split(' ',1)
+    elif 'HTTP_AUTHORIZATION' in request.META:
+        (scheme, param) = request.META['HTTP_AUTHORIZATION'].split(' ', 1)
         if scheme.lower() == 'basic':
-            username, password = param.strip().decode('base64').split(':',1)
-            users.extend(ApiUser.objects.filter(keytype='SIGN',
-                    username=username, key=password))
+            username, password = param.strip().decode('base64').split(':', 1)
+            users.extend(ApiUser.objects.filter(keytype='SIGN', username=username, key=password))
 
     def ip_match(ip, match):
         if not ip:
@@ -110,6 +109,7 @@ def get_request_users(request):
     users = [x for x in users if ip_match(x.ipsource, request.META.get('REMOTE_ADDR'))]
     return users
 
+
 def get_trusted_services():
     '''
     All services in settings.KNOWN_SERVICES are "trusted"
@@ -144,8 +144,7 @@ def is_authorized(request, obj, perm):
     if is_trusted(request):
         return True
     resource_type = ContentType.objects.get_for_model(obj)
-    rights = AccessRight.objects.filter(resource_type=resource_type,
-            resource_pk=obj.id, codename=perm)
+    rights = AccessRight.objects.filter(resource_type=resource_type, resource_pk=obj.id, codename=perm)
     users = [x.apiuser for x in rights]
     return set(users).intersection(get_request_users(request))
 
@@ -192,7 +191,6 @@ class Request(RequestSession):
     def request(self, method, url, **kwargs):
         cache_duration = kwargs.pop('cache_duration', None)
         invalidate_cache = kwargs.pop('invalidate_cache', False)
-        params = kwargs.get('params', '')
 
         if self.resource:
             if 'auth' not in kwargs: