fix several bugs and warnings -- thanks, pyflakes

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 67ad34eb8960c27b5e759235555ec22a6f3d9f7f..fa91cd1fb4c32035f3741aa7337da114372bbfae 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -18,7 +18,6 @@ from allmydata.checker import Checker
 from allmydata.control import ControlServer
 from allmydata.introducer import IntroducerClient
 from allmydata.util import hashutil, idlib, testutil, observer
-from allmydata.util.assertutil import precondition
 from allmydata.filenode import FileNode
 from allmydata.dirnode2 import NewDirectoryNode
 from allmydata.mutable import MutableFileNode

diff --git a/src/allmydata/dirnode2.py b/src/allmydata/dirnode2.py
index 17b6b9c7c401f63ad6fba49c04d657a9f3118822..5a1cecdb8e76b328c479bdaddfb12791395e6cca 100644 (file)
--- a/src/allmydata/dirnode2.py
+++ b/src/allmydata/dirnode2.py
@@ -3,11 +3,10 @@ import os
 
 from zope.interface import implements
 from twisted.internet import defer
-from twisted.python import log
 import simplejson
 from allmydata.mutable import NotMutableError
 from allmydata.interfaces import IMutableFileNode, IDirectoryNode,\
-     INewDirectoryURI, IURI, IFileNode, \
+     IURI, IFileNode, \
      IVerifierURI
 from allmydata.util import hashutil
 from allmydata.util.hashutil import netstring

diff --git a/src/allmydata/storage.py b/src/allmydata/storage.py
index 6d91c3ebbb939774abc73fc95b60a761b6db7822..1e99fcefbe1ee26f2bad42cf53687cf16bfc8f95 100644 (file)
--- a/src/allmydata/storage.py
+++ b/src/allmydata/storage.py
@@ -4,7 +4,6 @@ from itertools import chain
 from foolscap import Referenceable
 from twisted.application import service
 from twisted.internet import defer
-from twisted.python import log
 
 from zope.interface import implements
 from allmydata.interfaces import RIStorageServer, RIBucketWriter, \

diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index fc93d1c3d2b660d7c0d46c9e6af5d7d81c28aacf..22149eef459f7ddffb2fb926d065103c78d9617c 100644 (file)
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -7,7 +7,7 @@ from allmydata import mutable, uri, dirnode2
 from allmydata.dirnode2 import split_netstring
 from allmydata.util.hashutil import netstring, tagged_hash
 from allmydata.encode import NotEnoughPeersError
-from allmydata.interfaces import IURI, INewDirectoryURI, IDirnodeURI, \
+from allmydata.interfaces import IURI, INewDirectoryURI, \
      IMutableFileURI
 
 import sha
@@ -60,7 +60,7 @@ class FakeFilenode(mutable.MutableFileNode):
         mutable.MutableFileNode.init_from_uri(self, myuri)
         return self
     def replace(self, newdata, wait_for_numpeers=None):
-        self.all_contents[self.get_uri()] = initial_contents
+        self.all_contents[self.get_uri()] = newdata
         return defer.succeed(self)
     def _generate_pubprivkeys(self):
         count = self.counter.next()

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index c772b202531031ceab86376655807ff3519d7db6..9b0b5e0cb696edd76c01d0bb8d2f440c1e9a2e53 100644 (file)
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -5,7 +5,7 @@ from cStringIO import StringIO
 from twisted.python import usage, runtime
 from twisted.internet import defer
 import os.path
-from allmydata.scripts import runner, debug
+from allmydata.scripts import runner
 from allmydata.util import fileutil, testutil
 
 class CreateNode(unittest.TestCase):

diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index 84ec79188816ff681dd3cf2c5009a9db9deb72b0..cfdc76b3e863bde1d1ee85c31c16a767df5a617d 100644 (file)
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -1231,7 +1231,7 @@ class Root(rend.Page):
             d.addErrback(_trap_KeyError)
             return d
         elif segments[0] == "xmlrpc":
-            raise NotYetImplementedError()
+            raise NotImplementedError()
         return rend.Page.locateChild(self, ctx, segments)
 
     child_webform_css = webform.defaultCSS