altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 4 Packages Projects Releases Wiki Activity

Added a log.affirm() call at the point where we may discover new flawed document author records. Fixed a place where the generation of Person.ascii from Person.name wasn't done well.

Browse source 
- Legacy-Id: 12903
This commit is contained in:
Henrik Levkowetz 2017-02-23 11:57:29 +00:00
parent c4cdb82a39
commit ffa19c9847
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ietf/submit/utils.py
View file

@ -1,5 +1,8 @@
# Copyright The IETF Trust 2011, All Rights Reserved
import os import os
import datetime import datetime
import six
from unidecode import unidecode from unidecode import unidecode
from django.conf import settings from django.conf import settings
@ -20,7 +23,8 @@ from ietf.person.models import Person, Email
from ietf.community.utils import update_name_contains_indexes_with_new_doc from ietf.community.utils import update_name_contains_indexes_with_new_doc
from ietf.submit.mail import announce_to_lists, announce_new_version, announce_to_authors 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.submit.models import Submission, SubmissionEvent, Preapproval, DraftSubmissionStateName
from ietf.utils.log import log from ietf.utils import unaccent
from ietf.utils import log
def validate_submission(submission): def validate_submission(submission):
@ -255,7 +259,7 @@ def post_submission(request, submission, approvedDesc):
trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev))) trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev)))
if trouble: if trouble:
log('Rebuild_reference_relations trouble: %s'%trouble) log.log('Rebuild_reference_relations trouble: %s'%trouble)
if draft.stream_id == "ietf" and draft.group.type_id == "wg" and draft.rev == "00": if draft.stream_id == "ietf" and draft.group.type_id == "wg" and draft.rev == "00":
# automatically set state "WG Document" # automatically set state "WG Document"
@ -395,7 +399,10 @@ def ensure_person_email_info_exists(name, email):
if not person: if not person:
person = Person() person = Person()
person.name = name person.name = name
person.ascii = unidecode(person.name) if isinstance(person.name, six.text_type):
person.ascii = unidecode(person.name).decode('ascii')
else:
person.ascii = unaccent.asciify(person.name).decode('ascii')
person.save() person.save()
# make sure we have an email address # make sure we have an email address
@ -437,6 +444,7 @@ def update_authors(draft, submission):
a.order = order a.order = order
a.save() a.save()
log.affirm('a.author_id != "none"')
authors.append(email) authors.append(email)
@ -465,7 +473,7 @@ def move_files_to_repository(submission):
os.rename(source, dest) os.rename(source, dest)
else: else:
if os.path.exists(dest): if os.path.exists(dest):
log("Intended to move '%s' to '%s', but found source missing while destination exists.") log.log("Intended to move '%s' to '%s', but found source missing while destination exists.")
elif ext in submission.file_types.split(','): elif ext in submission.file_types.split(','):
raise ValueError("Intended to move '%s' to '%s', but found source and destination missing.") raise ValueError("Intended to move '%s' to '%s', but found source and destination missing.")