Merge pull request #2 from udacity/update_django

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index c84a922d192a3ae330a815b60a4c7b7cc13f530a..eca23e468ae8d186605b5989831191284a8fed77 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,15 +1,18 @@
 import datetime
 from base import *
 
+from django.conf import settings as django_settings
+from django.core.cache.backends.base import BaseCache
 from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_unicode, force_unicode
 
 from forum import modules
 
 class ActiveTagManager(CachedManager):
     use_for_related_fields = True
 
-    def get_query_set(self):
-        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
+    def get_queryset(self):
+        return super(ActiveTagManager, self).get_queryset().exclude(used_count__lt=1)
 
 class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
@@ -26,7 +29,7 @@ class Tag(BaseModel):
         app_label = 'forum'
 
     def __unicode__(self):
-        return u'%s' % self.name
+        return force_unicode(self.name)
 
     def add_to_usage_count(self, value):
         if self.used_count + value < 0:
@@ -35,14 +38,23 @@ class Tag(BaseModel):
             self.used_count = models.F('used_count') + value
 
     def cache_key(self):
-        return self._generate_cache_key(self.name)
+        return self._generate_cache_key(Tag.safe_cache_name(self.name))
+
+    @classmethod
+    def safe_cache_name(cls, name):
+        return "".join([str(ord(c)) for c in name])
 
     @classmethod
     def infer_cache_key(cls, querydict):
         if 'name' in querydict:
-            return cls._generate_cache_key(querydict['name'])
+            cache_key = cls._generate_cache_key(cls.safe_cache_name(querydict['name']))
+
+            if len(cache_key) > django_settings.CACHE_MAX_KEY_LENGTH:
+                cache_key = cache_key[:django_settings.CACHE_MAX_KEY_LENGTH]
+
+            return cache_key
 
-        return BaseModel.infer_cache_key(querydict)
+        return None
 
     @classmethod
     def value_to_list_on_cache_query(cls):