From b61b1f4d4d56872ccc3d5844b74295a7290fa0f7 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 15 Sep 2015 18:46:00 +0100
Subject: [PATCH] Fix an import that broke during rebasing.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/allmydata/frontends/magic_folder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index da64d97d..859f6711 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -536,7 +536,7 @@ class Downloader(QueueMixin):
         d = file_node.download_best_version()
         def succeeded(res):
             d2 = defer.succeed(res)
-            absname = abspath_expanduser_unicode(name, base=self._local_path_u)
+            absname = fileutil.abspath_expanduser_unicode(name, base=self._local_path_u)
             d2.addCallback(lambda result: self._write_downloaded_file(absname, result, is_conflict=False))
             def do_update_db(full_path):
                 filecap = file_node.get_uri()
-- 
2.45.2