Remove deprecated methods from catalogue models and views

docs/source/releases/v0.8.rst

@@ -152,5 +152,13 @@ Migrations
 
 .. _deprecated_features:
 
-Features deprecated in 0.8
-==========================
+Removal of deprecated features
+------------------------------
+
+These methods have been removed:
+
+* ``oscar.apps.catalogue.abstract_models.AbstractProduct.has_stockrecord``
+* ``oscar.apps.catalogue.abstract_models.AbstractProduct.stockrecord``
+* ``oscar.apps.catalogue.abstract_models.AbstractProduct.is_available_to_buy``
+* ``oscar.apps.catalogue.abstract_models.AbstractProduct.is_purchase_permitted``
+* ``oscar.apps.catalogue.views.get_product_base_queryset``

oscar/apps/catalogue/abstract_models.py

@@ -1,6 +1,5 @@
 import os
 import six
-import warnings
 from itertools import chain
 from datetime import datetime, date
 import logging
@@ -374,64 +373,6 @@ class AbstractProduct(models.Model):
             pairs.append(value.summary())
         return ", ".join(pairs)
 
-    # Deprecated stockrecord methods
-
-    @property
-    def has_stockrecord(self):
-        """
-        Test if this product has a stock record
-        """
-        warnings.warn(("Product.has_stockrecord is deprecated in favour of "
-                       "using the stockrecord template tag.  It will be "
-                       "removed in v0.8"), DeprecationWarning)
-        return self.num_stockrecords > 0
-
-    @property
-    def stockrecord(self):
-        """
-        Return the stockrecord associated with this product.  For backwards
-        compatibility, this defaults to choosing the first stockrecord found.
-        """
-        # This is the old way of fetching a stockrecord, when they were
-        # one-to-one with a product.
-        warnings.warn(("Product.stockrecord is deprecated in favour of "
-                       "using the stockrecord template tag.  It will be "
-                       "removed in v0.7"), DeprecationWarning)
-        try:
-            return self.stockrecords.all()[0]
-        except IndexError:
-            return None
-
-    @property
-    def is_available_to_buy(self):
-        """
-        Test whether this product is available to be purchased
-        """
-        warnings.warn(("Product.is_available_to_buy is deprecated in favour "
-                       "of using the stockrecord template tag.  It will be "
-                       "removed in v0.7"), DeprecationWarning)
-        if self.is_group:
-            # If any one of this product's variants is available, then we treat
-            # this product as available.
-            for variant in self.variants.select_related('stockrecord').all():
-                if variant.is_available_to_buy:
-                    return True
-            return False
-        if not self.get_product_class().track_stock:
-            return True
-        return self.has_stockrecord and self.stockrecord.is_available_to_buy
-
-    def is_purchase_permitted(self, user, quantity):
-        """
-        Test whether this product can be bought by the passed user.
-        """
-        warnings.warn(("Product.is_purchase_permitted is deprecated in favour "
-                       "of using a partner strategy.  It will be "
-                       "removed in v0.7"), DeprecationWarning)
-        if not self.has_stockrecords:
-            return False, _("No stock available")
-        return self.stockrecord.is_purchase_permitted(user, quantity, self)
-
     @property
     def min_variant_price_incl_tax(self):
         """

oscar/apps/catalogue/views.py

@@ -1,4 +1,3 @@
-import warnings
 from django.conf import settings
 from django.http import HttpResponsePermanentRedirect
 from django.shortcuts import get_object_or_404
@@ -99,17 +98,6 @@ class ProductDetailView(DetailView):
             '%s/detail.html' % (self.template_folder)]
 
 
-def get_product_base_queryset():
-    """
-    Deprecated. Kept only for backwards compatibility.
-    Product.browsable.base_queryset() should be used instead.
-    """
-    warnings.warn(("`get_product_base_queryset` is deprecated in favour of"
-                   "`base_queryset` on Product's managers. It will be removed"
-                   "in Oscar 0.7."), DeprecationWarning)
-    return Product.browsable.base_queryset()
-
-
 class ProductCategoryView(ListView):
     """
     Browse products in a given category