fix pyflakes warnings/errors

diff --git a/allmydata/bucketstore.py b/allmydata/bucketstore.py
index 9ec71a9ba454284fcf013c11dbb5a45687625520..b8c13d8ff4165df4317e98d9f31c4707d6d070c8 100644 (file)
--- a/allmydata/bucketstore.py
+++ b/allmydata/bucketstore.py
@@ -7,7 +7,7 @@ from allmydata.util import idlib
 from zope.interface import implements
 from allmydata.interfaces import RIBucketWriter
 
-from amdlib.util.assertutil import precondition
+from amdlib.util.assertutil import precondition, _assert
 
 class NoSuchBucketError(Failure):
     pass

diff --git a/allmydata/manhole.py b/allmydata/manhole.py
index f138de0b6753c0d903bc97d2f3e91066ff0023e8..c1e11b401505c1517d1f878a8ec56504b516a359 100644 (file)
--- a/allmydata/manhole.py
+++ b/allmydata/manhole.py
@@ -133,7 +133,6 @@ class _BaseManhole(service.MultiService):
 
         def makeNamespace():
             # close over 'self' so we can get access to .parent later
-            import types
             import debugshell
             debugshell.app = self.parent # make client/queen accesible via 'app'
             namespace = {}

diff --git a/allmydata/storageserver.py b/allmydata/storageserver.py
index 2f8ba6eb19fc1f1df789f0dd05a50e89a2f73d4f..951fed6f72427db2aa3d251234ef6a81d213a6df 100644 (file)
--- a/allmydata/storageserver.py
+++ b/allmydata/storageserver.py
@@ -2,9 +2,6 @@ import os
 
 from foolscap import Referenceable
 from twisted.application import service
-from twisted.python.failure import Failure
-
-from amdlib.util.assertutil import precondition
 
 from allmydata.bucketstore import BucketStore
 from zope.interface import implements

diff --git a/allmydata/test/test_storage.py b/allmydata/test/test_storage.py
index b062811163dae78eca4969fb322eecb39d5d719b..c61adc12aa0a95fe5c94aec5855be240b044a8d3 100644 (file)
--- a/allmydata/test/test_storage.py
+++ b/allmydata/test/test_storage.py
@@ -5,7 +5,6 @@ import random
 from twisted.trial import unittest
 from twisted.application import service
 from twisted.internet import defer
-from twisted.python import log
 from foolscap import Tub
 from foolscap.eventual import flushEventualQueue