iputil/testutil: fix pyflakes errors/warnings

diff --git a/src/allmydata/test/test_iputil.py b/src/allmydata/test/test_iputil.py
index 1963ac2d4ef24d8d619c4dd575de4ff0f3034ec9..a2ffe08d241b292bbfc97f3d5f8606d078beabd3 100644 (file)
--- a/src/allmydata/test/test_iputil.py
+++ b/src/allmydata/test/test_iputil.py
@@ -1,9 +1,8 @@
-#!/usr/bin/env python
 
-from allmydata.util import iputil, testutil
+from allmydata.util import iputil
 
 from twisted.trial import unittest
-import re, sys
+import re
 
 DOTTED_QUAD_RE=re.compile("^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$")
 

diff --git a/src/allmydata/util/iputil.py b/src/allmydata/util/iputil.py
index 82752cd2634060c614e4cc4c5aedc47b44f3b4b2..5b52a3d0e919e29be414d9c9f9e39dd599961a49 100644 (file)
--- a/src/allmydata/util/iputil.py
+++ b/src/allmydata/util/iputil.py
@@ -8,7 +8,6 @@ import re, socket, sys
 
 # from Twisted
 from twisted.internet import defer
-from twisted.python import log
 from twisted.internet import reactor
 from twisted.internet.protocol import DatagramProtocol
 from twisted.internet.utils import getProcessOutput

diff --git a/src/allmydata/util/testutil.py b/src/allmydata/util/testutil.py
index 72595c1f2ef6527dcf71876e21b0587476830da9..fb6dc760393d25f34726e1c8b6737c477a0f70d8 100644 (file)
--- a/src/allmydata/util/testutil.py
+++ b/src/allmydata/util/testutil.py
@@ -39,6 +39,7 @@ class TestMixin(SignalMixin):
 
     def tearDown(self):
         if self.repeatable:
+            import repeatable_random
             repeatable_random.restore_non_repeatability()
         self.clean_pending(required_to_quiesce=True)