Simplify immutable download API: use just filenode.read(consumer, offset, size)

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / dirnode.py

diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py
index 96c31ffbdf41b9997ebef1a6cbbdcf35695207f2..ae8516f6e8359f4e80378cc967bb7f3528a8d69f 100644 (file)
--- a/src/allmydata/dirnode.py
+++ b/src/allmydata/dirnode.py
@@ -18,6 +18,7 @@ from allmydata.monitor import Monitor
 from allmydata.util import hashutil, mathutil, base32, log
 from allmydata.util.assertutil import precondition
 from allmydata.util.netstring import netstring, split_netstring
+from allmydata.util.consumer import download_to_data
 from allmydata.uri import LiteralFileURI, from_string, wrap_dirnode_cap
 from pycryptopp.cipher.aes import AES
 from allmydata.util.dictutil import AuxValueDict
@@ -217,7 +218,7 @@ class DirectoryNode:
             # use the IMutableFileNode API.
             d = self._node.download_best_version()
         else:
-            d = self._node.download_to_data()
+            d = download_to_data(self._node)
         d.addCallback(self._unpack_contents)
         return d