# HG changeset patch # User verrierj # Date 1325518021 -3600 # Node ID c45aed3c7a89a78e271e349040bbc1cf0d73484b # Parent 45d028517c34a60c8cc1a756097fcf8247eca966 Remove unused imports in views diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/content.py --- a/src/ldt/ldt/ldt_utils/views/content.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/content.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,42 +1,21 @@ from django.conf import settings from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group -from django.core.cache import cache +from django.contrib.auth.models import Group from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.db.models import Q from django.forms.models import model_to_dict from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) -from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) +from django.http import HttpResponse +from django.shortcuts import render_to_response from django.template import RequestContext -from django.template.loader import render_to_string -from django.utils import simplejson -from django.utils.html import escape from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) -from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) -from ldt.security.cache import get_cached_checker, cached_assign -from lxml.html import fragment_fromstring -#from models import Media, Project -from ldt.ldt_utils.projectserializer import ProjectSerializer +from ldt.ldt_utils.forms import ContentForm, MediaForm +from guardian.shortcuts import remove_perm +from ldt.ldt_utils.models import Content, Media +from ldt.security.utils import assign_perm_to_obj, add_change_attr, get_userlist, get_userlist_model, get_userlist_group +from ldt.security.cache import cached_assign from urllib2 import urlparse -from operator import itemgetter -from itertools import groupby -import base64 -import django.core.urlresolvers -import ldt.auth as ldt_auth import ldt.utils.path as ldt_utils_path import logging -import lxml.etree import mimetypes import os import urllib2 @@ -44,9 +23,6 @@ import re import datetime - - - def write_content_base(request, iri_id=None): if iri_id: diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/group.py --- a/src/ldt/ldt/ldt_utils/views/group.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/group.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,48 +1,13 @@ from django.conf import settings from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group -from django.core.cache import cache -from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.db.models import Q -from django.forms.models import model_to_dict -from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) -from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) +from django.contrib.auth.models import Group +from django.http import HttpResponseServerError +from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from django.template.loader import render_to_string -from django.utils import simplejson -from django.utils.html import escape -from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) +from ldt.ldt_utils.forms import GroupAddForm from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) +from ldt.security.utils import add_change_attr, get_userlist, get_userlist_group from ldt.security.cache import get_cached_checker, cached_assign -from lxml.html import fragment_fromstring -#from models import Media, Project -from ldt.ldt_utils.projectserializer import ProjectSerializer -from urllib2 import urlparse -from operator import itemgetter -from itertools import groupby -import base64 -import django.core.urlresolvers -import ldt.auth as ldt_auth -import ldt.utils.path as ldt_utils_path -import logging -import lxml.etree -import mimetypes -import os -import urllib2 -import subprocess -import re -import datetime @login_required diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/json.py --- a/src/ldt/ldt/ldt_utils/views/json.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/json.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,49 +1,12 @@ from django.conf import settings -from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group -from django.core.cache import cache -from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.db.models import Q -from django.forms.models import model_to_dict -from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) -from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) -from django.template import RequestContext -from django.template.loader import render_to_string +from django.http import HttpResponse, HttpResponseForbidden +from django.shortcuts import get_object_or_404, get_list_or_404 from django.utils import simplejson from django.utils.html import escape -from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) -from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) -from ldt.security.cache import get_cached_checker, cached_assign -from lxml.html import fragment_fromstring -#from models import Media, Project +from django.utils.translation import ugettext as _ +from ldt.ldt_utils.models import Project from ldt.ldt_utils.projectserializer import ProjectSerializer -from urllib2 import urlparse -from operator import itemgetter -from itertools import groupby -import base64 -import django.core.urlresolvers import ldt.auth as ldt_auth -import ldt.utils.path as ldt_utils_path -import logging -import lxml.etree -import mimetypes -import os -import urllib2 -import subprocess -import re -import datetime - def project_json_id(request, id): diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/lignesdetemps.py --- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,50 +1,15 @@ from django.conf import settings from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group -from django.core.cache import cache from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.db.models import Q -from django.forms.models import model_to_dict -from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) -from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) +from django.http import HttpResponse, HttpResponseRedirect +from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from django.template.loader import render_to_string -from django.utils import simplejson -from django.utils.html import escape -from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) -from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) -from ldt.security.cache import get_cached_checker, cached_assign -from lxml.html import fragment_fromstring -#from models import Media, Project -from ldt.ldt_utils.projectserializer import ProjectSerializer -from urllib2 import urlparse -from operator import itemgetter -from itertools import groupby +from ldt.ldt_utils.models import Content, Project +from ldt.ldt_utils.utils import LdtUtils, LdtSearch +from ldt.security.utils import set_forbidden_stream import base64 import django.core.urlresolvers -import ldt.auth as ldt_auth -import ldt.utils.path as ldt_utils_path -import logging import lxml.etree -import mimetypes -import os -import urllib2 -import subprocess -import re -import datetime - - def search_index_get(request, field, query): diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/project.py --- a/src/ldt/ldt/ldt_utils/views/project.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/project.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,48 +1,20 @@ from django.conf import settings from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group -from django.core.cache import cache +from django.contrib.auth.models import Group from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.db.models import Q -from django.forms.models import model_to_dict -from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) -from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) +from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError +from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from django.template.loader import render_to_string from django.utils import simplejson -from django.utils.html import escape -from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) -from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) -from ldt.security.cache import get_cached_checker, cached_assign -from lxml.html import fragment_fromstring -#from models import Media, Project -from ldt.ldt_utils.projectserializer import ProjectSerializer -from urllib2 import urlparse -from operator import itemgetter -from itertools import groupby -import base64 -import django.core.urlresolvers -import ldt.auth as ldt_auth -import ldt.utils.path as ldt_utils_path -import logging +from django.utils.translation import ugettext as _ +from ldt.ldt_utils.forms import LdtAddForm, AddProjectForm, CopyProjectForm +from guardian.shortcuts import get_objects_for_group, get_objects_for_user +from ldt.ldt_utils.models import Content, Project +from ldt.ldt_utils.utils import boolean_convert +from ldt.security.utils import (assign_perm_to_obj, add_change_attr, get_userlist, + get_userlist_model) import lxml.etree -import mimetypes -import os -import urllib2 -import subprocess -import re -import datetime @login_required diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/rdf.py --- a/src/ldt/ldt/ldt_utils/views/rdf.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/rdf.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,48 +1,10 @@ -from django.conf import settings -from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group -from django.core.cache import cache -from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.db.models import Q -from django.forms.models import model_to_dict -from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) -from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) -from django.template import RequestContext -from django.template.loader import render_to_string -from django.utils import simplejson -from django.utils.html import escape -from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) -from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) -from ldt.security.cache import get_cached_checker, cached_assign -from lxml.html import fragment_fromstring -#from models import Media, Project +from django.http import HttpResponse, HttpResponseForbidden +from django.utils.translation import ugettext as _ +from ldt.ldt_utils.models import Project from ldt.ldt_utils.projectserializer import ProjectSerializer -from urllib2 import urlparse -from operator import itemgetter -from itertools import groupby -import base64 -import django.core.urlresolvers import ldt.auth as ldt_auth -import ldt.utils.path as ldt_utils_path import logging import lxml.etree -import mimetypes -import os -import urllib2 -import subprocess -import re -import datetime def project_annotations_rdf(request, ldt_id): diff -r 45d028517c34 -r c45aed3c7a89 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Mon Jan 02 16:17:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Mon Jan 02 16:27:01 2012 +0100 @@ -1,48 +1,28 @@ from django.conf import settings from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group from django.core.cache import cache from django.core.urlresolvers import reverse from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.db.models import Q -from django.forms.models import model_to_dict -from django.forms.util import ErrorList -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden, HttpResponseServerError) +from django.http import (HttpResponseRedirect, HttpResponseForbidden ) from ldt.indexation import get_results_with_context, highlight_documents -from django.shortcuts import (render_to_response, get_object_or_404, - get_list_or_404) +from django.shortcuts import render_to_response from django.template import RequestContext from django.template.loader import render_to_string -from django.utils import simplejson from django.utils.html import escape -from django.utils.translation import ugettext as _, ungettext -from ldt.ldt_utils.forms import (LdtAddForm, SearchForm, AddProjectForm, CopyProjectForm, - ContentForm, MediaForm, GroupAddForm) -from guardian.shortcuts import remove_perm, get_objects_for_group, get_objects_for_user -from ldt.ldt_utils.models import Content, Media, Project -from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch -from ldt.security.utils import (assign_perm_to_obj, set_forbidden_stream, - add_change_attr, get_userlist, get_userlist_model, get_userlist_group) -from ldt.security.cache import get_cached_checker, cached_assign +from django.utils.translation import ugettext as _ +from ldt.ldt_utils.forms import SearchForm +from ldt.ldt_utils.models import Content, Project +from ldt.ldt_utils.utils import boolean_convert +from ldt.security.utils import add_change_attr, get_userlist from lxml.html import fragment_fromstring -#from models import Media, Project from ldt.ldt_utils.projectserializer import ProjectSerializer -from urllib2 import urlparse from operator import itemgetter from itertools import groupby import base64 import django.core.urlresolvers import ldt.auth as ldt_auth -import ldt.utils.path as ldt_utils_path -import logging import lxml.etree -import mimetypes -import os -import urllib2 -import subprocess -import re -import datetime @login_required