Yey, another massive set of docstrings even if David says I'm not important. =P

docs/source/conf.py

@@ -214,3 +214,7 @@ man_pages = [
     ('index', 'django-oscar', u'django-oscar Documentation',
      [u'David Winterbottom'], 1)
 ]
+
+from django-oscar import settings
+from django.core.management import setup_environ
+setup_environ(settings)

oscar/address/abstract_models.py

@@ -10,10 +10,10 @@ from django.utils.translation import ugettext_lazy as _
 class AbstractAddress(models.Model):
     u"""
     Superclass address object
-    
+
     This is subclassed and extended to provide models for 
     user, shipping and billing addresses.
-    
+
     The only required fields are last_name, line1 and postcode.
     """
     # @todo: Need a way of making these choice lists configurable 
@@ -38,10 +38,11 @@ class AbstractAddress(models.Model):
     
     class Meta:
         abstract = True
-        
+
     def save(self, *args, **kwargs):
+        u"""Clean fields and save"""
         self._clean_fields()
-        super(AbstractAddress, self).save(*args, **kwargs)    
+        super(AbstractAddress, self).save(*args, **kwargs)
         
     def _clean_fields(self):
         u"""Clean up fields"""
@@ -51,7 +52,7 @@ class AbstractAddress(models.Model):
         
         # Ensure postcodes are always uppercase
         if self.postcode:
-            self.postcode = self.postcode.upper()    
+            self.postcode = self.postcode.upper()
         
     @property    
     def summary(self):
@@ -154,6 +155,7 @@ class AbstractUserAddress(AbstractShippingAddress):
         return zlib.crc32(self.summary.strip().upper())
 
     def save(self, *args, **kwargs):
+        u"""Save a hash of the address fields"""
         # Save a hash of the address fields so we can check whether two 
         # addresses are the same to avoid saving duplicates
         self.hash = self.generate_hash()

oscar/basket/abstract_models.py

@@ -124,26 +124,32 @@ class AbstractBasket(models.Model):
     
     @property
     def is_empty(self):
+        u"""Return bool based on basket having 0 lines"""
         return self.num_lines == 0
     
     @property
     def total_excl_tax(self):
+        u"""Return total line price excluding tax"""
         return self._get_total('line_price_excl_tax')
     
     @property
     def total_tax(self):
+        u"""Return total tax for a line"""
         return self._get_total('line_tax')
     
     @property
     def total_incl_tax(self):
+        u"""Return total price for a line including tax"""
         return self._get_total('line_price_incl_tax')
     
     @property
     def num_lines(self):
+        u"""Return number of lines"""
         return self.lines.all().count()
     
     @property
     def num_items(self):
+        u"""Return number of items"""
         return reduce(lambda num,line: num+line.quantity, self.lines.all(), 0)
     
     
@@ -166,6 +172,7 @@ class AbstractLine(models.Model):
         return u"%s, Product '%s', quantity %d" % (self.basket, self.product, self.quantity)
     
     def save(self, *args, **kwargs):
+        u"""Saves a line or deletes if it's quanity is 0"""
         if self.quantity == 0:
             return self.delete(*args, **kwargs)
         super(AbstractLine, self).save(*args, **kwargs)
@@ -186,30 +193,37 @@ class AbstractLine(models.Model):
     
     @property
     def unit_price_excl_tax(self):
+        u"""Return unit price excluding tax"""
         return self._get_stockrecord_property('price_excl_tax')
     
     @property
     def unit_tax(self):
+        u"""Return tax of a unit"""
         return self._get_stockrecord_property('price_tax')
     
     @property
     def unit_price_incl_tax(self):
+        u"""Return unit price including tax"""
         return self._get_stockrecord_property('price_incl_tax')
     
     @property
     def line_price_excl_tax(self):
-       return self.quantity * self.unit_price_excl_tax
+        u"""Return line price excluding tax"""
+        return self.quantity * self.unit_price_excl_tax
        
     @property    
     def line_tax(self):
+        u"""Return line tax"""
         return self.quantity * self.unit_tax
     
     @property
     def line_price_incl_tax(self):
+        u"""Return line price including tax"""
         return self.quantity * self.unit_price_incl_tax
     
     @property
     def description(self):
+        u"""Return product description"""
         d = str(self.product)
         ops = []
         for attribute in self.attributes.all():

oscar/checkout/calculators.py

@@ -11,6 +11,7 @@ class OrderTotalCalculator(object):
         self.request = request
     
     def order_total_incl_tax(self, basket, shipping_method=None):
+        u"""Return order total including tax"""
         # Default to returning the total including tax - use
         # the request.user object if you want to not charge tax
         # to particular customers.  
@@ -20,6 +21,7 @@ class OrderTotalCalculator(object):
         return total
     
     def order_total_excl_tax(self, basket, shipping_method=None):
+        u"""Return order total excluding tax"""
         total = basket.total_excl_tax
         if shipping_method:
             total += shipping_method.basket_charge_excl_tax()

oscar/checkout/signals.py

@@ -4,6 +4,7 @@ order_placed = Signal(providing_args=["order"])
 
 @receiver(order_placed)
 def update_stock_levels(sender, **kwargs):
+    u"""Updated a line item's stock level"""
     order = kwargs['order']
     for line in order.lines.all():
         sr = line.product.stockrecord

oscar/checkout/utils.py

@@ -65,7 +65,7 @@ class ProgressChecker(object):
         """
         request.session['checkout_complete_steps'] = []
         
-    def _get_url_name(self, request):    
+    def _get_url_name(self, request):
         return resolve(request.path).url_name
         
     def _get_completed_steps(self, request):
@@ -87,45 +87,55 @@ class CheckoutSessionData(object):
             self.request.session[self.SESSION_KEY][namespace] = {}
           
     def _get(self, namespace, key):
+        u"""Return session value or None"""
         self._check_namespace(namespace)
         if key in self.request.session[self.SESSION_KEY][namespace]:
             return self.request.session[self.SESSION_KEY][namespace][key]
         return None
             
     def _set(self, namespace, key, value):
+        u"""Set session value"""
         self._check_namespace(namespace)
         self.request.session[self.SESSION_KEY][namespace][key] = value
         self.request.session.modified = True
         
     def _unset(self, namespace, key):
+        u"""Unset session value"""
         self._check_namespace(namespace)
         if key in self.request.session[self.SESSION_KEY][namespace]:
             del self.request.session[self.SESSION_KEY][namespace][key]
             self.request.session.modified = True
             
     def flush(self):
+        u"""Delete session key"""
         self.request.session[self.SESSION_KEY] = {}
         
     # Shipping methods    
         
     def ship_to_user_address(self, address):
+        u"""Set existing shipping address id to session and unset address fields from session"""
         self._set('shipping', 'user_address_id', address.id)
         self._unset('shipping', 'new_address_fields')
         
     def ship_to_new_address(self, address_fields):
+        u"""Set new shipping address details to session and unset shipping address id"""
         self._set('shipping', 'new_address_fields', address_fields)
         self._unset('shipping', 'user_address_id')
         
     def new_address_fields(self):
+        u"""Get shipping address fields from session"""
         return self._get('shipping', 'new_address_fields')
         
     def user_address_id(self):
+        u"""Get user address id from session"""
         return self._get('shipping', 'user_address_id')
     
     def use_free_shipping(self):
+        u"""Set "free shipping" code to session"""
         self._set('shipping', 'method_code', '__free__')
     
     def use_shipping_method(self, code):
+        u"""Set shipping method code to session"""
         self._set('shipping', 'method_code', code)
         
     def shipping_method(self):

oscar/checkout/views.py

@@ -199,6 +199,7 @@ class ShippingMethodView(CheckoutView):
         return render(self.request, self.template_file, locals())
     
     def get_shipping_methods_for_basket(self, basket):
+        u"""Return available shipping methods for a basket"""
         return shipping_models.Method.objects.all()
     
     def handle_POST(self):
@@ -300,7 +301,6 @@ class SubmitView(CheckoutView):
     
     def _place_order(self, basket):
         u"""Writes the order out to the DB"""
-        
         calc = checkout_calculators.OrderTotalCalculator(self.request)
         shipping_address = self._get_shipping_address()
         shipping_method = self._get_shipping_method(basket)

oscar/customer/views.py

@@ -12,24 +12,29 @@ order_models = import_module('order.models', ['Order'])
 
 @login_required
 def profile(request):
+    u"""Return a customers's profile"""
     # Load last 5 orders as preview
     orders = order_models.Order.objects.filter(user=request.user)[0:5]
     return render(request, 'customer/profile.html', locals())
     
         
 class OrderHistoryView(ListView):
+    u"""Customer order history"""
     context_object_name = "orders"
     template_name = 'customer/order-history.html'
     paginate_by = 20
 
     def get_queryset(self):
+        u"""Return a customer's orders"""
         return order_models.Order.objects.filter(user=self.request.user)
 
 
 class OrderDetailView(ModelView):
+    u"""Customer order details"""
     template_file = "customer/order.html"
     
     def get_model(self):
+        u"""Return an order object or 404"""
         return get_object_or_404(order_models.Order, user=self.request.user, number=self.kwargs['order_number'])
     
     def handle_GET(self, order):
@@ -37,18 +42,22 @@ class OrderDetailView(ModelView):
         
 
 class AddressBookView(ListView):
+    u"""Customer address book"""
     context_object_name = "addresses"
     template_name = 'customer/address-book.html'
     paginate_by = 40
         
     def get_queryset(self):
+        u"""Return a customer's addresses"""
         return address_models.UserAddress.objects.filter(user=self.request.user)
     
     
 class AddressView(ModelView):
+    u"""Customer address view"""
     template_file = "customer/address-form.html"
     
     def get_model(self):
+        u"""Return an address object or a 404"""
         return get_object_or_404(address_models.UserAddress, user=self.request.user, pk=self.kwargs['address_id'])
     
     def handle_GET(self, address):
@@ -56,6 +65,7 @@ class AddressView(ModelView):
         self.response = render(self.request, self.template_file, locals())
         
     def do_save(self, address):
+        u"""Save an address"""
         form = UserAddressForm(self.request.POST, instance=address)
         if form.is_valid():
             a = form.save()
@@ -64,6 +74,7 @@ class AddressView(ModelView):
             self.response = render(self.request, self.template_file, locals())
             
     def do_delete(self, address):
+        u"""Delete an address"""
         address.delete()
         self.response = HttpResponseRedirect(reverse('oscar-customer-address-book'))
             

oscar/image/abstract_models.py

@@ -17,6 +17,7 @@ class AbstractImage(models.Model):
     date_created = models.DateTimeField(auto_now_add=True)
     
     def is_primary(self):
+        u"""Return bool if image display order is 0"""
         return self.display_order == 0
     
     class Meta:

oscar/order/abstract_models.py

@@ -5,9 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.db.models import Sum
 
 class AbstractOrder(models.Model):
-    """
-    An order
-    """
+    u"""An order"""
     number = models.CharField(_("Order number"), max_length=128, db_index=True)
     # We track the site that each order is placed within
     site = models.ForeignKey('sites.Site')
@@ -32,10 +30,12 @@ class AbstractOrder(models.Model):
     
     @property
     def basket_total_incl_tax(self):
+        u"""Return basket total including tax"""
         return self.total_incl_tax - self.shipping_incl_tax
     
     @property
     def basket_total_excl_tax(self):
+        u"""Return basket total excluding tax"""
         return self.total_excl_tax - self.shipping_excl_tax
     
     class Meta:
@@ -52,9 +52,7 @@ class AbstractOrder(models.Model):
 
 
 class AbstractOrderNote(models.Model):
-    """
-    A note against an order.
-    """
+    u"""A note against an order."""
     order = models.ForeignKey('order.Order', related_name="notes")
     user = models.ForeignKey('auth.User')
     message = models.TextField()
@@ -68,10 +66,9 @@ class AbstractOrderNote(models.Model):
 
 
 class AbstractCommunicationEvent(models.Model):
-    """
+    u"""
     An order-level event involving a communication to the customer, such
-    as an confirmation email being sent.
-    """
+    as an confirmation email being sent."""
     order = models.ForeignKey('order.Order', related_name="events")
     type = models.ForeignKey('order.CommunicationEventType')
     date = models.DateTimeField(auto_now_add=True)
@@ -81,9 +78,7 @@ class AbstractCommunicationEvent(models.Model):
     
     
 class AbstractCommunicationEventType(models.Model):
-    """ 
-    Communication events are things like 'OrderConfirmationEmailSent'
-    """
+    u"""Communication events are things like 'OrderConfirmationEmailSent'"""
     # Code is used in forms
     code = models.CharField(max_length=128)
     # Name is the friendly description of an event
@@ -103,7 +98,7 @@ class AbstractCommunicationEventType(models.Model):
     
 
 class AbstractBatch(models.Model):
-    """
+    u"""
     A batch of items from a single fulfillment partner
     
     This is a set of order lines which are fulfilled by a single partner
@@ -123,7 +118,7 @@ class AbstractBatch(models.Model):
         
         
 class AbstractBatchLine(models.Model):
-    """
+    u"""
     A line within a batch.
     
     Not using a line model as it's difficult to capture and payment 
@@ -145,7 +140,7 @@ class AbstractBatchLine(models.Model):
     
     @property
     def description(self):
-        """
+        u"""
         Returns a description of this line including details of any 
         line attributes.
         """
@@ -159,9 +154,7 @@ class AbstractBatchLine(models.Model):
     
     @property
     def shipping_status(self):
-        """
-        Returns a string summary of the shipping status of this line
-        """
+        u"""Returns a string summary of the shipping status of this line"""
         status_map = self._shipping_event_history()
         
         events = []    
@@ -173,19 +166,16 @@ class AbstractBatchLine(models.Model):
         return ', '.join(events)
     
     def has_shipping_event_occurred(self, event_type):
-        """
-        Checks whether this line has passed a given shipping event
-        """
+        u"""Checks whether this line has passed a given shipping event"""
         for name, quantity in self._shipping_event_history().items():
             if name == event_type.name and quantity == self.quantity:
                 return True
         return False
     
     def _shipping_event_history(self):
-        """
+        u"""
         Returns a dict of shipping event name -> quantity that have been
-        through this state
-        """
+        through this state"""
         status_map = {}
         for event in self.shippingevent_set.all():
             event_name = event.event_type.name
@@ -203,9 +193,7 @@ class AbstractBatchLine(models.Model):
     
     
 class AbstractBatchLineAttribute(models.Model):
-    """
-    An attribute of a batch line.
-    """
+    u"""An attribute of a batch line."""
     line = models.ForeignKey('order.BatchLine', related_name='attributes')
     type = models.CharField(_("Type"), max_length=128)
     value = models.CharField(_("Value"), max_length=255)    
@@ -218,7 +206,7 @@ class AbstractBatchLineAttribute(models.Model):
     
     
 class AbstractBatchLinePrice(models.Model):
-    """
+    u"""
     For tracking the prices paid for each unit within a line.
     
     This is necessary as offers can lead to units within a line 
@@ -241,7 +229,7 @@ class AbstractBatchLinePrice(models.Model):
    
    
 class AbstractPaymentEvent(models.Model):    
-    """
+    u"""
     An event is something which happens to a line such as
     payment being taken for 2 items, or 1 item being dispatched.
     """
@@ -261,9 +249,7 @@ class AbstractPaymentEvent(models.Model):
 
 
 class AbstractPaymentEventType(models.Model):
-    """ 
-    Payment events are things like 'Paid', 'Failed', 'Refunded'
-    """
+    u"""Payment events are things like 'Paid', 'Failed', 'Refunded'"""
     # Code is used in forms
     code = models.CharField(max_length=128)
     # Name is the friendly description of an event
@@ -286,7 +272,7 @@ class AbstractPaymentEventType(models.Model):
 
 
 class AbstractShippingEvent(models.Model):    
-    """
+    u"""
     An event is something which happens to a group of lines such as
     1 item being dispatched.
     """
@@ -312,17 +298,13 @@ class AbstractShippingEvent(models.Model):
 
 
 class ShippingEventQuantity(models.Model):
-    """
-    A "through" model linking lines to shipping events
-    """
+    u"""A "through" model linking lines to shipping events"""
     event = models.ForeignKey('order.ShippingEvent')
     line = models.ForeignKey('order.BatchLine')
     quantity = models.PositiveIntegerField()
 
     def _check_previous_events_are_complete(self):
-        """
-        Checks whether previous shipping events have passed
-        """
+        u"""Checks whether previous shipping events have passed"""
         previous_events = ShippingEventQuantity.objects.filter(line=self.line, 
                                                                event__event_type__order__lt=self.event.event_type.order)
         self.quantity = int(self.quantity)
@@ -349,9 +331,7 @@ class ShippingEventQuantity(models.Model):
 
 
 class AbstractShippingEventType(models.Model):
-    """ 
-    Shipping events are things like 'OrderPlaced', 'Acknowledged', 'Dispatched', 'Refunded'
-    """
+    u"""Shipping events are things like 'OrderPlaced', 'Acknowledged', 'Dispatched', 'Refunded'"""
     # Code is used in forms
     code = models.CharField(max_length=128)
     # Name is the friendly description of an event

oscar/order/models.py

@@ -1,6 +1,4 @@
-"""
-Vanilla implementation of order models
-"""
+u"""Vanilla implementation of order models"""
 from django.db import models
 
 from oscar.order.abstract_models import *

oscar/order_management/views.py

@@ -14,7 +14,7 @@ order_models = import_module('order.models', ['Order', 'BatchLine', 'ShippingEve
 
 
 class OrderListView(ListView):
-
+    u"""A list of orders"""
     context_object_name = "orders"
     template_name = 'order_management/browse.html'
     paginate_by = 20
@@ -24,9 +24,11 @@ class OrderListView(ListView):
     
   
 class OrderView(ModelView):
+    u"""A detail view of an order"""
     template_file = "order_management/order.html"
     
     def get_model(self):
+        u"""Return an order object or a 404"""
         return get_object_or_404(order_models.Order, number=self.kwargs['order_number'])
     
     def handle_GET(self, order):
@@ -40,6 +42,7 @@ class OrderView(ModelView):
         super(OrderView, self).handle_POST(order)
         
     def do_create_event(self, order):
+        u"""Create an event for an order"""
         line_ids = self.request.POST.getlist('order_line')
         batch = order.batches.get(id=self.request.POST['batch_id'])
         lines = batch.lines.in_bulk(line_ids)
@@ -53,6 +56,7 @@ class OrderView(ModelView):
             messages.error(self.request, str(e))    
                 
     def create_shipping_event(self, order, batch, lines):
+        u"""Create a shipping event for an order"""
         with transaction.commit_on_success():
             event_type = order_models.ShippingEventType.objects.get(code=self.request.POST['shipping_event'])
             event = order_models.ShippingEvent.objects.create(order=order, event_type=event_type, batch=batch)
@@ -62,13 +66,14 @@ class OrderView(ModelView):
                                                                   quantity=event_quantity)
             
     def create_payment_event(self, order, lines, type_code):
+        u"""Create a payment event for an order"""
         event_type = order_models.PaymentEventType.objects.get(code=type_code)
         for line in lines.values():
             order_models.PaymentEvent.objects.create(order=order, line=line, 
                                                      quantity=line.quantity, event_type=event_type)
             
     def do_add_note(self, order):
-        u"""Save a note against the order."""
+        u"""Save a note against an order."""
         if self.request.user.is_authenticated():
             message = self.request.POST['message'].strip()
             if message:

oscar/payment/abstract_models.py

@@ -3,7 +3,7 @@ from django.db import models
 from django.utils.translation import ugettext as _
 
 class AbstractSource(models.Model):
-    """
+    u"""
     A source of payment for an order.  
     
     This is normally a credit card which has been pre-authed
@@ -27,9 +27,7 @@ class AbstractSource(models.Model):
         return description
     
 class AbstractSourceType(models.Model):
-    """
-    A type of payment source (eg Bankcard, Business account, Gift card)
-    """
+    u"""A type of payment source (eg Bankcard, Business account, Gift card)"""
     name = models.CharField(max_length=128)
 
     class Meta:
@@ -39,7 +37,7 @@ class AbstractSourceType(models.Model):
         return self.name
 
 class AbstractTransaction(models.Model):
-    """
+    u"""
     A transaction for payment sources which need a secondary 'transaction' to actually take the money
     
     This applies mainly to credit card sources which can be a pre-auth for the money.  A 'complete'

oscar/product/abstract_models.py

@@ -12,7 +12,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from oscar.product.managers import BrowsableItemManager
 
 def _convert_to_underscores(str):
-    """
+    u"""
     For converting a string in CamelCase or normal text with spaces
     to the normal underscored variety
     """
@@ -22,9 +22,7 @@ def _convert_to_underscores(str):
 
 
 class AbstractItemClass(models.Model):
-    """
-    Defines an item type (equivqlent to Taoshop's MediaType).
-    """
+    u"""Defines an item type (equivqlent to Taoshop's MediaType)."""
     name = models.CharField(_('name'), max_length=128)
     slug = models.SlugField(max_length=128, unique=True)
     options = models.ManyToManyField('product.Option', blank=True)
@@ -47,9 +45,7 @@ class AbstractItemClass(models.Model):
 
 
 class AbstractItem(models.Model):
-    """
-    The base product object
-    """
+    u"""The base product object"""
     # 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 product.
@@ -84,26 +80,32 @@ class AbstractItem(models.Model):
 
     @property
     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"""
         return self.is_top_level and self.variants.count() > 0
     
     @property
     def is_variant(self):
+        u"""Return True if a product is not a top level product"""
         return not self.is_top_level
 
     @property
     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"""
         return self._min_variant_price('price_excl_tax')
 
     @property
     def has_stockrecord(self):
+        u"""Return True if a product has a stock record, False if not"""
         try:
             sr = self.stockrecord
             return True
@@ -111,15 +113,18 @@ class AbstractItem(models.Model):
             return False
 
     def attribute_summary(self):
+        u"""Return a string of all of a product's attributes"""
         return ", ".join([attribute.__unicode__() for attribute in self.attributes.all()])
 
     def get_title(self):
+        u"""Return a product's title or it's parent's title if it has no title"""
         title = self.__dict__.setdefault('title', '')
         if not title and self.parent_id:
             title = self.parent.title
         return title
     
     def get_item_class(self):
+        u"""Return a product's item class"""
         if self.item_class:
             return self.item_class
         if self.parent.item_class:
@@ -129,6 +134,7 @@ class AbstractItem(models.Model):
     # Helpers
     
     def _min_variant_price(self, property):
+        u"""Return minimum variant price"""
         prices = []
         for variant in self.variants.all():
             if variant.has_stockrecord:
@@ -148,6 +154,7 @@ class AbstractItem(models.Model):
         return self.get_title()
     
     def get_absolute_url(self):
+        u"""Return a product's absolute url"""
         args = {'item_class_slug': self.get_item_class().slug, 
                 'item_slug': self.slug,
                 'item_id': self.id}
@@ -163,9 +170,7 @@ class AbstractItem(models.Model):
 
 
 class AbstractAttributeType(models.Model):
-    """
-    Defines an attribute. (Eg. size)
-    """
+    u"""Defines an attribute. (Eg. size)"""
     code = models.CharField(_('code'), max_length=128)
     name = models.CharField(_('name'), max_length=128)
     has_choices = models.BooleanField(default=False)
@@ -184,9 +189,7 @@ class AbstractAttributeType(models.Model):
         
 
 class AbstractAttributeValueOption(models.Model):
-    """
-    Defines an attribute value choice (Eg: S,M,L,XL for a size attribute type)
-    """
+    u"""Defines an attribute value choice (Eg: S,M,L,XL for a size attribute type)"""
     type = models.ForeignKey('product.AttributeType', related_name='options')
     value = models.CharField(max_length=255)
 
@@ -198,7 +201,7 @@ class AbstractAttributeValueOption(models.Model):
 
 
 class AbstractItemAttributeValue(models.Model):
-    """
+    u"""
     A specific attribute value for an item.
     
     Eg: size = L
@@ -215,7 +218,7 @@ class AbstractItemAttributeValue(models.Model):
     
     
 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 message for a SMS message.  This is not
     the same as an attribute as options do not have a fixed value for 

oscar/product/views.py

@@ -13,12 +13,11 @@ basket_forms = import_module('basket.forms', ['FormFactory'])
 
 
 class ItemDetailView(DetailView):
-    """
-    View a single product.
-    """
+    u"""View a single product."""
     template_name = "product/item.html"
     
     def get(self, request, **kwargs):
+        u"""Return a product's detail or a 404"""
         item = self.get_object()
         correct_path = item.get_absolute_url() 
         if correct_path != request.path:
@@ -26,6 +25,7 @@ class ItemDetailView(DetailView):
         return super(ItemDetailView, self).get(request, **kwargs)
     
     def get_object(self):
+        u"""Return a product object or a 404"""
         return get_object_or_404(product_models.Item, pk=self.kwargs['item_id'])
     
     def get_context_data(self, **kwargs):
@@ -39,9 +39,7 @@ class ItemDetailView(DetailView):
 
 
 class ItemClassListView(ListView):
-    """
-    View products filtered by item-class.
-    """
+    u"""View products filtered by item-class."""
     context_object_name = "products"
     template_name = 'product/browse.html'
     paginate_by = 20
@@ -52,18 +50,20 @@ class ItemClassListView(ListView):
 
 
 class ProductListView(ListView):
-
+    u"""A list of products"""
     context_object_name = "products"
     template_name = 'product/browse.html'
     paginate_by = 20
 
     def get_search_query(self):
+        u"""Return a search query from GET"""
         q = None
         if 'q' in self.request.GET and self.request.GET['q']:
             q = self.request.GET['q'].strip()
         return q
 
     def get_queryset(self):
+        u"""Return a set of prodcuts"""
         q = self.get_search_query()
         if q:
             return product_models.Item.browsable.filter(title__icontains=q)

oscar/services.py

@@ -7,7 +7,7 @@ class AppNotFoundError(Exception):
     pass
 
 def import_module(module_label, classes=[]):
-    """
+    u"""
     For dynamically importing classes from a module based on the mapping within 
     settings.py
     

oscar/shipping/abstract_models.py

@@ -30,11 +30,13 @@ class AbstractMethod(models.Model):
         self._basket = basket
     
     def basket_charge_incl_tax(self):
+        u"""Return basket total including tax"""
         charge = self.price_per_order
         for line in self._basket.lines.all():
             charge += line.quantity * self.price_per_item
         return charge
     
     def basket_charge_excl_tax(self):
+        u"""Return basket total excluding tax"""
         # @todo store tax amounts?
         return self.basket_charge_incl_tax()

oscar/stock/abstract_models.py

@@ -44,6 +44,7 @@ class AbstractStockRecord(models.Model):
         abstract = True
     
     def decrement_num_in_stock(self, delta):
+        u"""Decrement an item's stock level"""
         if self.num_in_stock >= delta:
             self.num_in_stock -= delta
         self.num_allocated += delta
@@ -54,16 +55,20 @@ class AbstractStockRecord(models.Model):
     
     @property
     def availability(self):
+        u"""Return an item's availability as a string"""
         if self.num_in_stock:
             return _("In stock (%d available)" % self.num_in_stock)
         return _("Out of stock")
     
     @property 
     def price_incl_tax(self):
+        u"""Return a product's price including tax"""
         return self.price_excl_tax
     
     @property 
     def price_tax(self):
+        u"""Return a product's tax value"""
+        #TODO?
         return 0
         
     def __unicode__(self):

oscar/templatetags/currency_filters.py

@@ -8,6 +8,7 @@ register = template.Library()
 
 @register.filter(name='currency')
 def currency(value):
+    u"""Return value converted to a locale currency"""
     try:
         locale.setlocale(locale.LC_ALL, settings.LOCALE)
     except AttributeError: