Should be unneeded with Python 2.7 and up. Added some unicode_literals along the way.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16783 bcc190cf-cafb-0310-a4f2-bffc1f526a37