Skip to content

Commit 6e83335

Browse files
committed
Fix a bunch of mistakes found by PyFlakes in the new materials code
- Legacy-Id: 7839
1 parent b56b8de commit 6e83335

8 files changed

Lines changed: 12 additions & 24 deletions

File tree

ietf/doc/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def get_document_content(key, filename, split=True, markup=True):
214214
try:
215215
with open(filename, 'rb') as f:
216216
raw_content = f.read()
217-
except IOError as e:
217+
except IOError:
218218
error = "Error; cannot read ("+key+")"
219219
return error
220220

ietf/doc/views_material.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# views for managing group materials (slides, ...)
2-
import re
32
import os
43
import datetime
5-
import shutil
64

75
from django import forms
86
from django.shortcuts import render, get_object_or_404, redirect
9-
from django.http import HttpResponse, HttpResponseForbidden, Http404, HttpResponseRedirect
7+
from django.http import HttpResponseForbidden, Http404
108
from django.utils.html import mark_safe
119
from django.utils.text import slugify
1210
from django.contrib.auth.decorators import login_required
@@ -19,7 +17,6 @@
1917
from ietf.doc.utils import add_state_change_event
2018
from ietf.group.models import Group
2119
from ietf.group.utils import can_manage_materials
22-
from ietf.ietfauth.utils import has_role
2320

2421
@login_required
2522
def choose_material_type(request, acronym):

ietf/group/edit.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,15 @@
99
from django.shortcuts import render, get_object_or_404, redirect
1010
from django.http import HttpResponse, HttpResponseForbidden, Http404, HttpResponseRedirect
1111
from django.utils.html import mark_safe
12-
from django.utils.text import slugify
1312
from django.contrib.auth.decorators import login_required
14-
from django.core.urlresolvers import reverse as urlreverse
1513

1614
import debug # pyflakes:ignore
1715

18-
from ietf.doc.models import Document, DocAlias, DocTagName, DocTypeName, DocEvent, State
19-
from ietf.doc.models import NewRevisionDocEvent, save_document_in_history
20-
from ietf.doc.utils import get_tags_for_stream_id, add_state_change_event
16+
from ietf.doc.models import Document, DocAlias, DocTagName, State, save_document_in_history
17+
from ietf.doc.utils import get_tags_for_stream_id
2118
from ietf.group.models import ( Group, Role, GroupEvent, GroupHistory, GroupStateName,
2219
GroupStateTransitions, GroupTypeName, GroupURL, ChangeStateGroupEvent )
23-
from ietf.group.utils import save_group_in_history, can_manage_group_type, can_manage_materials
20+
from ietf.group.utils import save_group_in_history, can_manage_group_type
2421
from ietf.group.utils import get_group_or_404
2522
from ietf.ietfauth.utils import has_role
2623
from ietf.person.forms import EmailsField

ietf/group/feeds.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def title(self, obj):
2222
def link(self, obj):
2323
if not obj:
2424
raise FeedDoesNotExist
25-
return group.about_url()
25+
return obj.about_url()
2626

2727
def description(self, obj):
2828
return self.title(obj)
@@ -40,7 +40,7 @@ def item_link(self, obj):
4040
if isinstance(obj, DocEvent):
4141
return urlreverse("doc_view", kwargs={'name': obj.doc_id })
4242
elif isinstance(obj, GroupEvent):
43-
return group.about_url()
43+
return obj.group.about_url()
4444

4545
def item_pubdate(self, obj):
4646
return obj.time

ietf/group/info.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
import os
3636
import itertools
3737
from tempfile import mkstemp
38-
import glob
3938
from collections import OrderedDict
4039

41-
from django.shortcuts import get_object_or_404, render
40+
from django.shortcuts import render
4241
from django.template.loader import render_to_string
4342
from django.http import HttpResponse, Http404, HttpResponseRedirect
4443
from django.conf import settings

ietf/group/migrations/0007_auto__add_field_group_description__add_field_grouphistory_description.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
2-
from south.utils import datetime_utils as datetime
32
from south.db import db
43
from south.v2 import SchemaMigration
5-
from django.db import models
64

75

86
class Migration(SchemaMigration):
@@ -314,4 +312,4 @@ def backwards(self, orm):
314312
}
315313
}
316314

317-
complete_apps = ['group']
315+
complete_apps = ['group']

ietf/group/milestones.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import json
66

77
from django import forms
8-
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseBadRequest, HttpResponseRedirect
9-
from django.shortcuts import render, get_object_or_404, redirect
8+
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseBadRequest, HttpResponseRedirect, Http404
9+
from django.shortcuts import render, redirect
1010
from django.contrib.auth.decorators import login_required
1111

1212
from ietf.doc.models import Document, DocEvent
1313
from ietf.doc.utils import get_chartering_type
14-
from ietf.group.models import Group, GroupMilestone, MilestoneGroupEvent
14+
from ietf.group.models import GroupMilestone, MilestoneGroupEvent
1515
from ietf.group.utils import (save_milestone_in_history, can_manage_group_type, milestone_reviewer_for_group_type,
1616
get_group_or_404)
1717
from ietf.name.models import GroupMilestoneStateName

ietf/name/migrations/0020_sort_role_names.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
from south.utils import datetime_utils as datetime
3-
from south.db import db
42
from south.v2 import DataMigration
5-
from django.db import models
63

74
class Migration(DataMigration):
85

0 commit comments

Comments
 (0)