Python 2/3 port: stage2: all tests passing with Django 1.5.8 on Python 3.3 and Python 2.6/2.7.

.travis.yml

@@ -5,6 +5,11 @@ env:
 python:
   - "2.6"
   - "2.7"
+  - "3.3"
+matrix:
+  exclude:
+     - python: "3.3"
+       env: DJANGO_VERSION=1.4.8
 install:
   - pip install django==$DJANGO_VERSION --use-mirrors
   - pip install . --use-mirrors

docs/conf.py

@@ -11,6 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from __future__ import unicode_literals
+
 import sys
 import os
 

mezzanine/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 
 __version__ = "1.4.16"

mezzanine/accounts/__init__.py

@@ -5,6 +5,7 @@
 setting. Some utility functions for probing the profile model are
 included below.
 """
+from __future__ import unicode_literals
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

mezzanine/accounts/admin.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.contrib import admin
 

mezzanine/accounts/defaults.py

@@ -9,6 +9,7 @@
 that are only read during startup shouldn't be editable, since changing
 them would require an application reload.
 """
+from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 

mezzanine/accounts/forms.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.contrib.auth import authenticate
 from django.db.models import Q

mezzanine/accounts/models.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+from future.builtins import str
 
 from django.db import connection
 from django.db.models.signals import post_save

mezzanine/accounts/templatetags/accounts_tags.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.utils.datastructures import SortedDict
 
@@ -73,7 +74,7 @@ def profile_fields(user):
             if field.name not in ("id", user_fieldname) + exclude:
                 value = getattr(profile, field.name)
                 fields[field.verbose_name.title()] = value
-    return fields.items()
+    return list(fields.items())
 
 
 @register.filter

mezzanine/accounts/tests.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.contrib.auth.tokens import default_token_generator
 from django.core import mail

mezzanine/accounts/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.conf.urls import patterns, url
 

mezzanine/accounts/views.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.contrib.auth import (authenticate, login as auth_login,
                                                logout as auth_logout)

mezzanine/bin/__init__.py

@@ -1,3 +1,4 @@
 """
 Provides scripts for building and working with Mezzanine.
 """
+from __future__ import unicode_literals

mezzanine/bin/mezzanine_project.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
+from future.builtins import open
 
 from distutils.dir_util import copy_tree
 from optparse import OptionParser

mezzanine/blog/__init__.py

@@ -2,5 +2,6 @@
 Provides a blogging app with posts, keywords, categories and comments.
 Posts can be listed by month, keyword, category or author.
 """
+from __future__ import unicode_literals
 
 from mezzanine import __version__

mezzanine/blog/admin.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from copy import deepcopy
 

mezzanine/blog/defaults.py

@@ -9,6 +9,7 @@
 that are only read during startup shouldn't be editable, since changing
 them would require an application reload.
 """
+from __future__ import unicode_literals
 
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _

mezzanine/blog/feeds.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse

mezzanine/blog/forms.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django import forms
 

mezzanine/blog/management/base.py

@@ -1,6 +1,10 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
+from future.builtins import input, int
 from optparse import make_option
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse
+except:
+    from urlparse import urlparse
 
 from django.contrib.redirects.models import Redirect
 from django.contrib.sites.models import Site
@@ -128,7 +132,7 @@ def trunc(self, model, prompt, **fields):
                 continue
             while len(value) > max_length:
                 encoded_value = value.encode("utf-8")
-                new_value = raw_input("The value for the field %s.%s exceeds "
+                new_value = input("The value for the field %s.%s exceeds "
                     "its maximum length of %s chars: %s\n\nEnter a new value "
                     "for it, or press return to have it truncated: " %
                     (model.__name__, field_name, max_length, encoded_value))

mezzanine/blog/management/commands/import_blogger.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from datetime import datetime, timedelta
 from optparse import make_option

mezzanine/blog/management/commands/import_posterous.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from datetime import datetime
 import json

mezzanine/blog/management/commands/import_rss.py

@@ -1,9 +1,15 @@
+from __future__ import unicode_literals
+from future import standard_library
 
 from datetime import timedelta
 from optparse import make_option
 from time import timezone
-from urllib import urlopen
-from urlparse import urljoin
+try:
+    from urllib.request import urlopen
+    from urllib.parse import urljoin
+except ImportError:
+    from urllib import urlopen
+    from urlparse import urljoin
 
 from django.core.management.base import CommandError
 

mezzanine/blog/management/commands/import_tumblr.py

@@ -1,9 +1,14 @@
 from __future__ import print_function
+from __future__ import unicode_literals
+from future.builtins import int
 
 from datetime import datetime
 from optparse import make_option
 from time import sleep
-from urllib import urlopen
+try:
+    from urllib.request import urlopen
+except ImportError:
+    from urllib import urlopen
 
 from django.core.management.base import CommandError
 from django.utils.html import strip_tags

mezzanine/blog/management/commands/import_wordpress.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+from future.builtins import int
 
 from collections import defaultdict
 from datetime import datetime, timedelta

mezzanine/blog/migrations/0001_initial.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0002_auto.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0003_categories.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import DataMigration

mezzanine/blog/migrations/0004_auto__del_field_blogpost_category.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0005_auto__del_comment__add_field_blogpost_comments_count__chg_field_blogpo.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0006_auto__del_field_blogpost__keywords__add_field_blogpost_keywords_string.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0007_auto__add_field_blogpost_site.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0008_auto__add_field_blogpost_rating_average__add_field_blogpost_rating_cou.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0009_auto__chg_field_blogpost_content.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0010_category_site_allow_comments.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0011_comment_site_data.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import DataMigration

mezzanine/blog/migrations/0012_auto__add_field_blogpost_featured_image.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0013_auto__chg_field_blogpost_featured_image.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0014_auto__add_field_blogpost_gen_description.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0015_auto__chg_field_blogcategory_title__chg_field_blogcategory_slug__chg_f.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import unicode_literals
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration

mezzanine/blog/migrations/0016_add_field_blogpost__meta_title.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 import datetime
 from south.db import db

mezzanine/blog/migrations/0017_add_field_blogpost__related_posts.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 import datetime
 from south.db import db

mezzanine/blog/migrations/0018_auto__add_field_blogpost_in_sitemap.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 import datetime
 from south.db import db

mezzanine/blog/migrations/0019_auto__add_field_blogpost_rating_sum.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 import datetime
 from south.db import db

mezzanine/blog/migrations/0020_auto__add_field_blogpost_created__add_field_blogpost_updated.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 import datetime
 from south.db import db

mezzanine/blog/models.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+from future.builtins import str
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 

mezzanine/blog/templatetags/blog_tags.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from datetime import datetime
 
 from django.db.models import Count, Q

mezzanine/blog/tests.py

@@ -1,5 +1,10 @@
+from __future__ import unicode_literals
+from future import standard_library
 
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
 
 from django.core.urlresolvers import reverse
 from django.utils.unittest import skipUnless

mezzanine/blog/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.conf.urls import patterns, url
 

mezzanine/blog/views.py

@@ -1,3 +1,6 @@
+from __future__ import unicode_literals
+from future.builtins import str
+from future.builtins import int
 from calendar import month_name
 
 from django.http import Http404
@@ -39,7 +42,7 @@ def blog_post_list(request, tag=None, year=None, month=None, username=None,
         category = get_object_or_404(BlogCategory, slug=category)
         blog_posts = blog_posts.filter(categories=category)
         templates.append(u"blog/blog_post_list_%s.html" %
-                          unicode(category.slug))
+                          str(category.slug))
     author = None
     if username is not None:
         author = get_object_or_404(User, username=username)
@@ -67,7 +70,7 @@ def blog_post_detail(request, slug, year=None, month=None, day=None,
                                      for_user=request.user).select_related()
     blog_post = get_object_or_404(blog_posts, slug=slug)
     context = {"blog_post": blog_post, "editable_obj": blog_post}
-    templates = [u"blog/blog_post_detail_%s.html" % unicode(slug), template]
+    templates = [u"blog/blog_post_detail_%s.html" % str(slug), template]
     return render(request, templates, context)
 
 

mezzanine/boot/__init__.py

@@ -8,6 +8,7 @@
 custom fields not being available when custom admin classes are
 registered.
 """
+from __future__ import unicode_literals
 
 from collections import defaultdict
 

mezzanine/boot/lazy_admin.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 from django.contrib.admin.sites import AdminSite