# HG changeset patch # User ymh # Date 1352214296 -3600 # Node ID ba611074ecb2c86907386b1c76c87f38e35aa6f0 # Parent 2f1fa9b1aa58ad773bfe3cb4cb11b49ceb642446 Clean import and some unused variables diff -r 2f1fa9b1aa58 -r ba611074ecb2 src/ldt/ldt/ldt_utils/views/content.py --- a/src/ldt/ldt/ldt_utils/views/content.py Tue Nov 06 15:52:04 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/content.py Tue Nov 06 16:04:56 2012 +0100 @@ -1,38 +1,38 @@ from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.auth.models import Group +from django.core.files import File from django.core.urlresolvers import reverse +from django.db import transaction from django.forms.models import model_to_dict -from django.core.files import File -from django.db import transaction -#from django.core.files.temp import NamedTemporaryFile from django.forms.util import ErrorList from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, redirect from django.template import RequestContext from django.utils.translation import ugettext as _, ungettext +from guardian.shortcuts import remove_perm from ldt.ldt_utils.forms import ContentForm, MediaForm -from guardian.shortcuts import remove_perm from ldt.ldt_utils.models import Content, Media, Project -from ldt.security.utils import assign_perm_to_obj, add_change_attr, get_userlist, get_userlist_model from ldt.security.cache import cached_assign +from ldt.security.utils import (assign_perm_to_obj, add_change_attr, get_userlist, + get_userlist_model) from ldt.user.forms import PictureForm from tagging.models import Tag, TaggedItem +import datetime import ldt.utils.path as ldt_utils_path import logging +import math import mimetypes -import os, stat -import urllib2 -import subprocess +import os import re -import datetime -import math import requests -import django.utils.simplejson as simplejson -import urlparse +import subprocess +import sys import tempfile import traceback -import sys +import urllib2 +import urlparse +#from django.core.files.temp import NamedTemporaryFile @transaction.commit_manually def write_content_base(request, iri_id=None): @@ -284,7 +284,7 @@ form_status = 'error' except Exception, e: transaction.rollback() - type, value, tb = sys.exc_info() + __, value, tb = sys.exc_info() errors_transaction.append(e) errors_transaction.append(traceback.format_tb(tb)) return False, False, False, False, False, errors_transaction @@ -412,7 +412,6 @@ def prepare_delete_content(request, iri_id=None): errors = [] titles = [] - delete = False message={} if not iri_id: iri_id = request.REQUEST.get("iri_id", None)