From: Brian Warner <warner@allmydata.com>
Date: Fri, 9 Jan 2009 03:59:41 +0000 (-0700)
Subject: test_helper: hush pyflakes by avoiding use of 'uri' as a variable, since it shadows... 
X-Git-Url: https://git.rkrishnan.org/module-simplejson.encoder.html?a=commitdiff_plain;h=45fc3819a2b73c9e5d4f0bcabd57e89905bccf2a;p=tahoe-lafs%2Ftahoe-lafs.git

test_helper: hush pyflakes by avoiding use of 'uri' as a variable, since it shadows an import of the same name
---

diff --git a/src/allmydata/test/test_helper.py b/src/allmydata/test/test_helper.py
index 163b51ec..1dff5827 100644
--- a/src/allmydata/test/test_helper.py
+++ b/src/allmydata/test/test_helper.py
@@ -129,8 +129,8 @@ class AssistedUpload(unittest.TestCase):
             return upload_data(u, DATA, convergence="some convergence string")
         d.addCallback(_ready)
         def _uploaded(results):
-            uri = results.uri
-            assert "CHK" in uri
+            the_uri = results.uri
+            assert "CHK" in the_uri
         d.addCallback(_uploaded)
 
         def _check_empty(res):
@@ -179,8 +179,8 @@ class AssistedUpload(unittest.TestCase):
             return upload_data(u, DATA, convergence="test convergence string")
         d.addCallback(_ready)
         def _uploaded(results):
-            uri = results.uri
-            assert "CHK" in uri
+            the_uri = results.uri
+            assert "CHK" in the_uri
         d.addCallback(_uploaded)
 
         def _check_empty(res):
@@ -207,8 +207,8 @@ class AssistedUpload(unittest.TestCase):
             return upload_data(u, DATA, convergence="some convergence string")
         d.addCallback(_ready)
         def _uploaded(results):
-            uri = results.uri
-            assert "CHK" in uri
+            the_uri = results.uri
+            assert "CHK" in the_uri
         d.addCallback(_uploaded)
 
         def _check_empty(res):