Fixed encoding issue with address hashing

oscar/apps/address/abstract_models.py

@@ -86,7 +86,7 @@ class AbstractAddress(models.Model):
         
     def salutation(self):
         u"""Returns the salutation"""
-        return " ".join([part for part in [self.title, self.first_name, self.last_name] if part])
+        return u" ".join([part for part in [self.title, self.first_name, self.last_name] if part])
         
     def __unicode__(self):
         return self.summary

oscar/apps/address/tests.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from django.contrib.auth.models import User
 from django.test import TestCase
 
@@ -60,4 +62,9 @@ class UserAddressTest(TestCase):
         a2 = UserAddress(first_name=" Terry", last_name='   Barrington', line1="  75 Smith Road  ", postcode="N4 8ty", 
                          country=self.country, user=self.user)
         self.assertEquals(a1.generate_hash(), a2.generate_hash())
+        
+    def test_hashing_with_utf8(self):
+        a = UserAddress(first_name=u"\u0141ukasz Smith", last_name=u'Smith', line1=u"75 Smith Road", postcode=u"n4 8ty", 
+                        country=self.country, user=self.user)
+        hash = a.active_address_fields()
            

oscar/apps/basket/factory.py

@@ -27,9 +27,9 @@ class BasketFactory(object):
         return self._get_or_create_cookie_basket(request, response, 
                                                  COOKIE_KEY_SAVED_BASKET, Basket.saved)
     
-    def get_open_basket(self, request, response):
+    def get_open_basket(self, request):
         u"""Returns the basket for the current user"""
-        return self._get_basket(request, response, COOKIE_KEY_OPEN_BASKET, Basket.open)
+        return self._get_basket(request, None, COOKIE_KEY_OPEN_BASKET, Basket.open)
     
     def get_saved_basket(self, request, response):
         u"""Returns the saved basket for the current user"""
@@ -92,7 +92,9 @@ class BasketFactory(object):
                     b = manager.get(pk=basket_id, owner=None)
                 except Basket.DoesNotExist:
                     b = None
-            else:
+            elif response:
+                # Not all methods are able to pass the response so this doesn't
+                # always happen.
                 response.delete_cookie(cookie_key)
         return b      
     

oscar/apps/customer/templatetags/history_tags.py

@@ -17,5 +17,5 @@ def recently_viewed_products(context):
     
     # Reordering as the id order gets messed up in the query
     product_ids.reverse()
-    products = [product_dict[id] for id in product_ids]
+    products = [product_dict[id] for id in product_ids if id in product_dict]
     return {'products': products}