Revision aab4d540 snf-astakos-app/astakos/im/models.py

b/snf-astakos-app/astakos/im/models.py
34 34
import hashlib
35 35
import uuid
36 36
import logging
37
import json
38 37

  
39 38
from time import asctime
40 39
from datetime import datetime, timedelta
41 40
from base64 import b64encode
42
from urlparse import urlparse, urlunparse
41
from urlparse import urlparse
43 42
from random import randint
44 43
from collections import defaultdict
45
from south.signals import post_migrate
46 44

  
47
from django.db import models, IntegrityError
45
from django.db import models
48 46
from django.contrib.auth.models import User, UserManager, Group
49 47
from django.utils.translation import ugettext as _
50 48
from django.core.exceptions import ValidationError
51
from django.template.loader import render_to_string
52
from django.core.mail import send_mail
53 49
from django.db import transaction
54 50
from django.db.models.signals import post_save, post_syncdb
55
from django.db.models import Q, Count
51
from django.db.models import Q
56 52

  
57 53
from astakos.im.settings import DEFAULT_USER_LEVEL, INVITATIONS_PER_LEVEL, \
58
    AUTH_TOKEN_DURATION, BILLING_FIELDS, QUEUE_CONNECTION, SITENAME, \
54
    AUTH_TOKEN_DURATION, BILLING_FIELDS, QUEUE_CONNECTION, \
59 55
    EMAILCHANGE_ACTIVATION_DAYS, LOGGING_LEVEL
60 56

  
61 57
QUEUE_CLIENT_ID = 3 # Astakos.
......
294 290
                username =  uuid.uuid4().hex[:30]
295 291
                try:
296 292
                    AstakosUser.objects.get(username = username)
297
                except AstakosUser.DoesNotExist, e:
293
                except AstakosUser.DoesNotExist:
298 294
                    self.username = username
299 295
            if not self.provider:
300 296
                self.provider = 'local'
......
317 313
        self.auth_token_expires = self.auth_token_created + \
318 314
                                  timedelta(hours=AUTH_TOKEN_DURATION)
319 315
        msg = 'Token renewed for %s' % self.email
320
        logger._log(LOGGING_LEVEL, msg, [])
316
        logger.log(LOGGING_LEVEL, msg)
321 317

  
322 318
    def __unicode__(self):
323 319
        return '%s (%s)' % (self.realname, self.email)

Also available in: Unified diff