Revision ea2c0e6f

b/snf-astakos-app/astakos/im/management/commands/_common.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from datetime import datetime
35 34
import uuid
36 35

  
37 36
from django.core.validators import validate_email
38
from django.utils.timesince import timesince, timeuntil
39 37
from django.contrib.auth.models import Permission
40 38
from django.contrib.contenttypes.models import ContentType
41
from django.core.exceptions import FieldError
42 39
from django.core.management import CommandError
43 40

  
44 41
from synnefo.util import units
45
from synnefo.lib.ordereddict import OrderedDict
46 42
from astakos.im.models import AstakosUser
47 43
from astakos.im.register import get_resources
48 44
import sys
......
68 64
            return AstakosUser.objects.get(id=int(email_or_id))
69 65
        else:
70 66
            return AstakosUser.objects.get(email__iexact=email_or_id, **kwargs)
71
    except AstakosUser.DoesNotExist, AstakosUser.MultipleObjectsReturned:
67
    except (AstakosUser.DoesNotExist, AstakosUser.MultipleObjectsReturned):
72 68
        return None
73 69

  
74 70

  
b/snf-astakos-app/astakos/im/management/commands/authpolicy-add.py
109 109
                policy = policy.replace('unset_', '')
110 110
                setattr(profile, policy, None)
111 111

  
112

  
113 112
        profile.save()
114 113
        if update:
115 114
            print "Profile updated"
b/snf-astakos-app/astakos/im/management/commands/component-modify.py
87 87
        if not any([url, auth_token, renew_token, purge_services]):
88 88
            raise CommandError("No option specified.")
89 89

  
90

  
91 90
        if url:
92 91
            component.url = url
93 92

  
b/snf-astakos-app/astakos/im/management/commands/resource-import.py
34 34
from optparse import make_option
35 35

  
36 36
from django.core.management.base import BaseCommand, CommandError
37
from django.db.utils import IntegrityError
38 37
from django.utils import simplejson as json
39 38

  
40 39
from snf_django.lib.db.transaction import commit_on_success_strict
41 40
from astakos.im.register import add_resource, ResourceException
42
from astakos.im.models import Service
43 41
from ._common import read_from_file
44 42

  
45 43

  
b/snf-astakos-app/astakos/im/management/commands/service-import.py
34 34
from optparse import make_option
35 35

  
36 36
from django.core.management.base import BaseCommand, CommandError
37
from django.db.utils import IntegrityError
38 37
from django.utils import simplejson as json
39 38

  
40 39
from snf_django.lib.db.transaction import commit_on_success_strict

Also available in: Unified diff