Standardise calls to get_shipping_methods

paypal/express/views.py

@@ -122,8 +122,11 @@ def _get_redirect_url(self, basket, **kwargs):
                 params['shipping_methods'] = []
 
         else:
+            # Maik doubts that this code ever worked. Assigning
+            # shipping method instances to Paypal params
+            # isn't going to work, is it?
             shipping_methods = Repository().get_shipping_methods(
-                user=user, basket=basket)
+                user=user, basket=basket, request=self.request)
             params['shipping_methods'] = shipping_methods
 
         if settings.DEBUG:
@@ -349,8 +352,8 @@ def get_shipping_address(self, basket):
 
     def _get_shipping_method_by_name(self, name, basket, shipping_address=None):
         methods = Repository().get_shipping_methods(
-            basket=basket, user=self.request.user,
-            shipping_addr=shipping_address, request=self.request)
+            basket=basket, shipping_addr=shipping_address,
+            request=self.request, user=self.request.user)
         for method in methods:
             if method.name == name:
                 return method
@@ -419,7 +422,9 @@ def post(self, request, *args, **kwargs):
             postcode=self.request.POST.get('PAYMENTREQUEST_0_SHIPTOZIP', None),
             country=country
         )
-        methods = self.get_shipping_methods(user, basket, shipping_address)
+        methods = Repository().get_shipping_methods(
+            basket=basket, shipping_addr=shipping_address,
+            request=self.request, user=user)
         return self.render_to_response(methods, basket)
 
     def render_to_response(self, methods, basket):
@@ -446,8 +451,3 @@ def render_to_response(self, methods, basket):
             pairs.append(('NO_SHIPPING_OPTION_DETAILS', 1))
         payload = urlencode(pairs)
         return HttpResponse(payload)
-
-    def get_shipping_methods(self, user, basket, shipping_address):
-        repo = Repository()
-        return repo.get_shipping_methods(
-            user, basket, shipping_addr=shipping_address)