From: Brian Warner <warner@lothar.com>
Date: Sat, 2 Dec 2006 23:28:46 +0000 (-0700)
Subject: fix pyflakes warnings/errors
X-Git-Tag: tahoe_v0.1.0-0-UNSTABLE~496
X-Git-Url: https://git.rkrishnan.org/CLI.txt?a=commitdiff_plain;h=30c16d6cb11884fbf96ba445a2098f34bae0259e;p=tahoe-lafs%2Ftahoe-lafs.git

fix pyflakes warnings/errors
---

diff --git a/allmydata/bucketstore.py b/allmydata/bucketstore.py
index 9ec71a9b..b8c13d8f 100644
--- 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 f138de0b..c1e11b40 100644
--- 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 2f8ba6eb..951fed6f 100644
--- 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 b0628111..c61adc12 100644
--- 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