diff --git a/ietf/secr/ipradmin/forms.py b/ietf/secr/ipradmin/forms.py index e31154847..301761f57 100644 --- a/ietf/secr/ipradmin/forms.py +++ b/ietf/secr/ipradmin/forms.py @@ -6,7 +6,7 @@ from django import forms from django.utils.safestring import mark_safe from django.forms.formsets import formset_factory -from ietf.ipr.models import IprDetail, IprContact, LICENSE_CHOICES, IprUpdate, SELECT_CHOICES, IprDocAlias +from ietf.ipr.models import IprDetail, IprContact, LICENSE_CHOICES, IprUpdate, IprDocAlias from ietf.doc.models import DocAlias from ietf.secr.utils.document import get_rfc_num @@ -175,7 +175,7 @@ class IprDetailForm(BetterModelForm): for id in ids: try: objects.append(model.objects.get(pk=id)) - except model.DoesNotExist, e: + except model.DoesNotExist: raise forms.ValidationError("%s not found for id %d" %(model._meta.verbose_name, id)) return objects diff --git a/ietf/secr/ipradmin/models.py b/ietf/secr/ipradmin/models.py index 6c1324693..8b1378917 100644 --- a/ietf/secr/ipradmin/models.py +++ b/ietf/secr/ipradmin/models.py @@ -1 +1 @@ -from ietf.ipr.models import * + diff --git a/ietf/secr/ipradmin/tests.py b/ietf/secr/ipradmin/tests.py index 2f9d44b99..dcaad7bb8 100644 --- a/ietf/secr/ipradmin/tests.py +++ b/ietf/secr/ipradmin/tests.py @@ -1,17 +1,15 @@ from django.core.urlresolvers import reverse -from ietf.utils import TestCase -from ietf.doc.models import Document +from ietf.utils import TestCase from ietf.utils.test_data import make_test_data -from pyquery import PyQuery SECR_USER='secretary' class MainTestCase(TestCase): def test_main(self): "Main Test" - draft = make_test_data() + make_test_data() url = reverse('ipradmin') response = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEqual(response.status_code, 301) diff --git a/ietf/secr/ipradmin/views.py b/ietf/secr/ipradmin/views.py index d34607a4a..422340a6d 100644 --- a/ietf/secr/ipradmin/views.py +++ b/ietf/secr/ipradmin/views.py @@ -38,8 +38,6 @@ def admin_list(request): def admin_post(request, ipr_id, from_page, command): - updated_ipr_id = 0 - ipr_dtl = IprDetail.objects.get(ipr_id=ipr_id) ipr_dtl.status = 1 #assert False, (ipr_dtl.ipr_id, ipr_dtl.is_pending) @@ -47,7 +45,6 @@ def admin_post(request, ipr_id, from_page, command): updates = ipr_dtl.updates.filter(processed=0) for update in updates: - updated_ipr_id = update.updated.ipr_id old_ipr = IprDetail.objects.get(ipr_id=update.updated.ipr_id) updated_title = re.sub(r' \(\d\)$', '', old_ipr.title) lc_updated_title = updated_title.lower()