From: Daira Hopwood Date: Tue, 23 Apr 2013 21:21:09 +0000 (+0100) Subject: Cosmetic: fix trailing whitespace. X-Git-Url: https://git.rkrishnan.org/simplejson?a=commitdiff_plain;h=220de5d355ce95f726df18f89547cfb9d19565a0;p=tahoe-lafs%2Ftahoe-lafs.git Cosmetic: fix trailing whitespace. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/scripts/tahoe_check.py b/src/allmydata/scripts/tahoe_check.py index 4ac66921..b1dd850e 100644 --- a/src/allmydata/scripts/tahoe_check.py +++ b/src/allmydata/scripts/tahoe_check.py @@ -95,7 +95,7 @@ def check_location(options, where): stdout.write(" corrupt shares:\n") for (serverid, storage_index, sharenum) in corrupt: stdout.write(" %s\n" % _quote_serverid_index_share(serverid, storage_index, sharenum)) - + return 0; def check(options): @@ -106,7 +106,7 @@ def check(options): return 0 for location in options.locations: errno = check_location(options, location) - if errno != 0: + if errno != 0: return errno return 0 @@ -320,7 +320,6 @@ class DeepCheckStreamer(LineOnlyReceiver): if not self.options["raw"]: output.done() return 0 - def run(self, options): if len(options.locations) == 0: @@ -331,7 +330,7 @@ class DeepCheckStreamer(LineOnlyReceiver): for location in options.locations: errno = self.deepcheck_location(options, location) if errno != 0: - return errno + return errno return self.rc def deepcheck(options): diff --git a/src/allmydata/storage/backends/cloud/msazure/msazure_container.py b/src/allmydata/storage/backends/cloud/msazure/msazure_container.py index a07ef750..59019e17 100644 --- a/src/allmydata/storage/backends/cloud/msazure/msazure_container.py +++ b/src/allmydata/storage/backends/cloud/msazure/msazure_container.py @@ -245,7 +245,7 @@ if __name__ == '__main__': print "Delete item..." yield msc.delete_object("key") print - print "Get contents:", + print "Get contents:", result = yield msc.list_objects() print [item.key for item in result.contents] reactor.stop() diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py index 61f5fff7..8de2356b 100644 --- a/src/allmydata/test/test_cli.py +++ b/src/allmydata/test/test_cli.py @@ -3225,11 +3225,11 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase): c0 = self.g.clients[0] d = c0.create_dirnode() def _stash_uri(n): - self.uriList.append(n.get_uri()) + self.uriList.append(n.get_uri()) d.addCallback(_stash_uri) d = c0.create_dirnode() d.addCallback(_stash_uri) - + d.addCallback(lambda ign: self.do_cli("check", self.uriList[0], self.uriList[1])) def _check((rc, out, err)): self.failUnlessReallyEqual(rc, 0) @@ -3238,7 +3238,7 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase): self.failUnlessIn("Healthy", out[:len(out)/2]) self.failUnlessIn("Healthy", out[len(out)/2:]) d.addCallback(_check) - + d.addCallback(lambda ign: self.do_cli("check", self.uriList[0], "nonexistent:")) def _check2((rc, out, err)): self.failUnlessReallyEqual(rc, 1) @@ -3246,7 +3246,6 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase): self.failUnlessIn("error:", err) self.failUnlessIn("nonexistent", err) d.addCallback(_check2) - return d