Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / models / user.py

diff --git a/forum/models/user.py b/forum/models/user.py
index f8c91d65f10a11fddbfc61f917d1c60ddb2b1650..d3b2c6f0042cf70206929b25cd2597cad20a787a 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -4,10 +4,6 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User as DjangoUser, AnonymousUser as DjangoAnonymousUser
 from django.db.models import Q
-try:
-    from hashlib import md5
-except:
-    from md5 import new as md5
 
 import string
 from random import Random