Minor tweaks to i18n changes

oscar/apps/address/abstract_models.py

@@ -45,7 +45,6 @@ class AbstractAddress(models.Model):
         verbose_name = _('Address')
         verbose_name_plural = _('Addresses')
 
-
     def save(self, *args, **kwargs):
         self._clean_fields()
         self._update_search_text()
@@ -144,7 +143,7 @@ class AbstractCountry(models.Model):
         
 
 class AbstractShippingAddress(AbstractAddress):
-    u"""
+    """
     Shipping address.
     
     A shipping address should not be edited once the order has been placed - 
@@ -158,8 +157,8 @@ class AbstractShippingAddress(AbstractAddress):
     
     class Meta:
         abstract = True
-        verbose_name = _("shipping address")
-        verbose_name_plural = _("shipping addresses")
+        verbose_name = _("Shipping address")
+        verbose_name_plural = _("Shipping addresses")
 
     @property    
     def order(self):

oscar/apps/analytics/abstract_models.py

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _
 
 
 class AbstractProductRecord(models.Model):
-    u"""
+    """
     A record of a how popular a product is.
     
     This used be auto-merchandising to display the most popular
@@ -25,8 +25,8 @@ class AbstractProductRecord(models.Model):
     class Meta:
         abstract = True
         ordering = ['-num_purchases']
-        verbose_name = _('Product Record')
-        verbose_name_plural = _('Product Records')
+        verbose_name = _('Product record')
+        verbose_name_plural = _('Product records')
 
 
     def __unicode__(self):
@@ -34,7 +34,7 @@ class AbstractProductRecord(models.Model):
         
 
 class AbstractUserRecord(models.Model):
-    u"""
+    """
     A record of a user's activity.
     """
     
@@ -86,4 +86,6 @@ class AbstractUserSearch(models.Model):
         
     def __unicode__(self):
         return _("%(user)s searched for '%(query)s'") % {
-            'user':self.user, 'query':self.query}
+            'user': self.user,
+            'query': self.query
+        }

oscar/apps/analytics/admin.py

@@ -1,15 +1,19 @@
 from django.contrib import admin
 from django.db.models import get_model
 
+
 class ProductRecordAdmin(admin.ModelAdmin):
     list_display = ('product', 'num_views', 'num_basket_additions', 'num_purchases')
     
+
 class UserProductViewAdmin(admin.ModelAdmin):
     list_display = ('user', 'product', 'date_created')
 
+
 class UserRecordAdmin(admin.ModelAdmin):
     list_display = ('user', 'num_product_views', 'num_basket_additions', 'num_orders', 'total_spent', 'date_last_order')
 
+
 admin.site.register(get_model('analytics', 'productrecord'), ProductRecordAdmin)
 admin.site.register(get_model('analytics', 'userrecord'), UserRecordAdmin)
 admin.site.register(get_model('analytics', 'usersearch'))

oscar/apps/analytics/reports.py

@@ -1,7 +1,6 @@
 import csv
 
 from django.db.models import get_model
-from django.template.defaultfilters import date
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_class
@@ -42,8 +41,8 @@ class ProductReportGenerator(ReportGenerator):
     description = _('Product analytics')
 
     formatters = {
-      'CSV_formatter': ProductReportCSVFormatter,
-      'HTML_formatter': ProductReportHTMLFormatter
+        'CSV_formatter': ProductReportCSVFormatter,
+        'HTML_formatter': ProductReportHTMLFormatter
     }
 
     def generate(self):
@@ -89,7 +88,6 @@ class UserReportHTMLFormatter(ReportHTMLFormatter):
 
 
 class UserReportGenerator(ReportGenerator):
-
     code = 'user_analytics'
     description = _('User analytics')
 

oscar/apps/analytics/scores.py

@@ -32,7 +32,7 @@ class Calculator(object):
         sql = '''UPDATE `%(table)s` 
                  SET score = %(weighted_total)s / %(total_weight)s''' % ctx
 
-        self.logger.debug(sql)         
+        self.logger.debug(sql)
         self.cursor.execute(sql)
         transaction.commit_unless_managed()
         

oscar/apps/basket/abstract_models.py

@@ -386,9 +386,8 @@ class AbstractLine(models.Model):
     class Meta:
         abstract = True
         unique_together = ("basket", "line_reference")
-        verbose_name = _('Pozycja koszyka')
-        verbose_name_plural = _('Pozycje koszyka')
-
+        verbose_name = _('Basket line')
+        verbose_name_plural = _('Basket lines')
 
     def __unicode__(self):
         return _(u"%(basket)s, Product '%(product)s', quantity %(quantity)d") % {
@@ -552,24 +551,26 @@ class AbstractLine(models.Model):
             msg = u"The price of '%(product)s' has increased from %(old_price)s " \
                   u"to %(new_price)s since you added it to your basket"
             return _(msg) % {'product': self.product.get_title(),
-                            'old_price': currency(self.price_incl_tax),
-                            'new_price': currency(current_price_incl_tax)}
+                             'old_price': currency(self.price_incl_tax),
+                             'new_price': currency(current_price_incl_tax)}
         if current_price_incl_tax < self.price_incl_tax:
             msg = u"The price of '%(product)s' has decreased from %(old_price)s " \
                   u"to %(new_price)s since you added it to your basket"
             return _(msg) % {'product': self.product.get_title(),
-                            'old_price': currency(self.price_incl_tax),
-                            'new_price': currency(current_price_incl_tax)}
+                             'old_price': currency(self.price_incl_tax),
+                             'new_price': currency(current_price_incl_tax)}
 
 
 class AbstractLineAttribute(models.Model):
-    """An attribute of a basket line"""
+    """
+    An attribute of a basket line
+    """
     line = models.ForeignKey('basket.Line', related_name='attributes')
     option = models.ForeignKey('catalogue.Option')
     value = models.CharField(_("Value"), max_length=255)
 
     class Meta:
         abstract = True
-        verbose_name = _('Atrybut pozycji')
-        verbose_name_plural = _('Atrybuty pozycji')
+        verbose_name = _('Line attribute')
+        verbose_name_plural = _('Line attributes')
 

oscar/apps/basket/app.py

@@ -15,13 +15,14 @@ class BasketApplication(Application):
     remove_voucher_view = VoucherRemoveView
 
     def get_urls(self):
-        urlpatterns = patterns('',                   
+        urlpatterns = patterns('',
             url(r'^$', self.summary_view.as_view(), name='summary'),
-            url(r'^add/$', self.add_view.as_view(), name='add'),    
+            url(r'^add/$', self.add_view.as_view(), name='add'),
             url(r'^vouchers/add/$', self.add_voucher_view.as_view(), name='vouchers-add'),
-            url(r'^vouchers/(?P<pk>\d+)/remove/$', self.remove_voucher_view.as_view(), name='vouchers-remove'),     
+            url(r'^vouchers/(?P<pk>\d+)/remove/$', self.remove_voucher_view.as_view(), name='vouchers-remove'),
             url(r'^saved/$', login_required(self.saved_view.as_view()), name='saved'),
         )
         return self.post_process_urls(urlpatterns)
 
+
 application = BasketApplication()

oscar/apps/basket/forms.py

@@ -195,4 +195,3 @@ class AddToBasketForm(forms.Form):
 
 class SimpleAddToBasketForm(AddToBasketForm):
     quantity = forms.IntegerField(initial=1, min_value=1, widget=forms.HiddenInput, label=_('Quantity'))
-

oscar/apps/basket/managers.py

@@ -4,23 +4,23 @@ from django.db import models
 class OpenBasketManager(models.Manager):
     u"""For searching/creating OPEN baskets only."""
     status_filter = "Open"
-    
+
     def get_query_set(self):
         return super(OpenBasketManager, self).get_query_set().filter(status=self.status_filter)
-    
+
     def get_or_create(self, **kwargs):
         return self.get_query_set().get_or_create(status=self.status_filter, **kwargs)
 
-    
+
 class SavedBasketManager(models.Manager):
     u"""For searching/creating SAVED baskets only."""
     status_filter = "Saved"
-    
+
     def get_query_set(self):
         return super(SavedBasketManager, self).get_query_set().filter(status=self.status_filter)
-    
+
     def create(self, **kwargs):
         return self.get_query_set().create(status=self.status_filter, **kwargs)
-    
+
     def get_or_create(self, **kwargs):
         return self.get_query_set().get_or_create(status=self.status_filter, **kwargs)

oscar/apps/basket/middleware.py

@@ -11,18 +11,18 @@ Basket = get_model('basket', 'basket')
 
 
 class BasketMiddleware(object):
-    
+
     def process_request(self, request):
         self.cookies_to_delete = []
         basket = self.get_basket(request)
-        self.apply_offers_to_basket(request, basket)   
+        self.apply_offers_to_basket(request, basket)
         request.basket = basket
-    
-    def get_basket(self, request):  
+
+    def get_basket(self, request):
         manager = Basket.open
-        cookie_basket = self.get_cookie_basket(settings.OSCAR_BASKET_COOKIE_OPEN, 
+        cookie_basket = self.get_cookie_basket(settings.OSCAR_BASKET_COOKIE_OPEN,
                                                request, manager)
-        
+
         if request.user.is_authenticated():
             # Signed-in user: if they have a cookie basket too, it means
             # that they have just signed in and we need to merge their cookie
@@ -36,7 +36,7 @@ class BasketMiddleware(object):
                 basket = old_baskets[0]
                 for other_basket in old_baskets[1:]:
                     self.merge_baskets(basket, other_basket)
-                
+
             if cookie_basket:
                 self.merge_baskets(basket, cookie_basket)
                 self.cookies_to_delete.append(settings.OSCAR_BASKET_COOKIE_OPEN)
@@ -47,45 +47,45 @@ class BasketMiddleware(object):
             # Anonymous user with no basket - we don't save the basket until
             # we need to.
             basket = Basket()
-        return basket 
-            
+        return basket
+
     def merge_baskets(self, master, slave):
         """
         Merge one basket into another.
-        
+
         This is its own method to allow it to be overridden
         """
         master.merge(slave, add_quantities=False)
-        
+
     def process_response(self, request, response):
         # Delete any surplus cookies
         if hasattr(self, 'cookies_to_delete'):
             for cookie_key in self.cookies_to_delete:
                 response.delete_cookie(cookie_key)
-            
+
         # If a basket has had products added to it, but the user is anonymous
         # then we need to assign it to a cookie
         if hasattr(request, 'basket') and request.basket.id > 0 \
             and not request.user.is_authenticated() \
             and settings.OSCAR_BASKET_COOKIE_OPEN not in request.COOKIES:
             cookie = "%s_%s" % (request.basket.id, self.get_basket_hash(request.basket.id))
-            response.set_cookie(settings.OSCAR_BASKET_COOKIE_OPEN, 
-                                cookie, 
-                                max_age=settings.OSCAR_BASKET_COOKIE_LIFETIME, 
+            response.set_cookie(settings.OSCAR_BASKET_COOKIE_OPEN,
+                                cookie,
+                                max_age=settings.OSCAR_BASKET_COOKIE_LIFETIME,
                                 httponly=True)
         return response
-    
+
     def process_template_response(self, request, response):
         if hasattr(response, 'context_data'):
             if response.context_data is None:
                 response.context_data = {}
             response.context_data['basket'] = request.basket
         return response
-    
+
     def get_cookie_basket(self, cookie_key, request, manager):
         """
         Looks for a basket which is referenced by a cookie.
-        
+
         If a cookie key is found with no matching basket, then we add
         it to the list to be deleted.
         """
@@ -103,11 +103,11 @@ class BasketMiddleware(object):
                     self.cookies_to_delete.append(cookie_key)
             else:
                 self.cookies_to_delete.append(cookie_key)
-        return basket    
-    
+        return basket
+
     def apply_offers_to_basket(self, request, basket):
         if not basket.is_empty:
             Applicator().apply(request, basket)
-    
+
     def get_basket_hash(self, basket_id):
         return str(zlib.crc32(str(basket_id)+settings.SECRET_KEY))

oscar/apps/basket/views.py

@@ -45,15 +45,15 @@ class BasketView(ModelFormSetView):
 
     def get_upsell_messages(self, basket):
         offers = Applicator().get_offers(self.request, basket)
-        messages = []
+        msgs = []
         for offer in offers:
             if offer.is_condition_partially_satisfied(basket):
                 data = {
                     'message': offer.get_upsell_message(basket),
                     'offer': offer
                 }
-                messages.append(data)
-        return messages
+                msgs.append(data)
+        return msgs
 
     def get_context_data(self, **kwargs):
         context = super(BasketView, self).get_context_data(**kwargs)
@@ -192,7 +192,6 @@ class VoucherAddView(FormView):
                              voucher=voucher)
 
         # Recalculate discounts to see if the voucher gives any
-        discounts_before = self.request.basket.get_discounts()
         self.request.basket.remove_discounts()
         Applicator().apply(self.request, self.request.basket)
         discounts_after = self.request.basket.get_discounts()

oscar/apps/catalogue/abstract_models.py

@@ -162,7 +162,7 @@ class AbstractProductCategory(models.Model):
     product = models.ForeignKey('catalogue.Product')
     category = models.ForeignKey('catalogue.Category')
     is_canonical = models.BooleanField(_('is cannonical'), default=False, db_index=True)
-    
+
     class Meta:
         abstract = True
         ordering = ['-is_canonical']
@@ -171,7 +171,7 @@ class AbstractProductCategory(models.Model):
 
     def __unicode__(self):
         return u"<productcategory for product '%s'>" % self.product
-        
+
 
 class AbstractContributorRole(models.Model):
     """
@@ -180,10 +180,10 @@ class AbstractContributorRole(models.Model):
     name = models.CharField(_('name'), max_length=50)
     name_plural = models.CharField(_('name plural'), max_length=50)
     slug = models.SlugField()
-    
+
     def __unicode__(self):
         return self.name
-    
+
     class Meta:
         abstract = True
         verbose_name = _('Contributor Role')
@@ -192,7 +192,7 @@ class AbstractContributorRole(models.Model):
     def save(self, *args, **kwargs):
         if not self.slug:
             self.slug = slugify(self.name)
-        super(AbstractContributorRole, self).save(*args, **kwargs) 
+        super(AbstractContributorRole, self).save(*args, **kwargs)
 
 
 class AbstractContributor(models.Model):
@@ -204,7 +204,7 @@ class AbstractContributor(models.Model):
 
     def __unicode__(self):
         return self.name
-    
+
     class Meta:
         abstract = True
         verbose_name = _('Contributor')
@@ -221,14 +221,14 @@ class AbstractProductContributor(models.Model):
     product = models.ForeignKey('catalogue.Product')
     contributor = models.ForeignKey('catalogue.Contributor')
     role = models.ForeignKey('catalogue.ContributorRole', blank=True, null=True)
-    
+
     def __unicode__(self):
         return '%s <- %s - %s' % (self.product, self.role, self.contributor)
-    
+
     class Meta:
         abstract = True
-        verbose_name = _('Product Contributor')
-        verbose_name_plural = _('Product COntributors')
+        verbose_name = _('Product contributor')
+        verbose_name_plural = _('Product contributors')
 
 
 class AbstractProduct(models.Model):
@@ -238,21 +238,21 @@ class AbstractProduct(models.Model):
     # If an item has no parent, then it is the "canonical" or abstract version of a product
     # which essentially represents a set of products.  If a product has a parent
     # then it is a specific version of a catalogue.
-    # 
-    # For example, a canonical product would have a title like "Green fleece" while its 
+    #
+    # For example, a canonical product would have a title like "Green fleece" while its
     # children would be "Green fleece - size L".
-    
+
     # Universal product code
     upc = models.CharField(_("UPC"), max_length=64, blank=True, null=True, unique=True,
         help_text=_("""Universal Product Code (UPC) is an identifier for a product which is
                      not specific to a particular supplier.  Eg an ISBN for a book."""))
-    
+
     # No canonical product should have a stock record as they cannot be bought.
     parent = models.ForeignKey('self', null=True, blank=True, related_name='variants',
         help_text=_("""Only choose a parent product if this is a 'variant' of a canonical catalogue.  For example
-                     if this is a size 4 of a particular t-shirt.  Leave blank if this is a CANONICAL PRODUCT (ie 
+                     if this is a size 4 of a particular t-shirt.  Leave blank if this is a CANONICAL PRODUCT (ie
                      there is only one version of this product)."""))
-    
+
     # Title is mandatory for canonical products but optional for child products
     title = models.CharField(_('Title'), max_length=255, blank=True, null=True)
     slug = models.SlugField(_('Slug'), max_length=255, unique=False)
@@ -267,23 +267,23 @@ class AbstractProduct(models.Model):
     product_options = models.ManyToManyField('catalogue.Option', blank=True,
         help_text=_("""Options are values that can be associated with a item when it is added to
                      a customer's basket.  This could be something like a personalised message to be
-                     printed on a T-shirt.<br/>"""))
-    
+                     printed on a T-shirt."""))
+
     related_products = models.ManyToManyField('catalogue.Product', related_name='relations', blank=True,
         help_text=_("""Related items are things like different formats of the same book.  Grouping them together allows
-                     better linking betwen products on the site.<br/>"""))
-    
+                     better linking betwen products on the site."""))
+
     # Recommended products
     recommended_products = models.ManyToManyField('catalogue.Product', through='ProductRecommendation', blank=True)
-    
+
     # Product score
     score = models.FloatField(_('Score'), default=0.00, db_index=True)
-    
+
     date_created = models.DateTimeField(auto_now_add=True)
 
     # This field is used by Haystack to reindex search
     date_updated = models.DateTimeField(auto_now=True, db_index=True)
-    
+
     categories = models.ManyToManyField('catalogue.Category', through='ProductCategory')
 
     is_discountable = models.BooleanField(default=True)
@@ -304,15 +304,15 @@ class AbstractProduct(models.Model):
     def is_top_level(self):
         u"""Return True if this is a parent product"""
         return self.parent_id == None
-    
+
     @property
     def is_group(self):
         u"""Return True if this is a top level product and has more than 0 variants"""
         # use len() instead of count() in this specific instance
-        # as variants are highly likely to be used after this 
+        # as variants are highly likely to be used after this
         # which reduces the amount of SQL queries required
         return self.is_top_level and len(self.variants.all()) > 0
-    
+
     @property
     def is_variant(self):
         u"""Return True if a product is not a top level product"""
@@ -326,7 +326,7 @@ class AbstractProduct(models.Model):
     def min_variant_price_incl_tax(self):
         u"""Return minimum variant price including tax"""
         return self._min_variant_price('price_incl_tax')
-    
+
     @property
     def min_variant_price_excl_tax(self):
         u"""Return minimum variant price excluding tax"""
@@ -352,7 +352,7 @@ class AbstractProduct(models.Model):
     def add_category_from_breadcrumbs(self, breadcrumb):
         from oscar.apps.catalogue.utils import breadcrumbs_to_category
         category = breadcrumbs_to_category(breadcrumb)
-        
+
         temp = models.get_model('product', 'productcategory')(category=category, product=self)
         temp.save()
 
@@ -366,7 +366,7 @@ class AbstractProduct(models.Model):
         if not title and self.parent_id:
             title = self.parent.title
         return title
-    
+
     def get_product_class(self):
         """
         Return a product's item class
@@ -388,7 +388,7 @@ class AbstractProduct(models.Model):
         }
 
     # Helpers
-    
+
     def _min_variant_price(self, property):
         u"""Return minimum variant price"""
         prices = []
@@ -410,30 +410,30 @@ class AbstractProduct(models.Model):
         if self.is_variant:
             return u"%s (%s)" % (self.get_title(), self.attribute_summary())
         return self.get_title()
-    
+
     @models.permalink
     def get_absolute_url(self):
         u"""Return a product's absolute url"""
         return ('catalogue:detail', (), {
             'product_slug': self.slug,
             'pk': self.id})
-        
+
     def __init__(self, *args, **kwargs):
         super(AbstractProduct, self).__init__(*args, **kwargs)
         self.attr = ProductAttributesContainer(product=self)
-    
+
     def save(self, *args, **kwargs):
         if self.is_top_level and not self.title:
             raise ValidationError(_("Canonical products must have a title"))
         if not self.slug:
             self.slug = slugify(self.get_title())
-        
+
         # Validate attributes if necessary
         self.attr.validate_attributes()
-            
+
         # Save product
         super(AbstractProduct, self).save(*args, **kwargs)
-        
+
         # Finally, save attributes
         self.attr.save()
 
@@ -447,15 +447,15 @@ class ProductRecommendation(models.Model):
     ranking = models.PositiveSmallIntegerField(_('Ranking'), default=0)
 
     class Meta:
-        verbose_name = _('Product Recommendation')
-        verbose_name_plural = _('Product Recomendations')
+        verbose_name = _('Product recommendation')
+        verbose_name_plural = _('Product recomendations')
 
 
 class ProductAttributesContainer(object):
     """
     Stolen liberally from django-eav, but simplified to be product-specific
     """
-    
+
     def __init__(self, product):
         self.product = product
         self.initialised = False
@@ -472,9 +472,9 @@ class ProductAttributesContainer(object):
             if result:
                 return result
         raise AttributeError((_(u"%(obj)s has no attribute named " \
-                                       u"'%(attr)s'") % \
-                                     {'obj': self.product.product_class, 'attr': name}))
-        
+                                u"'%(attr)s'") % \
+                              {'obj': self.product.product_class, 'attr': name}))
+
     def validate_attributes(self):
         for attribute in self.get_all_attributes():
             value = getattr(self, attribute.code, None)
@@ -490,22 +490,22 @@ class ProductAttributesContainer(object):
                     raise ValidationError(_(u"%(attr)s attribute %(err)s") % \
                                             {'attr': attribute.code,
                                              'err': e})
-        
+
     def get_values(self):
         return self.product.attribute_values.all()
-    
+
     def get_value_by_attribute(self, attribute):
-        return self.get_values().get(attribute=attribute)    
-    
+        return self.get_values().get(attribute=attribute)
+
     def get_all_attributes(self):
         return self.product.get_product_class().attributes.all()
-    
+
     def get_attribute_by_code(self, code):
         return self.get_all_attributes().get(code=code)
-    
+
     def __iter__(self):
         return iter(self.get_values())
-    
+
     def save(self):
         for attribute in self.get_all_attributes():
             if hasattr(self, attribute.code):
@@ -514,7 +514,7 @@ class ProductAttributesContainer(object):
 
 
 class AbstractProductAttribute(models.Model):
-    
+
     TYPE_CHOICES = (
         ("text", _("Text")),
         ("integer", _("Integer")),
@@ -525,7 +525,7 @@ class AbstractProductAttribute(models.Model):
         ("option", _("Option")),
         ("entity", _("Entity"))
     )
-    
+
     """
     Defines an attribute for a product class. (For example, number_of_pages for a 'book' class)
     """
@@ -541,10 +541,10 @@ class AbstractProductAttribute(models.Model):
     required = models.BooleanField(_('required'), default=False)
 
     class Meta:
-        abstract = True 
+        abstract = True
         ordering = ['code']
-        verbose_name = _('Product Attribute')
-        verbose_name_plural = _('Product Attributes')
+        verbose_name = _('Product attribute')
+        verbose_name_plural = _('Product attributes')
 
     def _validate_text(self, value):
         if not (type(value) == unicode or type(value) == str):
@@ -587,7 +587,7 @@ class AbstractProductAttribute(models.Model):
         if value not in valid_values:
             raise ValidationError(_(u"%(enum)s is not a valid choice "
                                         u"for %(attr)s") % \
-                                       {'enum': value, 'attr': self})        
+                                       {'enum': value, 'attr': self})
 
     def get_validator(self):
         DATATYPE_VALIDATORS = {
@@ -601,14 +601,14 @@ class AbstractProductAttribute(models.Model):
             'option': self._validate_option,
         }
 
-        return DATATYPE_VALIDATORS[self.type]     
+        return DATATYPE_VALIDATORS[self.type]
 
     def __unicode__(self):
         return self.name
 
     def save(self, *args, **kwargs):
         super(AbstractProductAttribute, self).save(*args, **kwargs)
-        
+
     def save_value(self, product, value):
         try:
             value_obj = product.attribute_values.get(attribute=self)
@@ -622,10 +622,10 @@ class AbstractProductAttribute(models.Model):
         if value != value_obj.value:
             value_obj.value = value
             value_obj.save()
-    
+
     def validate_value(self, value):
         self.get_validator()(value)
-        
+
     def is_value_valid(self, value):
         """
         Check whether the passed value is valid for this attribute
@@ -639,9 +639,9 @@ class AbstractProductAttribute(models.Model):
 class AbstractProductAttributeValue(models.Model):
     """
     The "through" model for the m2m relationship between catalogue.Product
-    and catalogue.ProductAttribute.  
+    and catalogue.ProductAttribute.
     This specifies the value of the attribute for a particular product
-    
+
     For example: number_of_pages = 295
     """
     attribute = models.ForeignKey('catalogue.ProductAttribute')
@@ -654,18 +654,18 @@ class AbstractProductAttributeValue(models.Model):
     value_date = models.DateField(_('date'), blank=True, null=True)
     value_option = models.ForeignKey('catalogue.AttributeOption', blank=True, null=True)
     value_entity = models.ForeignKey('catalogue.AttributeEntity', blank=True, null=True)
-    
+
     def _get_value(self):
         return getattr(self, 'value_%s' % self.attribute.type)
-    
+
     def _set_value(self, new_value):
         if self.attribute.type == 'option' and isinstance(new_value, str):
             # Need to look up instance of AttributeOption
             new_value = self.attribute.option_group.options.get(option=new_value)
         setattr(self, 'value_%s' % self.attribute.type, new_value)
-    
+
     value = property(_get_value, _set_value)
-    
+
     class Meta:
         abstract = True
         verbose_name = _('Product Attribute Value')
@@ -673,19 +673,19 @@ class AbstractProductAttributeValue(models.Model):
 
     def __unicode__(self):
         return u"%s: %s" % (self.attribute.name, self.value)
-    
-    
+
+
 class AbstractAttributeOptionGroup(models.Model):
     """
-    Defines a group of options that collectively may be used as an 
+    Defines a group of options that collectively may be used as an
     attribute type
     For example, Language
     """
     name = models.CharField(_('name'), max_length=128)
-    
+
     def __unicode__(self):
         return self.name
-    
+
     class Meta:
         abstract = True
         verbose_name = _('Attribute Option Group')
@@ -699,14 +699,14 @@ class AbstractAttributeOption(models.Model):
     """
     group = models.ForeignKey('catalogue.AttributeOptionGroup', related_name='options')
     option = models.CharField(_('option'), max_length=255)
-    
+
     def __unicode__(self):
         return self.option
-    
+
     class Meta:
         abstract = True
-        verbose_name = _('Attribute Option')
-        verbose_name_plural = _('Attribute Options')
+        verbose_name = _('Attribute option')
+        verbose_name_plural = _('Attribute options')
 
 
 class AbstractAttributeEntity(models.Model):
@@ -719,7 +719,7 @@ class AbstractAttributeEntity(models.Model):
 
     def __unicode__(self):
         return self.name
-    
+
     class Meta:
         abstract = True
         verbose_name = _('Attribute entity')
@@ -737,10 +737,10 @@ class AbstractAttributeEntityType(models.Model):
     """
     name = models.CharField(_("Name"), max_length=255)
     slug = models.SlugField(_("Slug"), max_length=255, unique=False, blank=True)
-    
+
     def __unicode__(self):
         return self.name
-        
+
     class Meta:
         abstract = True
         verbose_name = _('Attribute Entity Type')
@@ -750,29 +750,29 @@ class AbstractAttributeEntityType(models.Model):
         if not self.slug:
             self.slug = slugify(self.name)
         super(AbstractAttributeEntityType, self).save(*args, **kwargs)
-    
-    
+
+
 class AbstractOption(models.Model):
     u"""
     An option that can be selected for a particular item when the product
-    is added to the basket.  
-    
-    Eg a list ID for an SMS message send, or a personalised message to 
-    print on a T-shirt.  
-    
-    This is not the same as an attribute as options do not have a fixed value for 
+    is added to the basket.
+
+    Eg a list ID for an SMS message send, or a personalised message to
+    print on a T-shirt.
+
+    This is not the same as an attribute as options do not have a fixed value for
     a particular item - options, they need to be specified by the customer.
     """
     name = models.CharField(_('name'), max_length=128)
     code = models.SlugField(_('code'), max_length=128)
-    
+
     REQUIRED, OPTIONAL = ('Required', 'Optional')
     TYPE_CHOICES = (
         (REQUIRED, _("Required - a value for this option must be specified")),
         (OPTIONAL, _("Optional - a value for this option can be omitted")),
     )
     type = models.CharField(_("Status"), max_length=128, default=REQUIRED, choices=TYPE_CHOICES)
-    
+
     class Meta:
         abstract = True
         verbose_name = _('Option')
@@ -780,7 +780,7 @@ class AbstractOption(models.Model):
 
     def __unicode__(self):
         return self.name
-    
+
     def save(self, *args, **kwargs):
         if not self.code:
             self.code = slugify(self.name)
@@ -800,13 +800,13 @@ class AbstractProductImage(models.Model):
     product = models.ForeignKey('catalogue.Product', related_name='images')
     original = models.ImageField(_("Original"), upload_to=settings.OSCAR_IMAGE_FOLDER)
     caption = models.CharField(_("Caption"), max_length=200, blank=True, null=True)
-    
+
     # Use display_order to determine which is the "primary" image
     display_order = models.PositiveIntegerField(_("Display Order"), default=0,
         help_text=_("""An image with a display order of
                        zero will be the primary image for a product"""))
     date_created = models.DateTimeField(auto_now_add=True)
-    
+
     class Meta:
         abstract = True
         unique_together = ("product", "display_order")
@@ -834,7 +834,7 @@ class AbstractProductImage(models.Model):
         images in a specific way.
         """
         return self.resized_image_url()
-    
+
     @property
     def thumbnail_url(self):
         return self.resized_image_url()

oscar/apps/catalogue/categories.py

@@ -4,6 +4,9 @@ Category = get_model('catalogue', 'category')
 
 
 def create_from_sequence(bits):
+    """
+    Create categories from an iterable
+    """
     if len(bits) == 1:
         # Get or create root node
         try:
@@ -20,6 +23,7 @@ def create_from_sequence(bits):
         parents.append(child)
         return parents
 
+
 def create_from_breadcrumbs(breadcrumb_str, separator='>'):
     """
     Create categories from a breadcrumb string

oscar/apps/catalogue/views.py

@@ -131,7 +131,6 @@ class ProductListView(ListView):
         if q:
             # Send signal to record the view of this product
             self.search_signal.send(sender=self, query=q, user=self.request.user)
-            base_queryset = get_product_base_queryset()
             return get_product_base_queryset().filter(title__icontains=q)
         else:
             return get_product_base_queryset()
@@ -142,6 +141,6 @@ class ProductListView(ListView):
         if not q:
             context['summary'] = _('All products')
         else:
-            context['summary'] = _("Products matching '%s'") % q
+            context['summary'] = _("Products matching '%(query)s'") % {'query': q}
             context['search_term'] = q
         return context