ProductAttributesContainer: don't query for values if product is new

src/oscar/apps/catalogue/attributes.py

@@ -21,7 +21,7 @@ def __init__(self, product):
         self._initialised = False
 
     def __getattr__(self, name):
-        if not name.startswith('_') and not self.initialised:
+        if not name.startswith('_') and not self._initialised:
             self._load_values()
             return getattr(self, name)
         raise AttributeError(
@@ -75,7 +75,11 @@ def save(self):
 
         # We don't filter on the attributes here since we assume all objects
         # are still available in the orm cache.
-        value_objects = {v.attribute_id: v for v in self.get_values()}
+        if self._product_pk:
+            value_objects = {v.attribute_id: v for v in self.get_values()}
+        else:
+            value_objects = {}
+
         for attribute in dirty_attributes:
             new_value = getattr(self, attribute.code)
             value_obj = value_objects.get(attribute.pk)

tests/integration/catalogue/models_tests.py

@@ -24,7 +24,7 @@ def test_save_attributes(self):
         product.attr.text = 'foobar'
         product.attr.integer = 1
 
-        with self.assertNumQueries(5):
+        with self.assertNumQueries(4):
             product.save()
 
     def test_load_attributes(self):