diff --git a/src/allmydata/test/test_iputil.py b/src/allmydata/test/test_iputil.py index 1963ac2d4..a2ffe08d2 100644 --- 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 82752cd26..5b52a3d0e 100644 --- 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 72595c1f2..fb6dc7603 100644 --- 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)