Projet

Général

Profil

0001-misc-avoid-circular-imports-21978.patch

Lauréline Guérin, 11 octobre 2019 14:37

Télécharger (2,03 ko)

Voir les différences:

Subject: [PATCH 1/3] misc: avoid circular imports (#21978)

 passerelle/utils/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
passerelle/utils/__init__.py
35 35
from django.contrib.contenttypes.models import ContentType
36 36
from django.db import transaction
37 37

  
38
from passerelle.base.models import ApiUser, AccessRight, BaseResource
39 38
from passerelle.base.signature import check_query, check_url
40 39

  
41 40

  
......
55 54

  
56 55

  
57 56
def get_request_users(request):
57
    from passerelle.base.models import ApiUser
58

  
58 59
    users = []
59 60

  
60 61
    users.extend(ApiUser.objects.filter(keytype=''))
......
118 119

  
119 120

  
120 121
def is_authorized(request, obj, perm):
122
    from passerelle.base.models import AccessRight
123

  
121 124
    if is_trusted(request):
122 125
        return True
123 126
    resource_type = ContentType.objects.get_for_model(obj)
......
271 274

  
272 275
def export_site():
273 276
    '''Dump passerelle configuration (users, resources and ACLs) to JSON dumpable dictionnary'''
277
    from passerelle.base.models import ApiUser
278
    from passerelle.base.models import BaseResource
279

  
274 280
    d = {}
275 281
    d['apiusers'] = [apiuser.export_json() for apiuser in ApiUser.objects.all()]
276 282
    d['resources'] = resources = []
......
289 295
    '''Load passerelle configuration (users, resources and ACLs) from a dictionnary loaded from
290 296
       JSON
291 297
    '''
298
    from passerelle.base.models import ApiUser
299
    from passerelle.base.models import BaseResource
300

  
292 301
    d = d.copy()
293 302

  
294 303
    def is_empty():
295
-