Skip to content

Commit 8e9f835

Browse files
committed
Made ietf/sync pyflakes-clean.
- Legacy-Id: 7498
1 parent 6606538 commit 8e9f835

5 files changed

Lines changed: 45 additions & 35 deletions

File tree

ietf/sync/discrepancies.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from ietf.doc.models import *
1+
from django.db import models
2+
from ietf.doc.models import Document, State
23

34
def find_discrepancies():
45
res = []

ietf/sync/iana.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
import re, urllib2, json, email, base64
1+
import base64
2+
import datetime
3+
import email
4+
import json
5+
import re
6+
import urllib2
27

38
from django.utils.http import urlquote
49
from django.conf import settings
510

6-
from ietf.doc.models import *
11+
from ietf.doc.mails import email_ad, email_state_changed
12+
from ietf.doc.models import Document, DocEvent, State, StateDocEvent, StateType, save_document_in_history
713
from ietf.doc.utils import add_state_change_event
8-
from ietf.doc.mails import email_ad, email_state_changed, email_authors
9-
from ietf.person.models import *
10-
from ietf.utils.timezone import *
14+
from ietf.person.models import Person
15+
from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone
16+
1117

1218
#PROTOCOLS_URL = "http://www.iana.org/protocols/"
1319
#CHANGES_URL = "http://datatracker.dev.icann.org:8080/data-tracker/changes"

ietf/sync/rfceditor.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
import re, urllib, urllib2, json, email, socket, base64
1+
import re
2+
import base64
3+
import datetime
4+
import urllib
5+
import urllib2
6+
import socket
27
from xml.dom import pulldom, Node
38

4-
from django.utils.http import urlquote
9+
from django.conf import settings
510

6-
from ietf.utils.mail import send_mail_text
7-
from ietf.utils.log import log
8-
9-
from ietf.doc.models import *
10-
from ietf.person.models import *
11-
from ietf.name.models import *
12-
from ietf.doc.utils import add_state_change_event
11+
from ietf.doc.models import ( Document, DocAlias, State, StateType, DocEvent, DocRelationshipName,
12+
DocTagName, DocTypeName, RelatedDocument, save_document_in_history )
1313
from ietf.doc.expire import move_draft_files_to_archive
14+
from ietf.doc.utils import add_state_change_event
15+
from ietf.group.models import Group
16+
from ietf.name.models import StdLevelName, StreamName
17+
from ietf.person.models import Person
18+
from ietf.utils.log import log
19+
from ietf.utils.mail import send_mail_text
1420

1521
#QUEUE_URL = "http://www.rfc-editor.org/queue2.xml"
1622
#INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml"
@@ -34,6 +40,7 @@ def parse_queue(response):
3440
events = pulldom.parse(response)
3541
drafts = []
3642
warnings = []
43+
stream = None
3744

3845
for event, node in events:
3946
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):
322329
# attributes take precedence over our local attributes)
323330

324331
# make sure we got the document and alias
325-
created = False
326332
doc = None
327333
name = "rfc%s" % rfc_number
328334
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):
342348
# add alias
343349
DocAlias.objects.get_or_create(name=name, document=doc)
344350
results.append("created alias %s to %s" % (name, doc.name))
345-
created = True
346351

347-
348352
# check attributes
349353
changed_attributes = {}
350354
changed_states = []

ietf/sync/tests.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import unittest, re, json, datetime, StringIO, shutil
1+
import os
2+
import json
3+
import datetime
4+
import StringIO
5+
import shutil
26

37
from django.conf import settings
48
from django.core.urlresolvers import reverse as urlreverse
59

10+
from ietf.doc.models import Document, DocAlias, DocEvent, DeletedEvent, DocTagName, RelatedDocument, State, StateDocEvent
11+
from ietf.doc.utils import add_state_change_event
12+
from ietf.person.models import Person
13+
from ietf.sync import iana, rfceditor
614
from ietf.utils.mail import outbox
715
from ietf.utils.test_data import make_test_data
816
from ietf.utils.test_utils import login_testing_unauthorized
917
from ietf.utils.test_utils import TestCase
1018

11-
from ietf.doc.models import *
12-
from ietf.doc.utils import add_state_change_event
13-
from ietf.person.models import *
14-
15-
from ietf.sync import iana, rfceditor
16-
17-
from pyquery import PyQuery
1819

1920
class IANASyncTests(TestCase):
2021
def test_protocol_page_sync(self):
@@ -302,8 +303,6 @@ def test_rfc_index(self):
302303
self.assertEqual(pages, "42")
303304
self.assertEqual(abstract, "This is some interesting text.")
304305

305-
306-
mailbox_before = len(outbox)
307306
draft_filename = "%s-%s.txt" % (doc.name, doc.rev)
308307
self.write_draft_file(draft_filename, 5000)
309308

ietf/sync/views.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import subprocess, os, json
1+
import datetime
2+
import subprocess
3+
import os
4+
import json
25

36
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseServerError, HttpResponseRedirect, Http404
4-
from django.shortcuts import render_to_response, redirect
7+
from django.shortcuts import render_to_response
58
from django.template import RequestContext
6-
from django.template.loader import render_to_string
79
from django.conf import settings
8-
from django import forms
9-
from django.db.models import Q
1010
from django.contrib.auth.models import User
11+
from django.contrib.contenttypes.models import ContentType
1112
from django.views.decorators.csrf import csrf_exempt
1213

14+
from ietf.doc.models import DeletedEvent, StateDocEvent
1315
from ietf.ietfauth.utils import role_required, has_role
14-
from ietf.doc.models import *
15-
from ietf.sync import iana, rfceditor
1616
from ietf.sync.discrepancies import find_discrepancies
1717
from ietf.utils.serialize import object_as_shallow_dict
1818

0 commit comments

Comments
 (0)