From: Zooko O'Whielacronx Date: Fri, 15 Feb 2008 02:35:32 +0000 (-0700) Subject: merge patch which adds base32 to test_util with patch which removes bencode from... X-Git-Tag: allmydata-tahoe-0.8.0~49 X-Git-Url: https://git.rkrishnan.org/simplejson/__init__.py.html?a=commitdiff_plain;h=3eb95c1fadad0b0d8680b9bdd40d3285907eca75;p=tahoe-lafs%2Ftahoe-lafs.git merge patch which adds base32 to test_util with patch which removes bencode from test_util --- diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index 65c571e4..9ece5e7b 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -6,7 +6,7 @@ from twisted.trial import unittest from twisted.internet import defer from twisted.python import failure -from allmydata.util import bencode, idlib, humanreadable, mathutil, hashutil +from allmydata.util import base32, idlib, humanreadable, mathutil, hashutil from allmydata.util import assertutil, fileutil, testutil, deferredutil