use new under_score ox api, oxdjango->ox.django

edgware/editor/views.py

@@ -3,8 +3,8 @@ from files.models import *
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
-from oxdjango.decorators import login_required_json
-from oxdjango.shortcuts import get_object_or_404_json
+from ox.django.decorators import login_required_json
+from ox.django.shortcuts import get_object_or_404_json
 try:
   import json
 except:

edgware/files/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 from tagging.fields import TagField
-from oxdjango.fields import DictField
+from ox.django.fileds import DictField
 from tagging.models import Tag
 from django.contrib.auth.models import User, Group, Permission
 import os
@@ -12,7 +12,7 @@ from utils.add_file import hashFile, fileInfo, getFileType
 from django.core.files.base import ContentFile
 import operator
 from django.db.models import Q
-from ox.text import smartSplit
+import ox
 from sorl.thumbnail import get_thumbnail
 
 #FIXME: The following two functions are ridiculous. please remove and clean up all references to them.
@@ -26,7 +26,7 @@ def extFileName(filename):
 
 def splitSearch(string):
   ret = []
-  for s in smartSplit(string):
+  for s in ox.smart_split(string):
     word = s.replace("'", "").replace('"', '')
     ret.append(word)
   return ret

requirements.txt

@@ -1,5 +1,4 @@
 # -e svn+http://code.djangoproject.com/svn/django/trunk/#egg=django
--e bzr+http://code.0xdb.org/python-oxdjango/#egg=python-oxdjango
 -e svn+http://django-tagging.googlecode.com/svn/trunk/#egg=tagging
 -e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg
 -e bzr+http://firefogg.org/dev/django_firefogg/#egg=django_firefogg