added app_labels and hexdigest for cache_key to avoid unicode decode …

…error when slug contains special characters

lfs/caching/utils.py

@@ -1,4 +1,6 @@
 # django imports
+import hashlib
+
 from django.db import models
 from django.db.models.query import QuerySet
 from django.conf import settings
@@ -45,6 +47,7 @@ def lfs_get_object(klass, *args, **kwargs):
     object is found.
     """
     cache_key = "%s-%s-%s" % (settings.CACHE_MIDDLEWARE_KEY_PREFIX, klass.__name__.lower(), kwargs.values()[0])
+    cache_key = hashlib.md5(cache_key).hexdigest()
     object = cache.get(cache_key)
     if object is not None:
         return object
@@ -72,6 +75,7 @@ def lfs_get_object_or_404(klass, *args, **kwargs):
     object is found.
     """
     cache_key = "%s-%s-%s" % (settings.CACHE_MIDDLEWARE_KEY_PREFIX, klass.__name__.lower(), kwargs.values()[0])
+    cache_key = hashlib.md5(cache_key).hexdigest()
     object = cache.get(cache_key)
     if object is not None:
         return object

lfs/cart/models.py

@@ -208,6 +208,9 @@ def _update_product_amounts(self):
             cache_key = "%s-cart-items-%s" % (settings.CACHE_MIDDLEWARE_KEY_PREFIX, self.id)
             cache.delete(cache_key)
 
+    class Meta:
+        app_label = 'cart'
+
 
 class CartItem(models.Model):
     """
@@ -239,6 +242,7 @@ class CartItem(models.Model):
 
     class Meta:
         ordering = ['id']
+        app_label = 'cart'
 
     def __unicode__(self):
         return u"Product: %(product)s, Quantity: %(amount)f, Cart: %(cart)s" % {'product': self.product,
@@ -397,3 +401,6 @@ class CartItemPropertyValue(models.Model):
     property = models.ForeignKey(Property, verbose_name=_(u"Property"))
     property_group = models.ForeignKey(PropertyGroup, verbose_name=_(u'Property group'), null=True, blank=True)
     value = models.CharField("Value", blank=True, max_length=100)
+
+    class Meta:
+        app_label = 'cart'

lfs/catalog/models.py

@@ -190,6 +190,7 @@ class Meta:
         ordering = ("position", )
         verbose_name = _('Category')
         verbose_name_plural = _('Categories')
+        app_label = 'catalog'
 
     def __unicode__(self):
         return u"%s (%s)" % (self.name, self.slug)
@@ -693,6 +694,7 @@ class Product(models.Model):
 
     class Meta:
         ordering = ("name", )
+        app_label = 'catalog'
 
     def __unicode__(self):
         return u"%s (%s)" % (self.name, self.slug)
@@ -2026,6 +2028,7 @@ class ProductAccessories(models.Model):
     class Meta:
         ordering = ("position", )
         verbose_name_plural = "Product accessories"
+        app_label = 'catalog'
 
     def __unicode__(self):
         return u"%s -> %s" % (self.product.name, self.accessory.name)
@@ -2059,6 +2062,7 @@ class PropertyGroup(models.Model):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.name
@@ -2182,6 +2186,7 @@ class Property(models.Model):
     class Meta:
         verbose_name_plural = _(u"Properties")
         ordering = ["position"]
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.name
@@ -2240,6 +2245,7 @@ class FilterStep(models.Model):
 
     class Meta:
         ordering = ["start"]
+        app_label = 'catalog'
 
     def __unicode__(self):
         return u"%s %s" % (self.property.name, self.start)
@@ -2270,6 +2276,7 @@ class GroupsPropertiesRelation(models.Model):
     class Meta:
         ordering = ("position", )
         unique_together = ("group", "property")
+        app_label = 'catalog'
 
 
 class ProductsPropertiesRelation(models.Model):
@@ -2298,6 +2305,7 @@ class ProductsPropertiesRelation(models.Model):
     class Meta:
         ordering = ("position", )
         unique_together = ("product", "property")
+        app_label = 'catalog'
 
 
 class PropertyOption(models.Model):
@@ -2333,6 +2341,7 @@ class PropertyOption(models.Model):
 
     class Meta:
         ordering = ["position"]
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.name
@@ -2378,6 +2387,7 @@ class ProductPropertyValue(models.Model):
 
     class Meta:
         unique_together = ("product", "property", "property_group", "value", "type")
+        app_label = 'catalog'
 
     def __unicode__(self):
         property_group_name = self.property_group.name if self.property_group_id else ''
@@ -2433,6 +2443,7 @@ class Image(models.Model):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.title
@@ -2476,6 +2487,7 @@ class File(models.Model):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.title
@@ -2513,6 +2525,7 @@ class StaticBlock(models.Model):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.name
@@ -2544,6 +2557,7 @@ class DeliveryTime(models.Model):
 
     class Meta:
         ordering = ("min", )
+        app_label = 'catalog'
 
     def __unicode__(self):
         return self.round().as_string()
@@ -2756,6 +2770,7 @@ class ProductAttachment(models.Model):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'catalog'
 
     def get_url(self):
         if self.file.url:

lfs/core/models.py

@@ -24,6 +24,7 @@ def __unicode__(self):
     class Meta:
         verbose_name_plural = 'Countries'
         ordering = ("name", )
+        app_label = 'core'
 
 
 class ActionGroup(models.Model):
@@ -39,6 +40,7 @@ class ActionGroup(models.Model):
 
     class Meta:
         ordering = ("name", )
+        app_label = 'core'
 
     def __unicode__(self):
         return self.name
@@ -84,6 +86,7 @@ def __unicode__(self):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'core'
 
 
 class Shop(models.Model):
@@ -194,6 +197,7 @@ class Shop(models.Model):
 
     class Meta:
         permissions = (("manage_shop", "Manage shop"),)
+        app_label = 'core'
 
     def __unicode__(self):
         return self.name
@@ -252,5 +256,8 @@ def get_meta_description(self):
 class Application(models.Model):
     version = models.CharField(_("Version"), blank=True, max_length=10)
 
+    class Meta:
+        app_label = 'core'
+
 
 from monkeys import *

lfs/criteria/models.py

@@ -109,6 +109,7 @@ class Criterion(models.Model):
 
     class Meta:
         ordering = ("position", )
+        app_label = 'criteria'
 
     EQUAL = 0
     LESS_THAN = 1
@@ -409,6 +410,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class CombinedLengthAndGirthCriterion(Criterion):
     """
@@ -460,6 +464,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class CountryCriterion(Criterion):
     """
@@ -500,6 +507,9 @@ def is_valid(self):
         else:
             return country not in self.value.all()
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class HeightCriterion(Criterion):
     """
@@ -538,6 +548,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class LengthCriterion(Criterion):
     """
@@ -576,6 +589,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class PaymentMethodCriterion(Criterion):
     """
@@ -636,6 +652,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class ShippingMethodCriterion(Criterion):
     """
@@ -701,6 +720,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class WeightCriterion(Criterion):
     """
@@ -739,6 +761,9 @@ def is_valid(self):
         else:
             return False
 
+    class Meta:
+        app_label = 'criteria'
+
 
 class WidthCriterion(Criterion):
     """
@@ -776,3 +801,6 @@ def is_valid(self):
             return True
 
         return False
+
+    class Meta:
+        app_label = 'criteria'

lfs/customer/models.py

@@ -133,6 +133,9 @@ def sync_selected_to_default_addresses(self, force=False):
         self.sync_selected_to_default_invoice_address(force)
         self.sync_selected_to_default_shipping_address(force)
 
+    class Meta:
+        app_label = 'customer'
+
 
 class BankAccount(models.Model):
     """
@@ -161,6 +164,9 @@ class BankAccount(models.Model):
     def __unicode__(self):
         return u"%s / %s" % (self.account_number, self.bank_name)
 
+    class Meta:
+        app_label = 'customer'
+
 
 class CreditCard(models.Model):
     """
@@ -193,3 +199,6 @@ class CreditCard(models.Model):
 
     def __unicode__(self):
         return u"%s / %s" % (self.type, self.owner)
+
+    class Meta:
+        app_label = 'customer'

lfs/export/models.py

@@ -22,6 +22,7 @@ class Export(models.Model):
 
     class Meta:
         ordering = ("position", "name")
+        app_label = 'export'
 
     def __unicode__(self):
         return u"%s.%s" % (self.module, self.method)
@@ -62,6 +63,7 @@ def __unicode__(self):
     class Meta:
         ordering = ("name", )
         unique_together = ("module", "method")
+        app_label = 'export'
 
 
 class CategoryOption(models.Model):
@@ -70,3 +72,6 @@ class CategoryOption(models.Model):
     category = models.ForeignKey(Category, verbose_name=_(u"Category"))
     export = models.ForeignKey(Export, verbose_name=_(u"Export"))
     variants_option = models.PositiveSmallIntegerField(_(u"Variant"), choices=CATEGORY_VARIANTS_CHOICES)
+
+    class Meta:
+        app_label = 'export'

lfs/manufacturer/models.py

@@ -33,6 +33,7 @@ class Manufacturer(models.Model):
 
     class Meta:
         ordering = ("name", )
+        app_label = 'manufacturer'
 
     def __unicode__(self):
         return self.name

lfs/marketing/models.py

@@ -15,6 +15,7 @@ class Topseller(models.Model):
 
     class Meta:
         ordering = ["position"]
+        app_label = 'marketing'
 
     def __unicode__(self):
         return u"%s (%s)" % (self.product.name, self.position)
@@ -26,6 +27,9 @@ class ProductSales(models.Model):
     product = models.ForeignKey(Product, verbose_name=_(u"Product"))
     sales = models.IntegerField(_(u"sales"), default=0)
 
+    class Meta:
+        app_label = 'marketing'
+
 
 class FeaturedProduct(models.Model):
     """Featured products are manually selected by the shop owner
@@ -36,6 +40,7 @@ class FeaturedProduct(models.Model):
 
     class Meta:
         ordering = ["position"]
+        app_label = 'marketing'
 
     def __unicode__(self):
         return u"%s (%s)" % (self.product.name, self.position)
@@ -49,3 +54,6 @@ class OrderRatingMail(models.Model):
 
     def __unicode__(self):
         return u"%s (%s)" % (self.order.id, self.send_date.strftime(ugettext('DATE_FORMAT')))
+
+    class Meta:
+        app_label = 'marketing'