Python 3: Handle dict-like objects

Calls to items() and values() return an iterator in Python 3. This
commit converts the result to a list if necessary. In some instances,
using the six helpers was not necessary and has been removed.

See also:
https://docs.djangoproject.com/en/dev/topics/python3/#dict-and-dict-like-classes

oscar/apps/basket/views.py

@@ -121,7 +121,7 @@ class BasketView(ModelFormSetView):
 
     def get_upsell_messages(self, basket):
         offers = Applicator().get_offers(self.request, basket)
-        applied_offers = basket.offer_applications.offers.values()
+        applied_offers = list(basket.offer_applications.offers.values())
         msgs = []
         for offer in offers:
             if offer.is_condition_partially_satisfied(basket) \

oscar/apps/catalogue/abstract_models.py

@@ -655,7 +655,7 @@ class ProductAttributesContainer(object):
 
     def __getattr__(self, name):
         if not name.startswith('_') and not self.initialised:
-            values = list(self.get_values().select_related('attribute'))
+            values = self.get_values().select_related('attribute')
             for v in values:
                 setattr(self, v.attribute.code, v.value)
             self.initialised = True

oscar/apps/customer/forms.py

@@ -310,7 +310,7 @@ if Profile:
             super(UserAndProfileForm, self).__init__(*args, **kwargs)
 
             # Get profile field names to help with ordering later
-            profile_field_names = self.fields.keys()
+            profile_field_names = list(self.fields.keys())
 
             # Get user field names (we look for core user fields first)
             core_field_names = set([f.name for f in User._meta.fields])

oscar/apps/dashboard/catalogue/views.py

@@ -1,5 +1,3 @@
-import six
-
 from django.core.exceptions import ObjectDoesNotExist
 from django.views import generic
 from django.db.models import Q
@@ -233,7 +231,7 @@ class ProductCreateUpdateView(generic.UpdateView):
         ctx = super(ProductCreateUpdateView, self).get_context_data(**kwargs)
         ctx['product_class'] = self.product_class
 
-        for ctx_name, formset_class in six.iteritems(self.formsets):
+        for ctx_name, formset_class in self.formsets.items():
             if ctx_name not in ctx:
                 ctx[ctx_name] = formset_class(self.product_class,
                                               self.request.user,
@@ -261,7 +259,7 @@ class ProductCreateUpdateView(generic.UpdateView):
             self.object = form.save()
 
         formsets = {}
-        for ctx_name, formset_class in six.iteritems(self.formsets):
+        for ctx_name, formset_class in self.formsets.items():
             formsets[ctx_name] = formset_class(self.product_class,
                                                self.request.user,
                                                self.request.POST,

oscar/apps/offer/custom.py

@@ -36,6 +36,7 @@ def create_range(range_class):
     except Range.DoesNotExist:
         obj = Range(**values)
     else:
+        # Using iteritems because the range could potentially be rather big
         for key, value in six.iteritems(values):
             setattr(obj, key, value)
     obj.save()

oscar/apps/order/abstract_models.py

@@ -97,7 +97,7 @@ class AbstractOrder(models.Model):
         """
         Return all possible statuses for an order
         """
-        return cls.pipeline.keys()
+        return list(cls.pipeline.keys())
 
     def available_statuses(self):
         """
@@ -497,7 +497,7 @@ class AbstractLine(models.Model):
         """
         Return all possible statuses for an order line
         """
-        return cls.pipeline.keys()
+        return list(cls.pipeline.keys())
 
     def available_statuses(self):
         """

oscar/core/application.py

@@ -1,5 +1,3 @@
-import six
-
 from oscar.core.loading import feature_hidden
 from oscar.views.decorators import permissions_required
 
@@ -26,7 +24,7 @@ class Application(object):
     def __init__(self, app_name=None, **kwargs):
         self.app_name = app_name
         # Set all kwargs as object attributes
-        for key, value in six.iteritems(kwargs):
+        for key, value in kwargs.items():
             setattr(self, key, value)
 
     def get_urls(self):

oscar/forms/widgets.py

@@ -73,7 +73,7 @@ def datetime_format_to_js_date_format(format):
         '%d': 'dd',
         '%H:%M': '',
     }
-    for search, replace in six.iteritems(replacements):
+    for search, replace in replacements.items():
         converted = converted.replace(search, replace)
     return converted.strip()
 
@@ -91,7 +91,7 @@ def datetime_format_to_js_time_format(format):
         '%H': 'HH',
         '%M': 'mm',
     }
-    for search, replace in six.iteritems(replacements):
+    for search, replace in replacements.items():
         converted = converted.replace(search, replace)
 
     converted = re.sub('[-/][^%]', '', converted)

oscar/templatetags/image_tags.py

@@ -1,5 +1,3 @@
-import six
-
 from django import template
 from django.conf import settings
 from django.db.models.fields.files import ImageFieldFile
@@ -50,7 +48,7 @@ class DynamicImageNode(template.Node):
             ext = path[path.rfind('.') + 1:]
             ext_changed = False
 
-            for key, v in six.iteritems(self.params):
+            for key, v in self.params.items():
                 value = v.resolve(context)
                 if key == u'format':
                     ext = value