diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py index ddbcf59d2..ed1d0a247 100644 --- a/ietf/doc/utils.py +++ b/ietf/doc/utils.py @@ -214,7 +214,7 @@ def get_document_content(key, filename, split=True, markup=True): try: with open(filename, 'rb') as f: raw_content = f.read() - except IOError as e: + except IOError: error = "Error; cannot read ("+key+")" return error diff --git a/ietf/doc/views_material.py b/ietf/doc/views_material.py index 4e462fb6e..235fcbb08 100644 --- a/ietf/doc/views_material.py +++ b/ietf/doc/views_material.py @@ -1,12 +1,10 @@ # views for managing group materials (slides, ...) -import re import os import datetime -import shutil from django import forms from django.shortcuts import render, get_object_or_404, redirect -from django.http import HttpResponse, HttpResponseForbidden, Http404, HttpResponseRedirect +from django.http import HttpResponseForbidden, Http404 from django.utils.html import mark_safe from django.utils.text import slugify from django.contrib.auth.decorators import login_required @@ -19,7 +17,6 @@ from ietf.doc.models import NewRevisionDocEvent, save_document_in_history from ietf.doc.utils import add_state_change_event from ietf.group.models import Group from ietf.group.utils import can_manage_materials -from ietf.ietfauth.utils import has_role @login_required def choose_material_type(request, acronym): diff --git a/ietf/group/edit.py b/ietf/group/edit.py index 7e3739acb..a346d27c1 100644 --- a/ietf/group/edit.py +++ b/ietf/group/edit.py @@ -9,18 +9,15 @@ from django import forms from django.shortcuts import render, get_object_or_404, redirect from django.http import HttpResponse, HttpResponseForbidden, Http404, HttpResponseRedirect from django.utils.html import mark_safe -from django.utils.text import slugify from django.contrib.auth.decorators import login_required -from django.core.urlresolvers import reverse as urlreverse import debug # pyflakes:ignore -from ietf.doc.models import Document, DocAlias, DocTagName, DocTypeName, DocEvent, State -from ietf.doc.models import NewRevisionDocEvent, save_document_in_history -from ietf.doc.utils import get_tags_for_stream_id, add_state_change_event +from ietf.doc.models import Document, DocAlias, DocTagName, State, save_document_in_history +from ietf.doc.utils import get_tags_for_stream_id from ietf.group.models import ( Group, Role, GroupEvent, GroupHistory, GroupStateName, GroupStateTransitions, GroupTypeName, GroupURL, ChangeStateGroupEvent ) -from ietf.group.utils import save_group_in_history, can_manage_group_type, can_manage_materials +from ietf.group.utils import save_group_in_history, can_manage_group_type from ietf.group.utils import get_group_or_404 from ietf.ietfauth.utils import has_role from ietf.person.forms import EmailsField diff --git a/ietf/group/feeds.py b/ietf/group/feeds.py index 2a09314e4..cda603e23 100644 --- a/ietf/group/feeds.py +++ b/ietf/group/feeds.py @@ -22,7 +22,7 @@ class GroupChangesFeed(Feed): def link(self, obj): if not obj: raise FeedDoesNotExist - return group.about_url() + return obj.about_url() def description(self, obj): return self.title(obj) @@ -40,7 +40,7 @@ class GroupChangesFeed(Feed): if isinstance(obj, DocEvent): return urlreverse("doc_view", kwargs={'name': obj.doc_id }) elif isinstance(obj, GroupEvent): - return group.about_url() + return obj.group.about_url() def item_pubdate(self, obj): return obj.time diff --git a/ietf/group/info.py b/ietf/group/info.py index 332a2c5d6..9c0a2e262 100644 --- a/ietf/group/info.py +++ b/ietf/group/info.py @@ -35,10 +35,9 @@ import os import itertools from tempfile import mkstemp -import glob from collections import OrderedDict -from django.shortcuts import get_object_or_404, render +from django.shortcuts import render from django.template.loader import render_to_string from django.http import HttpResponse, Http404, HttpResponseRedirect from django.conf import settings diff --git a/ietf/group/migrations/0007_auto__add_field_group_description__add_field_grouphistory_description.py b/ietf/group/migrations/0007_auto__add_field_group_description__add_field_grouphistory_description.py index e9266e459..3291e98ec 100644 --- a/ietf/group/migrations/0007_auto__add_field_group_description__add_field_grouphistory_description.py +++ b/ietf/group/migrations/0007_auto__add_field_group_description__add_field_grouphistory_description.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration -from django.db import models class Migration(SchemaMigration): @@ -314,4 +312,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['group'] \ No newline at end of file + complete_apps = ['group'] diff --git a/ietf/group/milestones.py b/ietf/group/milestones.py index a82e1a637..1778e316c 100644 --- a/ietf/group/milestones.py +++ b/ietf/group/milestones.py @@ -5,13 +5,13 @@ import calendar import json from django import forms -from django.http import HttpResponse, HttpResponseForbidden, HttpResponseBadRequest, HttpResponseRedirect -from django.shortcuts import render, get_object_or_404, redirect +from django.http import HttpResponse, HttpResponseForbidden, HttpResponseBadRequest, HttpResponseRedirect, Http404 +from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required from ietf.doc.models import Document, DocEvent from ietf.doc.utils import get_chartering_type -from ietf.group.models import Group, GroupMilestone, MilestoneGroupEvent +from ietf.group.models import GroupMilestone, MilestoneGroupEvent from ietf.group.utils import (save_milestone_in_history, can_manage_group_type, milestone_reviewer_for_group_type, get_group_or_404) from ietf.name.models import GroupMilestoneStateName diff --git a/ietf/name/migrations/0020_sort_role_names.py b/ietf/name/migrations/0020_sort_role_names.py index e15a11004..29252a226 100644 --- a/ietf/name/migrations/0020_sort_role_names.py +++ b/ietf/name/migrations/0020_sort_role_names.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db from south.v2 import DataMigration -from django.db import models class Migration(DataMigration):