Merge pull request #26 from udacity/remove_dj_version

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

diff --git a/forum/models/base.py b/forum/models/base.py
index a5f74eb39821c17213094a40ff668e90240941fd..9c328c597a27712632d7067eaff029381512338c 100644 (file)
--- a/forum/models/base.py
+++ b/forum/models/base.py
@@ -181,14 +181,16 @@ class CachedQuerySet(models.query.QuerySet):
         try:
             return md5(unicode(self.query).encode("utf-8")).hexdigest()
         except:
-            return md5(self.query).hexdigest()        
-
+            try:
+                return md5(self.query).hexdigest()
+            except:
+                return md5(str(self.query)).hexdigest()
 
 
 class CachedManager(models.Manager):
     use_for_related_fields = True
 
-    def get_query_set(self):
+    def get_queryset(self):
         return CachedQuerySet(self.model)
 
     def get_or_create(self, *args, **kwargs):
@@ -224,7 +226,7 @@ class DenormalizedField(object):
         cls.add_to_class("reset_%s_cache" % name, reset_cache)
 
 
-class BaseMetaClass(models.Model.__metaclass__):
+class BaseMetaClass(type(models.Model)):
     to_denormalize = []
 
     def __new__(cls, *args, **kwargs):