Revision 51db2da2 snf-astakos-app/astakos/im/models.py
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
31 | 31 |
# interpreted as representing official policies, either expressed |
32 | 32 |
# or implied, of GRNET S.A. |
33 | 33 |
|
34 |
import hashlib |
|
35 | 34 |
import uuid |
36 | 35 |
import logging |
37 | 36 |
import json |
38 |
import math |
|
39 | 37 |
import copy |
40 | 38 |
|
41 | 39 |
from datetime import datetime, timedelta |
... | ... | |
44 | 42 |
from random import randint |
45 | 43 |
import os |
46 | 44 |
|
47 |
from django.db import models, IntegrityError, transaction
|
|
45 |
from django.db import models, transaction |
|
48 | 46 |
from django.contrib.auth.models import User, UserManager, Group, Permission |
49 | 47 |
from django.utils.translation import ugettext as _ |
50 | 48 |
from django.db.models.signals import pre_save, post_save |
51 | 49 |
from django.contrib.contenttypes.models import ContentType |
52 | 50 |
|
53 |
from django.db.models import Q, Max
|
|
51 |
from django.db.models import Q |
|
54 | 52 |
from django.core.urlresolvers import reverse |
55 | 53 |
from django.utils.http import int_to_base36 |
56 | 54 |
from django.contrib.auth.tokens import default_token_generator |
... | ... | |
532 | 530 |
uuid_val = str(uuid.uuid4()) |
533 | 531 |
try: |
534 | 532 |
AstakosUser.objects.get(uuid=uuid_val) |
535 |
except AstakosUser.DoesNotExist, e:
|
|
533 |
except AstakosUser.DoesNotExist: |
|
536 | 534 |
self.uuid = uuid_val |
537 | 535 |
return self.uuid |
538 | 536 |
|
... | ... | |
609 | 607 |
@property |
610 | 608 |
def status_display(self): |
611 | 609 |
msg = "" |
612 |
append = None |
|
613 | 610 |
if self.is_active: |
614 | 611 |
msg = "Accepted/Active" |
615 | 612 |
if self.is_rejected: |
... | ... | |
981 | 978 |
self.info = json.loads(self.info_data) |
982 | 979 |
if not self.info: |
983 | 980 |
self.info = {} |
984 |
except Exception, e:
|
|
981 |
except Exception: |
|
985 | 982 |
self.info = {} |
986 | 983 |
|
987 | 984 |
for key, value in self.info.iteritems(): |
... | ... | |
1230 | 1227 |
username = uuid.uuid4().hex[:30] |
1231 | 1228 |
try: |
1232 | 1229 |
AstakosUser.objects.get(username=username) |
1233 |
except AstakosUser.DoesNotExist, e:
|
|
1230 |
except AstakosUser.DoesNotExist: |
|
1234 | 1231 |
self.username = username |
1235 | 1232 |
super(PendingThirdPartyUser, self).save(**kwargs) |
1236 | 1233 |
|
Also available in: Unified diff