From 8e9f8356514ae6cbf77f4068154cd875c5e84c1f Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 16 Mar 2014 07:49:21 +0000 Subject: [PATCH] Made ietf/sync pyflakes-clean. - Legacy-Id: 7498 --- ietf/sync/discrepancies.py | 3 ++- ietf/sync/iana.py | 16 +++++++++++----- ietf/sync/rfceditor.py | 28 ++++++++++++++++------------ ietf/sync/tests.py | 19 +++++++++---------- ietf/sync/views.py | 14 +++++++------- 5 files changed, 45 insertions(+), 35 deletions(-) diff --git a/ietf/sync/discrepancies.py b/ietf/sync/discrepancies.py index 4d5d54337..082830804 100644 --- a/ietf/sync/discrepancies.py +++ b/ietf/sync/discrepancies.py @@ -1,4 +1,5 @@ -from ietf.doc.models import * +from django.db import models +from ietf.doc.models import Document, State def find_discrepancies(): res = [] diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py index 6180e84e2..9552dfc83 100644 --- a/ietf/sync/iana.py +++ b/ietf/sync/iana.py @@ -1,13 +1,19 @@ -import re, urllib2, json, email, base64 +import base64 +import datetime +import email +import json +import re +import urllib2 from django.utils.http import urlquote from django.conf import settings -from ietf.doc.models import * +from ietf.doc.mails import email_ad, email_state_changed +from ietf.doc.models import Document, DocEvent, State, StateDocEvent, StateType, save_document_in_history from ietf.doc.utils import add_state_change_event -from ietf.doc.mails import email_ad, email_state_changed, email_authors -from ietf.person.models import * -from ietf.utils.timezone import * +from ietf.person.models import Person +from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone + #PROTOCOLS_URL = "http://www.iana.org/protocols/" #CHANGES_URL = "http://datatracker.dev.icann.org:8080/data-tracker/changes" diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py index ea62fc5db..d241655d0 100644 --- a/ietf/sync/rfceditor.py +++ b/ietf/sync/rfceditor.py @@ -1,16 +1,22 @@ -import re, urllib, urllib2, json, email, socket, base64 +import re +import base64 +import datetime +import urllib +import urllib2 +import socket from xml.dom import pulldom, Node -from django.utils.http import urlquote +from django.conf import settings -from ietf.utils.mail import send_mail_text -from ietf.utils.log import log - -from ietf.doc.models import * -from ietf.person.models import * -from ietf.name.models import * -from ietf.doc.utils import add_state_change_event +from ietf.doc.models import ( Document, DocAlias, State, StateType, DocEvent, DocRelationshipName, + DocTagName, DocTypeName, RelatedDocument, save_document_in_history ) from ietf.doc.expire import move_draft_files_to_archive +from ietf.doc.utils import add_state_change_event +from ietf.group.models import Group +from ietf.name.models import StdLevelName, StreamName +from ietf.person.models import Person +from ietf.utils.log import log +from ietf.utils.mail import send_mail_text #QUEUE_URL = "http://www.rfc-editor.org/queue2.xml" #INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml" @@ -34,6 +40,7 @@ def parse_queue(response): events = pulldom.parse(response) drafts = [] warnings = [] + stream = None for event, node in events: if event == pulldom.START_ELEMENT and node.tagName == "entry": @@ -322,7 +329,6 @@ def update_docs_from_rfc_index(data, skip_older_than_date=None): # attributes take precedence over our local attributes) # make sure we got the document and alias - created = False doc = None name = "rfc%s" % rfc_number a = DocAlias.objects.filter(name=name).select_related("document") @@ -342,9 +348,7 @@ def update_docs_from_rfc_index(data, skip_older_than_date=None): # add alias DocAlias.objects.get_or_create(name=name, document=doc) results.append("created alias %s to %s" % (name, doc.name)) - created = True - # check attributes changed_attributes = {} changed_states = [] diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py index be5f166d8..ee6b1b70d 100644 --- a/ietf/sync/tests.py +++ b/ietf/sync/tests.py @@ -1,20 +1,21 @@ -import unittest, re, json, datetime, StringIO, shutil +import os +import json +import datetime +import StringIO +import shutil from django.conf import settings from django.core.urlresolvers import reverse as urlreverse +from ietf.doc.models import Document, DocAlias, DocEvent, DeletedEvent, DocTagName, RelatedDocument, State, StateDocEvent +from ietf.doc.utils import add_state_change_event +from ietf.person.models import Person +from ietf.sync import iana, rfceditor from ietf.utils.mail import outbox from ietf.utils.test_data import make_test_data from ietf.utils.test_utils import login_testing_unauthorized from ietf.utils.test_utils import TestCase -from ietf.doc.models import * -from ietf.doc.utils import add_state_change_event -from ietf.person.models import * - -from ietf.sync import iana, rfceditor - -from pyquery import PyQuery class IANASyncTests(TestCase): def test_protocol_page_sync(self): @@ -302,8 +303,6 @@ class RFCSyncTests(TestCase): self.assertEqual(pages, "42") self.assertEqual(abstract, "This is some interesting text.") - - mailbox_before = len(outbox) draft_filename = "%s-%s.txt" % (doc.name, doc.rev) self.write_draft_file(draft_filename, 5000) diff --git a/ietf/sync/views.py b/ietf/sync/views.py index 1e0174fb8..7401c781e 100644 --- a/ietf/sync/views.py +++ b/ietf/sync/views.py @@ -1,18 +1,18 @@ -import subprocess, os, json +import datetime +import subprocess +import os +import json from django.http import HttpResponse, HttpResponseForbidden, HttpResponseServerError, HttpResponseRedirect, Http404 -from django.shortcuts import render_to_response, redirect +from django.shortcuts import render_to_response from django.template import RequestContext -from django.template.loader import render_to_string from django.conf import settings -from django import forms -from django.db.models import Q from django.contrib.auth.models import User +from django.contrib.contenttypes.models import ContentType from django.views.decorators.csrf import csrf_exempt +from ietf.doc.models import DeletedEvent, StateDocEvent from ietf.ietfauth.utils import role_required, has_role -from ietf.doc.models import * -from ietf.sync import iana, rfceditor from ietf.sync.discrepancies import find_discrepancies from ietf.utils.serialize import object_as_shallow_dict