From: Brian Warner <warner@lothar.com>
Date: Wed, 4 Feb 2015 09:35:44 +0000 (-0800)
Subject: remove stray trailing whitespace
X-Git-Tag: allmydata-tahoe-1.10.1a1~76
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/simplejson/encoder.py.html?a=commitdiff_plain;h=30987c1e7d8698fda2335a478be0c3a77b116afc;p=tahoe-lafs%2Ftahoe-lafs.git

remove stray trailing whitespace
---

diff --git a/misc/build_helpers/test-osx-pkg.py b/misc/build_helpers/test-osx-pkg.py
index 275c231d..664f0538 100644
--- a/misc/build_helpers/test-osx-pkg.py
+++ b/misc/build_helpers/test-osx-pkg.py
@@ -54,7 +54,7 @@ def test_osx_pkg(pkgfile):
 
     # cat Payload | gunzip -dc | cpio -i
     cat_process = subprocess.Popen(['cat', 'Payload'], stdout=subprocess.PIPE)
-    gunzip_process = subprocess.Popen(['gunzip', '-dc'], 
+    gunzip_process = subprocess.Popen(['gunzip', '-dc'],
                                       stdin=cat_process.stdout,
                                       stdout=subprocess.PIPE)
     cpio_process = subprocess.Popen(['cpio', '-i'],
diff --git a/src/allmydata/scripts/tahoe_check.py b/src/allmydata/scripts/tahoe_check.py
index 4ac66921..65f1ce8d 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,7 @@ class DeepCheckStreamer(LineOnlyReceiver):
         if not self.options["raw"]:
             output.done()
         return 0
-        
+
 
     def run(self, options):
         if len(options.locations) == 0:
@@ -331,7 +331,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/test/test_cli.py b/src/allmydata/test/test_cli.py
index b39cafc4..e8a493fb 100644
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -3367,11 +3367,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)
@@ -3380,7 +3380,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)
@@ -3388,7 +3388,7 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase):
             self.failUnlessIn("error:", err)
             self.failUnlessIn("nonexistent", err)
         d.addCallback(_check2)
-        
+
         return d
 
 
diff --git a/src/allmydata/util/iputil.py b/src/allmydata/util/iputil.py
index af44d186..d58c578a 100644
--- a/src/allmydata/util/iputil.py
+++ b/src/allmydata/util/iputil.py
@@ -126,7 +126,7 @@ def get_local_ip_for(target):
         # avoid this DNS lookup. This also makes node startup fractionally
         # faster.
         return None
-    
+
     try:
         udpprot = DatagramProtocol()
         port = reactor.listenUDP(0, udpprot)