inline django 1.9 version of ox.django

pandora/text/managers.py

@@ -2,7 +2,7 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 
-from ox.django.query import QuerySet
+from oxdjango.query import QuerySet
 
 def parseCondition(condition, user):
     '''

pandora/text/migrations/0001_initial.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import ox.django.fields
+import oxdjango.fields
 import text.models
 
 
@@ -39,8 +39,8 @@ class Migration(migrations.Migration):
                 ('rightslevel', models.IntegerField(db_index=True, default=0)),
                 ('icon', models.ImageField(blank=True, default=None, upload_to=text.models.get_icon_path)),
                 ('text', models.TextField(default=b'')),
-                ('embeds', ox.django.fields.TupleField(default=[])),
-                ('poster_frames', ox.django.fields.TupleField(default=[], editable=False)),
+                ('embeds', oxdjango.fields.TupleField(default=[])),
+                ('poster_frames', oxdjango.fields.TupleField(default=[], editable=False)),
                 ('uploading', models.BooleanField(default=False)),
                 ('file', models.FileField(blank=True, default=None, null=True, upload_to=text.models.get_path)),
                 ('subscribed_users', models.ManyToManyField(related_name='subscribed_texts', to=settings.AUTH_USER_MODEL)),

pandora/text/models.py

@@ -13,7 +13,7 @@ from django.contrib.auth.models import User
 from django.conf import settings
 from django.db.models.signals import pre_delete
 import ox
-from ox.django.fields import TupleField
+from oxdjango.fields import TupleField
 
 from archive import extract
 from archive.chunk import save_chunk

pandora/text/views.py

@@ -6,10 +6,10 @@ import re
 
 import ox
 from ox.utils import json
-from ox.django.api import actions
-from ox.django.decorators import login_required_json
-from ox.django.http import HttpFileResponse
-from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
+from oxdjango.api import actions
+from oxdjango.decorators import login_required_json
+from oxdjango.http import HttpFileResponse
+from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json, json_response
 from django import forms
 from django.db.models import Sum, Max
 from django.conf import settings