Remove find_by_code method from repo

This was no longer being used as the checkout code had changed to load
all viable methods and then iterate over to find the appropriate one.

oscar/apps/checkout/views.py

@@ -317,6 +317,7 @@ class ShippingMethodView(CheckoutSessionMixin, generic.TemplateView):
         # Save the code for the chosen shipping method in the session
         # and continue to the next step.
         self.checkout_session.use_shipping_method(method_code)
+
         return self.get_success_response()
 
     def get_success_response(self):

oscar/apps/shipping/repository.py

@@ -15,6 +15,8 @@ class Repository(object):
     # that isn't thread safe.
     methods = (methods.Free,)
 
+    # API
+
     def get_shipping_methods(self, user, basket, shipping_addr=None,
                              request=None, **kwargs):
         """
@@ -48,6 +50,8 @@ class Repository(object):
         # Choose the cheapest method by default
         return min(shipping_methods, key=lambda method: method.charge_excl_tax)
 
+    # Helpers
+
     def prime_methods(self, basket, methods):
         """
         Prime a list of shipping method instances
@@ -82,16 +86,3 @@ class Repository(object):
                         method, discount['offer'])
 
         return method
-
-    def find_by_code(self, code, basket):
-        """
-        Return the appropriate Method object for the given code
-        """
-        for method_class in self.methods:
-            if method_class.code == code:
-                method = method_class()
-                return self.prime_method(basket, method)
-
-        # Check for NoShippingRequired as that is a special case
-        if code == methods.NoShippingRequired.code:
-            return self.prime_method(basket, methods.NoShippingRequired())

tests/integration/order/creator_tests.py

@@ -8,7 +8,7 @@ from oscar.apps.catalogue.models import ProductClass, Product
 from oscar.apps.offer.utils import Applicator
 from oscar.apps.order.models import Order
 from oscar.apps.order.utils import OrderCreator
-from oscar.apps.shipping.methods import Free, Base
+from oscar.apps.shipping.methods import Free, FixedPrice
 from oscar.apps.shipping.repository import Repository
 from oscar.core.loading import get_class
 from oscar.test import factories
@@ -149,17 +149,6 @@ class TestPlacingOrderForDigitalGoods(TestCase):
         self.assertTrue(stockrecord.num_allocated is None)
 
 
-class Fixed(Base):
-    code = 'test'
-    charge_incl_tax = charge_excl_tax = D('5.00')
-    is_tax_known = True
-
-
-class StubRepository(Repository):
-    """ Custom shipping methods """
-    methods = (Fixed, Free)
-
-
 class TestShippingOfferForOrder(TestCase):
 
     def setUp(self):
@@ -179,8 +168,8 @@ class TestShippingOfferForOrder(TestCase):
         add_product(self.basket, D('12.00'))
         self.apply_20percent_shipping_offer()
 
-        # Normal shipping 5.00
-        shipping = StubRepository().find_by_code('test', self.basket)
+        shipping = FixedPrice(D('5.00'), D('5.00'))
+        shipping = Repository().prime_method(self.basket, shipping)
 
         place_order(self.creator,
                     basket=self.basket,
@@ -196,8 +185,8 @@ class TestShippingOfferForOrder(TestCase):
         add_product(self.basket, D('12.00'))
         self.apply_20percent_shipping_offer()
 
-        # Free shipping
-        shipping = StubRepository().find_by_code(Free.code, self.basket)
+        shipping = Free()
+        shipping = Repository().prime_method(self.basket, shipping)
 
         place_order(self.creator,
                     basket=self.basket,

tests/unit/shipping/repository_tests.py

@@ -1,5 +1,3 @@
-from decimal import Decimal as D
-
 from django.test import TestCase
 from nose.plugins.attrib import attr
 
@@ -21,18 +19,3 @@ class TestShippingRepository(TestCase):
 
         method = available_methods[0]
         self.assertTrue(isinstance(method, methods.Free))
-        self.assertEqual(D('0.00'), method.charge_incl_tax)
-        self.assertEqual(D('0.00'), method.charge_excl_tax)
-
-    def test_allows_free_method_to_be_retrieved(self):
-        method = self.repo.find_by_code(methods.Free.code, self.basket)
-        self.assertTrue(isinstance(method, methods.Free))
-
-    def test_allows_no_shipping_required_method_to_be_retrieved(self):
-        method = self.repo.find_by_code(
-            methods.NoShippingRequired.code, self.basket)
-        self.assertTrue(isinstance(method, methods.NoShippingRequired))
-
-    def test_returns_none_for_unknown_code(self):
-        method = self.repo.find_by_code('asdf', self.basket)
-        self.assertIsNone(method)