From 2a551bb35b405ae0ab14b952383c7ccadbc581cd Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 15 Mar 2014 17:02:52 +0000 Subject: [PATCH] Made ietf/group/ pyflakes-clean. - Legacy-Id: 7465 --- ietf/group/admin.py | 4 ++-- ietf/group/ajax.py | 4 +--- ...event__del_field_groupmilestone_expected_due_d.py | 1 - ietf/group/migrations/0003_fixup_milestone.py | 2 -- ...estone_done_date__del_field_groupmilestone_don.py | 2 -- .../0005_auto__add_groupmilestonehistory.py | 1 - ...006_auto__chg_field_groupmilestonehistory_time.py | 2 -- ietf/group/models.py | 7 +++---- ietf/group/stream_urls.py | 2 +- ietf/group/tests.py | 12 ++---------- ietf/group/urls.py | 2 +- ietf/group/utils.py | 3 ++- ietf/group/views_stream.py | 12 ++++++------ 13 files changed, 18 insertions(+), 36 deletions(-) diff --git a/ietf/group/admin.py b/ietf/group/admin.py index cbadce285..25a3c42c4 100644 --- a/ietf/group/admin.py +++ b/ietf/group/admin.py @@ -1,7 +1,7 @@ from functools import update_wrapper -from django.contrib import admin from django import template +from django.contrib import admin from django.contrib.admin.util import unquote from django.core.exceptions import PermissionDenied from django.core.management import load_command_class @@ -11,7 +11,7 @@ from django.utils.encoding import force_unicode from django.utils.html import escape from django.utils.translation import ugettext as _ -from ietf.group.models import * +from ietf.group.models import Group, GroupHistory, GroupEvent, GroupURL, GroupMilestone, Role, RoleHistory, ChangeStateGroupEvent class RoleInline(admin.TabularInline): model = Role diff --git a/ietf/group/ajax.py b/ietf/group/ajax.py index feb516512..3490b1208 100644 --- a/ietf/group/ajax.py +++ b/ietf/group/ajax.py @@ -1,9 +1,7 @@ -import datetime -import logging import json +from django.http import HttpResponse from django.shortcuts import get_object_or_404 -from django.http import HttpResponse, Http404 from ietf.group.models import Group diff --git a/ietf/group/migrations/0002_auto__add_milestonegroupevent__del_field_groupmilestone_expected_due_d.py b/ietf/group/migrations/0002_auto__add_milestonegroupevent__del_field_groupmilestone_expected_due_d.py index b7b05efc2..52919a4cd 100644 --- a/ietf/group/migrations/0002_auto__add_milestonegroupevent__del_field_groupmilestone_expected_due_d.py +++ b/ietf/group/migrations/0002_auto__add_milestonegroupevent__del_field_groupmilestone_expected_due_d.py @@ -1,5 +1,4 @@ # encoding: utf-8 -import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models diff --git a/ietf/group/migrations/0003_fixup_milestone.py b/ietf/group/migrations/0003_fixup_milestone.py index 8abdc3d6f..79e4277c3 100644 --- a/ietf/group/migrations/0003_fixup_milestone.py +++ b/ietf/group/migrations/0003_fixup_milestone.py @@ -1,8 +1,6 @@ # encoding: utf-8 import datetime -from south.db import db from south.v2 import DataMigration -from django.db import models class Migration(DataMigration): diff --git a/ietf/group/migrations/0004_auto__del_field_groupmilestone_done_date__del_field_groupmilestone_don.py b/ietf/group/migrations/0004_auto__del_field_groupmilestone_done_date__del_field_groupmilestone_don.py index e08a26e94..b020853ec 100644 --- a/ietf/group/migrations/0004_auto__del_field_groupmilestone_done_date__del_field_groupmilestone_don.py +++ b/ietf/group/migrations/0004_auto__del_field_groupmilestone_done_date__del_field_groupmilestone_don.py @@ -1,8 +1,6 @@ # encoding: utf-8 -import datetime from south.db import db from south.v2 import SchemaMigration -from django.db import models class Migration(SchemaMigration): diff --git a/ietf/group/migrations/0005_auto__add_groupmilestonehistory.py b/ietf/group/migrations/0005_auto__add_groupmilestonehistory.py index 394e83cd3..f79637368 100644 --- a/ietf/group/migrations/0005_auto__add_groupmilestonehistory.py +++ b/ietf/group/migrations/0005_auto__add_groupmilestonehistory.py @@ -1,5 +1,4 @@ # encoding: utf-8 -import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models diff --git a/ietf/group/migrations/0006_auto__chg_field_groupmilestonehistory_time.py b/ietf/group/migrations/0006_auto__chg_field_groupmilestonehistory_time.py index 26ca5b139..bd66b5d0e 100644 --- a/ietf/group/migrations/0006_auto__chg_field_groupmilestonehistory_time.py +++ b/ietf/group/migrations/0006_auto__chg_field_groupmilestonehistory_time.py @@ -1,8 +1,6 @@ # encoding: utf-8 -import datetime from south.db import db from south.v2 import SchemaMigration -from django.db import models class Migration(SchemaMigration): diff --git a/ietf/group/models.py b/ietf/group/models.py index 89e579cd6..7ea66a8d1 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -1,15 +1,14 @@ # Copyright The IETF Trust 2007, All Rights Reserved +import datetime from urlparse import urljoin from django.db import models -from django.db.models import Q -from ietf.name.models import * -from ietf.person.models import Email, Person from ietf.group.colors import fg_group_colors, bg_group_colors +from ietf.name.models import GroupStateName, GroupTypeName, DocTagName, GroupMilestoneStateName, RoleName +from ietf.person.models import Email, Person -import datetime import debug # pyflakes:ignore class GroupInfo(models.Model): diff --git a/ietf/group/stream_urls.py b/ietf/group/stream_urls.py index 743206416..3d9712b4b 100644 --- a/ietf/group/stream_urls.py +++ b/ietf/group/stream_urls.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2008, All Rights Reserved -from django.conf.urls import patterns, include +from django.conf.urls import patterns import views_stream diff --git a/ietf/group/tests.py b/ietf/group/tests.py index 73c50beb7..0ac1da8ef 100644 --- a/ietf/group/tests.py +++ b/ietf/group/tests.py @@ -1,17 +1,9 @@ -import os, shutil, datetime -import django.test from django.core.urlresolvers import reverse as urlreverse -from pyquery import PyQuery - -from ietf.utils.mail import outbox -from ietf.utils.test_utils import login_testing_unauthorized, TestCase +from ietf.group.models import Role from ietf.utils.test_data import make_test_data - -from ietf.name.models import * -from ietf.group.models import * -from ietf.person.models import * +from ietf.utils.test_utils import login_testing_unauthorized, TestCase class StreamTests(TestCase): def test_streams(self): diff --git a/ietf/group/urls.py b/ietf/group/urls.py index 2615324f3..97ea99157 100644 --- a/ietf/group/urls.py +++ b/ietf/group/urls.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2007, All Rights Reserved -from django.conf.urls import patterns, url +from django.conf.urls import patterns urlpatterns = patterns('', (r'^(?P[a-z0-9]+).json$', 'ietf.group.ajax.group_json'), diff --git a/ietf/group/utils.py b/ietf/group/utils.py index 82f63a611..bd79c7dce 100644 --- a/ietf/group/utils.py +++ b/ietf/group/utils.py @@ -2,7 +2,8 @@ import os from django.conf import settings -from ietf.group.models import * +from ietf.group.models import Group, RoleHistory +from ietf.person.models import Email from ietf.utils.history import get_history_object_for, copy_many_to_many_for_history diff --git a/ietf/group/views_stream.py b/ietf/group/views_stream.py index 0d6ff44d3..26a452a90 100644 --- a/ietf/group/views_stream.py +++ b/ietf/group/views_stream.py @@ -1,17 +1,17 @@ # Copyright The IETF Trust 2008, All Rights Reserved from django.shortcuts import render_to_response, get_object_or_404, redirect -from django.template import RequestContext, loader -from django.http import Http404, HttpResponse, HttpResponseForbidden +from django.template import RequestContext +from django.http import Http404, HttpResponseForbidden from django import forms -from ietf.group.models import * -from ietf.group.utils import * -from ietf.doc.models import Document from ietf.doc.views_search import SearchForm, retrieve_search_results -from ietf.name.models import StreamName +from ietf.group.models import Group, GroupEvent, Role +from ietf.group.utils import save_group_in_history from ietf.ietfauth.utils import has_role +from ietf.name.models import StreamName from ietf.person.forms import EmailsField +from ietf.person.models import Email import debug # pyflakes:ignore