diff --git a/oxdb/backend/load.py b/oxdb/backend/load.py index fd86bbda..3ab4d650 100644 --- a/oxdb/backend/load.py +++ b/oxdb/backend/load.py @@ -2,14 +2,16 @@ # vi:si:et:sw=4:sts=4:ts=4 import random import os.path + from django.db import models from django.contrib.auth.models import User -import oxweb.imdb from oxlib import stripTags, findRe +import oxweb.imdb import models + def debug(*msgs): for m in msgs: print m, diff --git a/oxdb/backend/models.py b/oxdb/backend/models.py index 92423cef..dacb08a7 100644 --- a/oxdb/backend/models.py +++ b/oxdb/backend/models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 -import re +from datetime import datetime import os.path import random -from datetime import datetime +import re from django.db import models from django.db.models import Q @@ -11,14 +11,15 @@ from django.contrib.auth.models import User from django.core.files.base import ContentFile from django.utils import simplejson as json +from oxdjango import fields import oxlib from oxlib import stripTags from oxlib.normalize import canonicalTitle, canonicalName -from oxdjango import fields -import utils import managers import load +import utils + class MovieImdb(models.Model): created = models.DateTimeField(auto_now_add=True) diff --git a/oxdb/backend/views.py b/oxdb/backend/views.py index 611c03ed..e8da9031 100644 --- a/oxdb/backend/views.py +++ b/oxdb/backend/views.py @@ -6,27 +6,29 @@ from datetime import datetime from urllib2 import unquote import json -from django.db.models import Q, Avg, Count +from django import forms +from django.core.paginator import Paginator +from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User +from django.db.models import Q, Avg, Count +from django.http import HttpResponse from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404 from django.template import RequestContext -from django.core.paginator import Paginator -from django import forms -from django.http import HttpResponse -from django.contrib.auth.decorators import login_required + try: import simplejson as json except ImportError: from django.utils import simplejson as json -from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json + from oxdjango.decorators import login_required_json +from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json import models import utils from daemon import send_bg_message -from oxuser.views import api_login, api_logout, api_register, api_recover, api_preferences from oxuser.models import getUserJSON +from oxuser.views import api_login, api_logout, api_register, api_recover, api_preferences def api(request): diff --git a/oxdb/oxuser/models.py b/oxdb/oxuser/models.py index cdf0419f..16756965 100644 --- a/oxdb/oxuser/models.py +++ b/oxdb/oxuser/models.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 +from django.contrib.auth.models import User from django.db import models -from django.contrib.auth.models import User -from django.utils import simplejson as json - -from django.contrib.auth.models import User from django.db.models import signals from django.dispatch import dispatcher +from django.utils import simplejson as json class UserProfile(models.Model): diff --git a/oxdb/oxuser/views.py b/oxdb/oxuser/views.py index e8bebec3..1ee61613 100644 --- a/oxdb/oxuser/views.py +++ b/oxdb/oxuser/views.py @@ -3,12 +3,12 @@ import uuid import hashlib +from django import forms from django.contrib.auth.models import User from django.contrib.auth import authenticate, login, logout from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404 from django.template import RequestContext, loader, Context from django.utils import simplejson as json -from django import forms from oxdjango.shortcuts import render_to_json_response from oxdjango.decorators import login_required_json