diff --git a/ietf/ipr/admin.py b/ietf/ipr/admin.py index 41fa7ca16..32e777d5a 100644 --- a/ietf/ipr/admin.py +++ b/ietf/ipr/admin.py @@ -1,7 +1,6 @@ #coding: utf-8 from django.contrib import admin -from django.conf import settings -from ietf.ipr.models import * +from ietf.ipr.models import IprContact, IprDetail, IprDocAlias, IprNotification, IprUpdate class IprContactAdmin(admin.ModelAdmin): list_display=('__str__', 'ipr') diff --git a/ietf/ipr/new.py b/ietf/ipr/new.py index ca075c724..cc5c47203 100644 --- a/ietf/ipr/new.py +++ b/ietf/ipr/new.py @@ -190,8 +190,7 @@ def new(request, type, update=None, submitter=None): for subfield in ["name", "title", "department", "address1", "address2", "telephone", "fax", "email"]: try: data[ "subm_%s" % subfield ] = data[ "%s_%s" % (src,subfield) ] - except Exception, e: - #log("Caught exception: %s"%e) + except Exception: pass form = IprForm(data) if form.is_valid(): diff --git a/ietf/ipr/search.py b/ietf/ipr/search.py index bd79e02f2..c6bc544c3 100644 --- a/ietf/ipr/search.py +++ b/ietf/ipr/search.py @@ -11,7 +11,7 @@ from django.conf import settings from ietf.ipr.models import IprDocAlias, IprDetail from ietf.ipr.related import related_docs -from ietf.utils import log, normalize_draftname +from ietf.utils import normalize_draftname from ietf.group.models import Group from ietf.doc.models import DocAlias diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py index 71c90234c..084013cc8 100644 --- a/ietf/ipr/tests.py +++ b/ietf/ipr/tests.py @@ -1,5 +1,5 @@ -import os, datetime, shutil - +import os +import shutil import urllib from pyquery import PyQuery @@ -7,10 +7,10 @@ from pyquery import PyQuery from django.conf import settings from django.core.urlresolvers import reverse as urlreverse -from ietf.utils.test_utils import TestCase, login_testing_unauthorized +from ietf.doc.models import DocAlias +from ietf.ipr.models import IprDetail +from ietf.utils.test_utils import TestCase from ietf.utils.test_data import make_test_data -from ietf.utils.mail import outbox -from ietf.ipr.models import * class IprTests(TestCase): @@ -33,7 +33,7 @@ class IprTests(TestCase): self.assertTrue(ipr.title in r.content) def test_ipr_details(self): - draft = make_test_data() + make_test_data() ipr = IprDetail.objects.get(title="Statement regarding rights") r = self.client.get(urlreverse("ipr_show", kwargs=dict(ipr_id=ipr.pk))) @@ -148,7 +148,7 @@ class IprTests(TestCase): self.assertTrue("/ipr/%s/" % ipr.pk in r.content) def test_new_generic(self): - draft = make_test_data() + make_test_data() url = urlreverse("ietf.ipr.new.new", kwargs={ "type": "generic" }) diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py index 8ff0c2297..40bad412c 100644 --- a/ietf/ipr/views.py +++ b/ietf/ipr/views.py @@ -4,13 +4,11 @@ import os from django.shortcuts import render_to_response as render, get_object_or_404 from django.template import RequestContext -from django.template.loader import render_to_string from django.http import HttpResponse, Http404 from django.conf import settings from ietf.ipr.models import IprDetail, IprDocAlias, SELECT_CHOICES, LICENSE_CHOICES from ietf.ipr.view_sections import section_list_for_ipr -from ietf.doc.models import Document def about(request): return render("ipr/disclosure.html", {}, context_instance=RequestContext(request))