towards supporting python 2 and 3

- use absolute_imports
- make use of six.moves
- use exec instead of execfile
- use list(dict) instead if dict.keys()

pandora/title/managers.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
+
+from six import string_types
 from django.db.models import Q, Manager
 
 from item.utils import decode_id
@@ -46,7 +48,7 @@ def parseCondition(condition, user):
             return q
     if k == 'id':
         v = decode_id(v)
-    elif isinstance(v, unicode):
+    elif isinstance(v, string_types):
         v = unicodedata.normalize('NFKD', v).lower()
     if isinstance(v, bool):
         key = k

pandora/title/models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-from __future__ import division, with_statement
+from __future__ import division, print_function, absolute_import
 
 import unicodedata
 
@@ -10,11 +10,11 @@ import ox
 
 from item import utils
 
-import managers
+from . import managers
 
 def get_title_sort(title):
-    if isinstance(title, str):
-        title = unicode(title)
+    if isinstance(title, bytes):
+        title = title.decde('utf-8')
     title = unicodedata.normalize('NFKD', title).strip()
     if title:
         title, created = Title.objects.get_or_create(title=title)
@@ -70,7 +70,7 @@ class Title(models.Model):
             'sorttitle': self.sorttitle,
         }
         if keys:
-            for key in j.keys():
+            for key in list(j):
                 if key not in keys:
                     del j[key]
         return j

pandora/title/views.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-from __future__ import division
+from __future__ import division, print_function, absolute_import
+
 import unicodedata
 
 import ox
@@ -14,7 +15,7 @@ from item import utils
 from user.decorators import capability_required_json
 from changelog.models import add_changelog
 
-import models
+from . import models
 
 
 @capability_required_json('canManageTitlesAndNames')