From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 19 May 2009 19:56:42 +0000 (-0700)
Subject: setup: fix bug (wrong import) in error message, as noticed by pyflakes
X-Git-Url: https://git.rkrishnan.org/pf/content/using.html?a=commitdiff_plain;h=a664c1699fd5c496bc08628ed6f13c054d7d6000;p=tahoe-lafs%2Ftahoe-lafs.git

setup: fix bug (wrong import) in error message, as noticed by pyflakes
---

diff --git a/_auto_deps.py b/_auto_deps.py
index 71e1e59a..322a9097 100644
--- a/_auto_deps.py
+++ b/_auto_deps.py
@@ -47,8 +47,8 @@ def require_python_2_with_working_base64():
     # make sure we have a working base64.b32decode. The one in
     # python2.4.[01] was broken.
     nodeid_b32 = 't5g7egomnnktbpydbuijt6zgtmw4oqi5'
-    from base64 import b32decode
-    nodeid = b32decode(nodeid_b32.upper())
+    import base64
+    nodeid = base64.b32decode(nodeid_b32.upper())
     if nodeid != "\x9fM\xf2\x19\xcckU0\xbf\x03\r\x10\x99\xfb&\x9b-\xc7A\x1d":
         raise NotImplementedError("There is a bug in this base64 module: %r.  This was a known issue in Python v2.4.0 and v2.4.1 (http://bugs.python.org/issue1171487 ).  Tahoe-LAFS current requires Python v2.4.2 or greater (but less than v3).  The current Python version is %r" % (base64, sys.version_info,))