From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 7 Jan 2009 05:08:29 +0000 (-0700)
Subject: trivial: fix redefinition of name "log" in imports (pyflakes)
X-Git-Url: https://git.rkrishnan.org/simplejson/components/com_hotproperty/COPYING.TGPPL.html?a=commitdiff_plain;h=d5a6eed407772e7fa9feec8f61c6899ee1ece10b;p=tahoe-lafs%2Ftahoe-lafs.git

trivial: fix redefinition of name "log" in imports (pyflakes)
---

diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py
index 1790be93..5149ba9d 100644
--- a/src/allmydata/immutable/upload.py
+++ b/src/allmydata/immutable/upload.py
@@ -5,7 +5,6 @@ from twisted.internet import defer
 from twisted.application import service
 from foolscap import Referenceable, Copyable, RemoteCopy
 from foolscap import eventual
-from foolscap.logging import log
 
 from allmydata.util.hashutil import file_renewal_secret_hash, \
      file_cancel_secret_hash, bucket_renewal_secret_hash, \