inline django 1.9 version of ox.django

pandora/entity/managers.py

@@ -3,7 +3,7 @@
 from django.db.models import Q, Manager
 
 import ox
-from ox.django.query import QuerySet
+from oxdjango.query import QuerySet
 
 
 def namePredicate(op, value):

pandora/entity/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
 
 
 class Migration(migrations.Migration):
@@ -36,8 +36,8 @@ class Migration(migrations.Migration):
                 ('modified', models.DateTimeField(auto_now=True)),
                 ('type', models.CharField(max_length=255)),
                 ('name', models.CharField(max_length=255)),
-                ('alternativeNames', ox.django.fields.TupleField(default=[])),
-                ('data', ox.django.fields.DictField(default={}, editable=False)),
+                ('alternativeNames', oxdjango.fields.TupleField(default=[])),
+                ('data', oxdjango.fields.DictField(default={}, editable=False)),
                 ('matches', models.IntegerField(default=0)),
                 ('name_sort', models.CharField(max_length=255, null=True)),
                 ('name_find', models.TextField(default=b'')),

pandora/entity/models.py

@@ -14,7 +14,7 @@ from django.db.models.signals import pre_delete, post_init
 from django.conf import settings
 
 import ox
-from ox.django import fields
+from oxdjango import fields
 
 from person.models import get_name_sort
 from item.utils import get_by_id

pandora/entity/views.py

@@ -4,10 +4,10 @@ from __future__ import division
 
 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, HttpErrorJson
+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, HttpErrorJson
 
 from django import forms
 from django.conf import settings