From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 17 Apr 2015 22:49:05 +0000 (+0100)
Subject: Fix imports.
X-Git-Url: https://git.rkrishnan.org/specifications/banana.xhtml?a=commitdiff_plain;h=refs%2Fheads%2F1819.cloud-merge.2;p=tahoe-lafs%2Ftahoe-lafs.git

Fix imports.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 6218d5b9..bdbeffe6 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -24,7 +24,6 @@ from allmydata.util import hashutil, base32, pollmixin, log, keyutil, idlib
 from allmydata.util.encodingutil import get_filesystem_encoding, quote_output, \
      from_utf8_or_none
 from allmydata.util.fileutil import abspath_expanduser_unicode
-from allmydata.util.abbreviate import parse_abbreviated_size
 from allmydata.util.time_format import parse_duration, parse_date
 from allmydata.stats import StatsProvider
 from allmydata.history import History
diff --git a/src/allmydata/test/test_cli_check.py b/src/allmydata/test/test_cli_check.py
index 435f62a2..cd452a9d 100644
--- a/src/allmydata/test/test_cli_check.py
+++ b/src/allmydata/test/test_cli_check.py
@@ -1,10 +1,11 @@
-import os.path
+
 import simplejson
+
 from twisted.trial import unittest
 from cStringIO import StringIO
 
 from allmydata import uri
-from allmydata.util import base32
+from allmydata.util import base32, fileutil
 from allmydata.util.encodingutil import quote_output, to_str
 from allmydata.mutable.publish import MutableData
 from allmydata.immutable import upload
diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index 356179cd..6d0cb96e 100644
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -7,7 +7,6 @@ from twisted.internet import defer, reactor
 from allmydata import uri, client
 from allmydata.nodemaker import NodeMaker
 from allmydata.util import base32, consumer, fileutil, mathutil
-from allmydata.util.fileutil import abspath_expanduser_unicode
 from allmydata.util.hashutil import tagged_hash, ssk_writekey_hash, \
      ssk_pubkey_fingerprint_hash
 from allmydata.util.consumer import MemoryConsumer