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/log/models.py

@@ -1,12 +1,12 @@
 # -*- 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
 
 from django.db import models
 from django.contrib.auth.models import User
 import ox
 
-import managers
+from . import managers
 
 class Log(models.Model):
     created = models.DateTimeField(auto_now_add=True, db_index=True)
@@ -32,7 +32,7 @@ class Log(models.Model):
             'user': self.user and self.user.username or '',
         }
         if keys:
-            for key in j.keys():
+            for key in list(j):
                 if key not in keys:
                     del j[key]
         return j

pandora/log/tasks.py

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
+from __future__ import division, print_function, absolute_import
+
 from datetime import timedelta, datetime
 
 from celery.task import periodic_task
 
-import models
+from . import models
 
 @periodic_task(run_every=timedelta(days=1), queue='encoding')
 def cronjob(**kwargs):

pandora/log/utils.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 logging
 import sys
@@ -19,7 +19,7 @@ class ErrorHandler(logging.Handler):
         import traceback
         from django.views.debug import ExceptionReporter
         from django.conf import settings
-        import models
+        from . import models
         user = None
         line = 0
         text = ''

pandora/log/views.py

@@ -1,6 +1,6 @@
 # -*- 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 ox
 from ox.utils import json
@@ -12,7 +12,7 @@ from oxdjango.api import actions
 
 from item import utils
 
-import models
+from . import models
 
 
 def logError(request, data):