From 34f1f43e95e165608ecc5a5453456f507271afc9 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Thu, 18 Mar 2021 10:31:58 -0400 Subject: [PATCH] Revert changes to tahoe_backup/test_backup for now. --- src/allmydata/scripts/cli.py | 2 +- src/allmydata/scripts/tahoe_backup.py | 10 +++++----- src/allmydata/test/cli/test_backup.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py index 811ae7ef9..6c5641b41 100644 --- a/src/allmydata/scripts/cli.py +++ b/src/allmydata/scripts/cli.py @@ -351,7 +351,7 @@ class BackupOptions(FileStoreOptions): line. The file is assumed to be in the argv encoding.""" abs_filepath = argv_to_abspath(filepath) try: - exclude_file = open(abs_filepath) + exclude_file = file(abs_filepath) except: raise BackupConfigurationError('Error opening exclude file %s.' % quote_local_unicode_path(abs_filepath)) try: diff --git a/src/allmydata/scripts/tahoe_backup.py b/src/allmydata/scripts/tahoe_backup.py index 99f5663ea..c63558eb1 100644 --- a/src/allmydata/scripts/tahoe_backup.py +++ b/src/allmydata/scripts/tahoe_backup.py @@ -2,7 +2,7 @@ from __future__ import print_function import os.path import time -from urllib.parse import quote as url_quote +import urllib import json import datetime from allmydata.scripts.common import get_alias, escape_path, DEFAULT_ALIAS, \ @@ -52,7 +52,7 @@ def mkdir(contents, options): def put_child(dirurl, childname, childcap): assert dirurl[-1] != "/" - url = dirurl + "/" + url_quote(unicode_to_url(childname)) + "?t=uri" + url = dirurl + "/" + urllib.quote(unicode_to_url(childname)) + "?t=uri" resp = do_http("PUT", url, childcap) if resp.status not in (200, 201): raise HTTPError("Error during put_child", resp) @@ -97,7 +97,7 @@ class BackerUpper(object): except UnknownAliasError as e: e.display(stderr) return 1 - to_url = nodeurl + "uri/%s/" % url_quote(rootcap) + to_url = nodeurl + "uri/%s/" % urllib.quote(rootcap) if path: to_url += escape_path(path) if not to_url.endswith("/"): @@ -192,7 +192,7 @@ class BackerUpper(object): filecap = r.was_uploaded() self.verboseprint("checking %s" % quote_output(filecap)) nodeurl = self.options['node-url'] - checkurl = nodeurl + "uri/%s?t=check&output=JSON" % url_quote(filecap) + checkurl = nodeurl + "uri/%s?t=check&output=JSON" % urllib.quote(filecap) self._files_checked += 1 resp = do_http("POST", checkurl) if resp.status != 200: @@ -225,7 +225,7 @@ class BackerUpper(object): dircap = r.was_created() self.verboseprint("checking %s" % quote_output(dircap)) nodeurl = self.options['node-url'] - checkurl = nodeurl + "uri/%s?t=check&output=JSON" % url_quote(dircap) + checkurl = nodeurl + "uri/%s?t=check&output=JSON" % urllib.quote(dircap) self._directories_checked += 1 resp = do_http("POST", checkurl) if resp.status != 200: diff --git a/src/allmydata/test/cli/test_backup.py b/src/allmydata/test/cli/test_backup.py index 8e2d09544..ceecbd662 100644 --- a/src/allmydata/test/cli/test_backup.py +++ b/src/allmydata/test/cli/test_backup.py @@ -2,11 +2,11 @@ import os.path from six.moves import cStringIO as StringIO from datetime import timedelta import re -import builtins from twisted.trial import unittest from twisted.python.monkey import MonkeyPatcher +import __builtin__ from allmydata.util import fileutil from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.util.encodingutil import get_io_encoding, unicode_to_argv @@ -412,7 +412,7 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase): self.failUnlessEqual(name, abspath_expanduser_unicode(exclude_file)) return StringIO() - patcher = MonkeyPatcher((builtins, 'open', call_file)) + patcher = MonkeyPatcher((__builtin__, 'file', call_file)) patcher.runWithPatches(parse_options, basedir, "backup", ['--exclude-from', unicode_to_argv(exclude_file), 'from', 'to']) self.failUnless(ns.called)