Python 3 fixes caught by python-modernize

python-modernize (https://github.com/mitsuhiko/python-modernize) is a
useful wrapper around 2to3 which comes with sane defaults.

The fixes below were generated by running

    python-modernize --compat-unicode -w .

and then fixing all lint errors.

oscar/apps/address/abstract_models.py

@@ -7,6 +7,7 @@ from django.core import exceptions
 
 from oscar.core.compat import AUTH_USER_MODEL
 from oscar.models.fields import UppercaseCharField, PhoneNumberField
+from six.moves import filter
 
 
 class AbstractAddress(models.Model):

oscar/apps/catalogue/reviews/abstract_models.py

@@ -39,7 +39,7 @@ class AbstractProductReview(models.Model):
     email = models.EmailField(_("Email"), null=True, blank=True)
     homepage = models.URLField(_("URL"), null=True, blank=True)
 
-    FOR_MODERATION, APPROVED, REJECTED = range(0, 3)
+    FOR_MODERATION, APPROVED, REJECTED = list(range(0, 3))
     STATUS_CHOICES = (
         (FOR_MODERATION, _("Requires moderation")),
         (APPROVED, _("Approved")),

oscar/apps/customer/forms.py

@@ -5,7 +5,6 @@ from django import forms
 from django.conf import settings
 from django.contrib.auth import forms as auth_forms
 from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import get_current_site
 from django.core import validators
 from django.core.exceptions import ObjectDoesNotExist

oscar/apps/dashboard/catalogue/widgets.py

@@ -3,6 +3,8 @@ from django.forms.util import flatatt
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
 from django import forms
+from six.moves import filter
+from six.moves import map
 
 
 class ProductSelect(forms.Widget):

oscar/apps/dashboard/ranges/models.py

@@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.db import models
 from django.utils.timezone import now
 from oscar.core.compat import AUTH_USER_MODEL
+from six.moves import filter
 
 Product = models.get_model('catalogue', 'Product')
 

oscar/apps/dashboard/reports/csv_utils.py

@@ -82,7 +82,7 @@ class CsvUnicodeReader(object):
         self.reader = csv.reader(f, dialect=dialect, **kwargs)
 
     def next(self):
-        row = self.reader.next()
+        row = six.advance_iterator(self.reader)
         return [six.text_type(s).encode("utf-8") for s in row]
 
     def __iter__(self):

oscar/apps/dashboard/views.py

@@ -123,7 +123,7 @@ class IndexView(TemplateView):
 
             y_range = []
             y_axis_steps = max_value / D(str(segments))
-            for idx in reversed(range(segments + 1)):
+            for idx in reversed(list(range(segments + 1))):
                 y_range.append(idx * y_axis_steps)
         else:
             y_range = []

oscar/apps/offer/models.py

@@ -1208,7 +1208,7 @@ class ApplicationResult(object):
     # (a) Give a discount off the BASKET total
     # (b) Give a discount off the SHIPPING total
     # (a) Trigger a post-order action
-    BASKET, SHIPPING, POST_ORDER = range(0, 3)
+    BASKET, SHIPPING, POST_ORDER = list(range(0, 3))
     affects = None
 
     @property

oscar/apps/payment/bankcards.py

@@ -1,3 +1,4 @@
+from six.moves import map
 VISA, VISA_ELECTRON, MASTERCARD, AMEX, MAESTRO, DISCOVER = (
     'Visa', 'Visa Electron', 'Mastercard', 'American Express',
     'Maestro', 'Discover')
@@ -16,19 +17,19 @@ CARD_TYPES = [
     (DINERS_CLUB, (14,), ('300', '301', '302', '303', '304', '305')),
     (DINERS_CLUB, (14,), ('36',)),
     (DISCOVER, (16,),
-     list(map(str, range(622126, 622926))) +
-     list(map(str, range(644, 650))) + ['6011', '65']),
-    (JCB, (16,), map(str, range(3528, 3590))),
-    (LASER, range(16, 20), ('6304', '6706', '6771', '6709')),
-    (MAESTRO, range(12, 20), ('5018', '5020', '5038', '5893', '6304',
-                              '6759', '6761', '6762', '6763', '0604')),
-    (MASTERCARD, (16,), list(map(str, range(51, 56)))),
+     list(map(str, list(range(622126, 622926)))) +
+     list(map(str, list(range(644, 650)))) + ['6011', '65']),
+    (JCB, (16,), map(str, list(range(3528, 3590)))),
+    (LASER, list(range(16, 20)), ('6304', '6706', '6771', '6709')),
+    (MAESTRO, list(range(12, 20)), ('5018', '5020', '5038', '5893', '6304',
+                                    '6759', '6761', '6762', '6763', '0604')),
+    (MASTERCARD, (16,), list(map(str, list(range(51, 56))))),
     # Diners Club cards match the same pattern as Mastercard.  They are treated
     # as Mastercard normally so we put the mastercard pattern first.
     (DINERS_CLUB, (16,), ('54', '55')),
-    (SOLO, range(16, 20), ('6334', '6767')),
-    (SWITCH, range(16, 20), ('4903', '4905', '4911', '4936',
-                             '564182', '633110', '6333', '6759')),
+    (SOLO, list(range(16, 20)), ('6334', '6767')),
+    (SWITCH, list(range(16, 20)), ('4903', '4905', '4911', '4936',
+                                   '564182', '633110', '6333', '6759')),
     (VISA, (13, 16), ('4',)),
     (VISA_ELECTRON, (16,), ('4026', '417500', '4405', '4508',
                             '4844', '4913', '4917')),

oscar/apps/search/facets.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from purl import URL
+from six.moves import map
 
 
 def facet_data(request, form, results):  # noqa (too complex (10))

oscar/core/ajax.py

@@ -1,5 +1,6 @@
 import six
 from django.contrib import messages
+from six.moves import map
 
 
 class FlashMessages(object):

oscar/core/compat.py

@@ -4,6 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.utils import six
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
+from six.moves import map
 
 
 def get_user_model():
@@ -73,7 +74,8 @@ urlparse = _urlparse
 # Code from http://python3porting.com/problems.html
 # Classes renamed to include CSV. Unused 'codecs' import is dropped.
 
-import sys, csv
+import sys
+import csv
 
 PY3 = sys.version > '3'
 

oscar/management/commands/oscar_fork_statics.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+from __future__ import print_function
 import logging
 import os
 import shutil
@@ -30,10 +32,10 @@ class Command(BaseCommand):
 
         source = os.path.realpath(
             os.path.join(os.path.dirname(__file__), '../../static'))
-        print "Copying Oscar's static files to %s" % (destination,)
+        print("Copying Oscar's static files to %s" % (destination,))
         shutil.copytree(source, destination)
 
         # Check if this new folder is in STATICFILES_DIRS
         if destination not in settings.STATICFILES_DIRS:
-            print ("You need to add %s to STATICFILES_DIRS in order for your "
-                   "local overrides to be picked up") % destination
+            print(("You need to add %s to STATICFILES_DIRS in order for your "
+                   "local overrides to be picked up") % destination)

oscar/management/commands/oscar_generate_email_content.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from django.core.management.base import BaseCommand, CommandError
 from django.db.models import get_model
 
@@ -26,5 +27,5 @@ class Command(BaseCommand):
         }
         messages = CommunicationEventType.objects.get_and_render(
             args[0], ctx)
-        print "Subject: %s\nBody:\n\n%s\nBody HTML:\n\n%s" % (
-            messages['subject'], messages['body'], messages['html'])
+        print("Subject: %s\nBody:\n\n%s\nBody HTML:\n\n%s" % (
+            messages['subject'], messages['body'], messages['html']))

oscar/profiling/decorators.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+from __future__ import print_function
 import cProfile
 import pstats
 import time
@@ -18,11 +20,11 @@ def profile(fn):
         result = prof.runcall(fn, *args, **kwargs)
         duration = time.time() - start
 
-        print "Function ran in %.6f seconds - output written to %s" % (
-            duration, filepath)
+        print("Function ran in %.6f seconds - output written to %s" % (
+            duration, filepath))
         prof.dump_stats(filepath)
 
-        print "Printing stats"
+        print("Printing stats")
         stats = pstats.Stats(filepath)
         stats.sort_stats('cumulative')
         stats.print_stats()

oscar/profiling/middleware.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+from __future__ import print_function
 import sys
 import tempfile
 import hotshot
@@ -13,10 +15,10 @@ def profile_this(fn):
         filepath = "/tmp/%s.profile" % fn.__name__
         prof = cProfile.Profile()
         ret = prof.runcall(fn, *args, **kwargs)
-        print "Writing to %s" % filepath
+        print("Writing to %s" % filepath)
         prof.dump_stats(filepath)
 
-        print "Printing stats"
+        print("Printing stats")
         stats = pstats.Stats(filepath)
         stats.sort_stats('cumulative')
         stats.print_stats()

oscar/templatetags/category_tags.py

@@ -102,7 +102,7 @@ class CategoryTreeNode(template.Node):
             # Update previous node's info
             info['has_children'] = prev_depth is None or depth > prev_depth
             if prev_depth is not None and depth < prev_depth:
-                info['num_to_close'] = range(0, prev_depth - depth)
+                info['num_to_close'] = list(range(0, prev_depth - depth))
 
             info = {'num_to_close': [],
                     'level': depth - start_depth}
@@ -111,7 +111,7 @@ class CategoryTreeNode(template.Node):
 
         if prev_depth is not None:
             # close last leaf
-            info['num_to_close'] = range(0, prev_depth - start_depth)
+            info['num_to_close'] = list(range(0, prev_depth - start_depth))
             info['has_children'] = prev_depth > prev_depth
 
         return annotated_categories

oscar/views/generic.py

@@ -12,6 +12,7 @@ from django.views.generic.base import View
 
 import phonenumbers
 from oscar.core.phonenumber import PhoneNumber
+from six.moves import map
 
 
 class PostActionMixin(object):

runtests.py

@@ -35,6 +35,7 @@ import logging
 import warnings
 
 from tests.config import configure
+from six.moves import map
 
 # No logging
 logging.disable(logging.CRITICAL)

setup.py

@@ -6,6 +6,7 @@ To release a new version to PyPi:
 - Ensure the version is correctly set in oscar.__init__.py
 - Run: python setup.py sdist upload
 """
+from __future__ import print_function
 
 from setuptools import setup, find_packages
 import os
@@ -94,4 +95,4 @@ if len(sys.argv) > 1 and sys.argv[1] == 'develop':
         "    %s\n\nHappy hacking!") % (mailing_list, mailing_list_url,
                                        docs_url, twitter_url)
     line = '=' * 82
-    print("\n%s\n%s\n%s" % (line, msg, line))
+    print(("\n%s\n%s\n%s" % (line, msg, line)))

sites/demo/apps/bigbang/management/commands/import_product_images.py

@@ -1,6 +1,8 @@
+from __future__ import print_function
+from __future__ import print_function
 import os
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from django.core.files import File
 from PIL import Image
 
@@ -26,11 +28,11 @@ class Command(BaseCommand):
 
     def import_image(self, filepath):
         try:
-	    trial = Image.open(filepath)
+            trial = Image.open(filepath)
             trial.verify()
         except IOError:
-            print "%s is not a valid image file" % filepath
-	    return
+            print("%s is not a valid image file" % filepath)
+            return
 
         filename = os.path.basename(filepath)
         name, __ = os.path.splitext(filename)
@@ -44,7 +46,7 @@ class Command(BaseCommand):
         try:
             product = models.Product.objects.get(upc=upc)
         except Exception:
-            print "Product not found: %s" % upc
+            print("Product not found: %s" % upc)
             return
         try:
             product_image = models.ProductImage.objects.get(

sites/demo/apps/order/processing.py

@@ -39,7 +39,7 @@ class EventHandler(processing.EventHandler):
             datacash_ref = f.fulfill_transaction(
                 order.number, amount, txn.datacash_reference,
                 txn.auth_code)
-        except exceptions.PaymentError, e:
+        except exceptions.PaymentError as e:
             self.create_note(order, "Attempt to settle %.2f failed: %s" % (
                 amount, e))
             raise

sites/demo/urls.py

@@ -5,7 +5,7 @@ from django.conf.urls.static import static
 from stores.app import application as stores_app
 from stores.dashboard.app import application as dashboard_app
 
-from apps.app import application
+from .apps.app import application
 from datacash.dashboard.app import application as datacash_app
 
 # These need to be imported into this namespace

sites/sandbox/settings_mysql.py

@@ -1,4 +1,4 @@
-from settings import *
+from .settings import *
 
 DATABASES = {
     'default': {

sites/sandbox/settings_postgres.py

@@ -1,4 +1,4 @@
-from settings import *
+from .settings import *
 
 DATABASES = {
     'default': {

sites/sandbox/settings_sphinx.py

@@ -1,4 +1,4 @@
-from settings import *
+from .settings import *
 
 # Remove debug toolbar
 try: