Merge branch 'tidying' of github.com:AndrewIngram/django-oscar into t…

…idying

oscar/apps/product/abstract_models.py

@@ -60,20 +60,18 @@ def save(self, *args, **kwargs):
             else:
                 self.slug = slug
         super(AbstractCategory, self).save(*args, **kwargs)
-        
+
     def get_ancestors(self, include_self=True):
         ancestors = list(super(AbstractCategory, self).get_ancestors())
         if include_self:
             ancestors.append(self)
         return ancestors
-    
+
     @models.permalink
     def get_absolute_url(self):
-        u"""Return a product's absolute url"""
         return ('products:category', (), {
             'category_slug': self.slug })
-
-
+
     class Meta:
         abstract = True
         ordering = ['name']
@@ -84,11 +82,11 @@ class Meta:
 class AbstractItemCategory(models.Model):
     item = models.ForeignKey('product.Item')
     category = models.ForeignKey('product.Category')
-    canonical = models.BooleanField(default=False, db_index=True)
+    is_canonical = models.BooleanField(default=False, db_index=True)
 
     class Meta:
         abstract = True
-        ordering = ['-canonical']
+        ordering = ['-is_canonical']
 
 
 class AbstractItem(models.Model):

requirements-dev.txt

@@ -10,3 +10,4 @@ pysolr==2.0.13
 PyZen==0.3.1
 mock==0.7.0
 twill==0.9
+-e git+https://[email protected]/AndrewIngram/django-extra-views.git#egg=django-extra-views