Revision ea2c0e6f snf-astakos-app/astakos/im/management/commands/_common.py

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

  

Also available in: Unified diff