merge patch which adds base32 to test_util with patch which removes bencode from...

diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index 65c571e439916eaf098db6224624d8e3ee4cd735..9ece5e7b48c8b4feb67ad563c6bb66c913ee7a3b 100644 (file)
--- 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