diff --git a/ietf/submit/admin.py b/ietf/submit/admin.py index 19e7a8113..63661cc6b 100644 --- a/ietf/submit/admin.py +++ b/ietf/submit/admin.py @@ -1,8 +1,8 @@ from django.core.urlresolvers import reverse as urlreverse from django.contrib import admin -from django.utils.safestring import mark_safe -from ietf.submit.models import * + +from ietf.submit.models import Preapproval, Submission class SubmissionAdmin(admin.ModelAdmin): list_display = ['id', 'draft_link', 'status_link', 'submission_date',] diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py index 7758450a3..fc941f748 100644 --- a/ietf/submit/forms.py +++ b/ietf/submit/forms.py @@ -2,23 +2,21 @@ import os import datetime from django import forms -from django.forms.formsets import formset_factory from django.conf import settings from django.utils.html import mark_safe from django.core.urlresolvers import reverse as urlreverse import debug # pyflakes:ignore -from ietf.group.models import Group, Role +from ietf.group.models import Group from ietf.doc.models import Document from ietf.meeting.models import Meeting -from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName +from ietf.submit.models import Submission, Preapproval from ietf.submit.utils import validate_submission_rev, validate_submission_document_date from ietf.submit.parsers.pdf_parser import PDFParser from ietf.submit.parsers.plain_parser import PlainParser from ietf.submit.parsers.ps_parser import PSParser from ietf.submit.parsers.xml_parser import XMLParser -from ietf.utils.mail import send_mail from ietf.utils.draft import Draft diff --git a/ietf/submit/migrations/0001_initial.py b/ietf/submit/migrations/0001_initial.py index a183304da..cb77231ca 100644 --- a/ietf/submit/migrations/0001_initial.py +++ b/ietf/submit/migrations/0001_initial.py @@ -1,8 +1,7 @@ -# 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/submit/migrations/0002_auto__add_field_idsubmissiondetail_replaces.py b/ietf/submit/migrations/0002_auto__add_field_idsubmissiondetail_replaces.py index efb20af25..80c09343b 100644 --- a/ietf/submit/migrations/0002_auto__add_field_idsubmissiondetail_replaces.py +++ b/ietf/submit/migrations/0002_auto__add_field_idsubmissiondetail_replaces.py @@ -1,8 +1,5 @@ -# 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/submit/migrations/0003_turn_nulls_into_empty_strings.py b/ietf/submit/migrations/0003_turn_nulls_into_empty_strings.py index 4030ab46b..cc087e675 100644 --- a/ietf/submit/migrations/0003_turn_nulls_into_empty_strings.py +++ b/ietf/submit/migrations/0003_turn_nulls_into_empty_strings.py @@ -1,8 +1,4 @@ -# 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/submit/migrations/0004_fixup_idsubmissiondetail_fields.py b/ietf/submit/migrations/0004_fixup_idsubmissiondetail_fields.py index 298abaf72..e8e192efd 100644 --- a/ietf/submit/migrations/0004_fixup_idsubmissiondetail_fields.py +++ b/ietf/submit/migrations/0004_fixup_idsubmissiondetail_fields.py @@ -1,8 +1,7 @@ -# encoding: utf-8 import datetime from south.db import db from south.v2 import SchemaMigration -from django.db import models + class Migration(SchemaMigration): depends_on = ( diff --git a/ietf/submit/migrations/0005_fill_in_new_fields.py b/ietf/submit/migrations/0005_fill_in_new_fields.py index 0c47a81c3..53b137bdd 100644 --- a/ietf/submit/migrations/0005_fill_in_new_fields.py +++ b/ietf/submit/migrations/0005_fill_in_new_fields.py @@ -1,6 +1,3 @@ -# encoding: utf-8 -import datetime -from south.db import db from south.v2 import DataMigration from django.db import models @@ -21,8 +18,6 @@ class Migration(DataMigration): 10: "grp-appr", } - from django.core.validators import validate_email, ValidationError - for d in orm.Submission.objects.all().iterator(): if not d.name: # get rid of a few mishaps that seem to have been @@ -42,7 +37,6 @@ class Migration(DataMigration): parts = (a.first_name or '', a.middle_initial or '', a.last_name or '', a.name_suffix or '') name = u" ".join(x.strip() for x in parts if x.strip()) email = a.email_address - orig = email # clean name = name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip() diff --git a/ietf/submit/migrations/0006_auto__del_tempidauthors__del_idsubmissionstatus__del_field_submission_.py b/ietf/submit/migrations/0006_auto__del_tempidauthors__del_idsubmissionstatus__del_field_submission_.py index 7269d3c93..d071cd612 100644 --- a/ietf/submit/migrations/0006_auto__del_tempidauthors__del_idsubmissionstatus__del_field_submission_.py +++ b/ietf/submit/migrations/0006_auto__del_tempidauthors__del_idsubmissionstatus__del_field_submission_.py @@ -1,8 +1,5 @@ -# 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/submit/models.py b/ietf/submit/models.py index 27184fe45..4ad216592 100644 --- a/ietf/submit/models.py +++ b/ietf/submit/models.py @@ -1,6 +1,6 @@ -import re, datetime, hashlib +import re +import datetime -from django.conf import settings from django.db import models from ietf.person.models import Person diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py index 4070e175d..63207e137 100644 --- a/ietf/submit/tests.py +++ b/ietf/submit/tests.py @@ -4,7 +4,7 @@ import shutil import re from django.conf import settings -from django.contrib.auth.models import User + from django.core.urlresolvers import reverse as urlreverse from StringIO import StringIO from pyquery import PyQuery @@ -13,12 +13,10 @@ from ietf.utils.test_utils import login_testing_unauthorized from ietf.utils.test_data import make_test_data from ietf.utils.mail import outbox from ietf.utils.test_utils import TestCase - from ietf.submit.utils import expirable_submissions, expire_submission - -from ietf.person.models import Person, Email -from ietf.group.models import Group, Role -from ietf.doc.models import * +from ietf.person.models import Person +from ietf.group.models import Group +from ietf.doc.models import Document, DocEvent, State, BallotDocEvent, BallotPositionDocEvent from ietf.submit.models import Submission, Preapproval class SubmitTests(TestCase): @@ -315,7 +313,7 @@ class SubmitTests(TestCase): self.assertEqual(new_revision.by.name, "Submitter Name") def test_submit_new_wg_with_dash(self): - draft = make_test_data() + make_test_data() group = Group.objects.create(acronym="mars-special", name="Mars Special", type_id="wg", state_id="active") @@ -326,7 +324,7 @@ class SubmitTests(TestCase): self.assertEqual(Submission.objects.get(name=name).group.acronym, group.acronym) def test_submit_new_irtf(self): - draft = make_test_data() + make_test_data() group = Group.objects.create(acronym="saturnrg", name="Saturn", type_id="rg", state_id="active") @@ -338,7 +336,7 @@ class SubmitTests(TestCase): self.assertEqual(Submission.objects.get(name=name).group.type_id, group.type_id) def test_submit_new_iab(self): - draft = make_test_data() + make_test_data() name = "draft-iab-testing-tests" @@ -348,7 +346,7 @@ class SubmitTests(TestCase): def test_cancel_submission(self): # submit -> cancel - draft = make_test_data() + make_test_data() name = "draft-ietf-mars-testing-tests" rev = "00" @@ -370,7 +368,7 @@ class SubmitTests(TestCase): def test_edit_submission_and_force_post(self): # submit -> edit - draft = make_test_data() + make_test_data() name = "draft-ietf-mars-testing-tests" rev = "00" @@ -458,7 +456,7 @@ class SubmitTests(TestCase): def test_search_for_submission_and_edit_as_secretariat(self): # submit -> edit - draft = make_test_data() + make_test_data() name = "draft-ietf-mars-testing-tests" rev = "00" @@ -503,7 +501,7 @@ class SubmitTests(TestCase): def test_request_full_url(self): # submit -> request full URL to be sent - draft = make_test_data() + make_test_data() name = "draft-ietf-mars-testing-tests" rev = "00" @@ -532,7 +530,7 @@ class SubmitTests(TestCase): self.assertTrue(name in outbox[-1]["Subject"]) def test_submit_all_file_types(self): - draft = make_test_data() + make_test_data() name = "draft-ietf-mars-testing-tests" rev = "00" diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py index 3af0ec19d..207064120 100644 --- a/ietf/submit/utils.py +++ b/ietf/submit/utils.py @@ -3,23 +3,18 @@ import re import datetime from django.conf import settings -from django.contrib.sites.models import Site -from django.core.urlresolvers import reverse as urlreverse -from django.template.loader import render_to_string -from ietf.utils.mail import send_mail, send_mail_message -from ietf.utils.log import log -from ietf.utils import unaccent -from ietf.ietfauth.utils import has_role - -from ietf.submit.models import Submission, SubmissionEvent, Preapproval, DraftSubmissionStateName -from ietf.doc.models import * -from ietf.person.models import Person, Alias, Email +from ietf.doc.models import Document, State, DocAlias, DocEvent, DocumentAuthor, NewRevisionDocEvent, save_document_in_history from ietf.doc.utils import add_state_change_event, rebuild_reference_relations -from ietf.message.models import Message -from ietf.utils.pipe import pipe -from ietf.utils.log import log +from ietf.group.models import Group +from ietf.ietfauth.utils import has_role +from ietf.name.models import StreamName +from ietf.person.models import Person, Alias, Email from ietf.submit.mail import announce_to_lists, announce_new_version, announce_to_authors +from ietf.submit.models import Submission, SubmissionEvent, Preapproval, DraftSubmissionStateName +from ietf.utils import unaccent +from ietf.utils.log import log +from ietf.utils.pipe import pipe def check_idnits(path): #p = subprocess.Popen([self.idnits, '--submitcheck', '--nitcount', path], stdout=subprocess.PIPE) diff --git a/ietf/submit/views.py b/ietf/submit/views.py index 7932b57d4..87d585510 100644 --- a/ietf/submit/views.py +++ b/ietf/submit/views.py @@ -5,24 +5,20 @@ import os from django.conf import settings from django.core.urlresolvers import reverse as urlreverse from django.core.validators import validate_email, ValidationError -from django.contrib.sites.models import Site -from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden, HttpResponseNotAllowed +from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden from django.shortcuts import get_object_or_404, redirect from django.shortcuts import render_to_response from django.template import RequestContext -from django.utils.text import get_text_list -from django.utils.html import escape from ietf.doc.models import Document -from ietf.group.models import Group, Role -from ietf.utils.mail import send_mail +from ietf.group.models import Group from ietf.ietfauth.utils import has_role, role_required -from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName from ietf.submit.forms import UploadForm, NameEmailForm, EditSubmissionForm, PreapprovalForm +from ietf.submit.mail import send_full_url, send_approval_request_to_group, send_submission_confirmation, submission_confirmation_email_list, send_manual_post_request +from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName from ietf.submit.utils import approvable_submissions_for_user, preapprovals_for_user, recently_approved_by_user from ietf.submit.utils import check_idnits, found_idnits, validate_submission, create_submission_event from ietf.submit.utils import post_submission, cancel_submission, rename_submission_files -from ietf.submit.mail import send_full_url, send_approval_request_to_group, send_submission_confirmation, submission_confirmation_email_list, send_manual_post_request from ietf.utils.accesstoken import generate_random_key, generate_access_token def upload_submission(request):