From c88eb097d995dd5416418e502eb6be2a54b929ec Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@lothar.com> Date: Fri, 29 Oct 2010 02:42:23 -0700 Subject: [PATCH] scripts/tahoe_backup.py: oops, fix missing import, thanks pyflakes test_cli.py: hush minor pyflakes complaint --- src/allmydata/scripts/tahoe_backup.py | 3 ++- src/allmydata/test/test_cli.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/allmydata/scripts/tahoe_backup.py b/src/allmydata/scripts/tahoe_backup.py index 26279e0c..ef3da34b 100644 --- a/src/allmydata/scripts/tahoe_backup.py +++ b/src/allmydata/scripts/tahoe_backup.py @@ -9,7 +9,8 @@ from allmydata.scripts.common import get_alias, escape_path, DEFAULT_ALIAS, \ from allmydata.scripts.common_http import do_http, HTTPError, format_http_error from allmydata.util import time_format from allmydata.scripts import backupdb -from allmydata.util.encodingutil import listdir_unicode, quote_output, to_str, FilenameEncodingError +from allmydata.util.encodingutil import listdir_unicode, quote_output, \ + to_str, FilenameEncodingError, unicode_to_url from allmydata.util.assertutil import precondition from allmydata.util.fileutil import abspath_expanduser_unicode diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py index d9e34c2a..b3d89916 100644 --- a/src/allmydata/test/test_cli.py +++ b/src/allmydata/test/test_cli.py @@ -1493,6 +1493,7 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase): fn1 = os.path.join(unicode(self.basedir), u"\u00C4rtonwall") try: fn1_arg = fn1.encode(get_argv_encoding()) + del fn1_arg # hush pyflakes artonwall_arg = u"\u00C4rtonwall".encode(get_argv_encoding()) except UnicodeEncodeError: raise unittest.SkipTest("A non-ASCII command argument could not be encoded on this platform.") -- 2.45.2