From 6a295688883496fdb5e41e87f5dce615591cf0ad Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 15 Dec 2020 09:16:50 -0500 Subject: [PATCH] Fix flakes. --- src/allmydata/test/common_util.py | 2 -- src/allmydata/test/test_system.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py index 6b4e8513f..1ad0f8242 100644 --- a/src/allmydata/test/common_util.py +++ b/src/allmydata/test/common_util.py @@ -24,8 +24,6 @@ from allmydata.util.encodingutil import unicode_platform, get_filesystem_encodin from future.utils import bord, bchr, binary_type from past.builtins import unicode -from ..util.encodingutil import unicode_to_argv - def skip_if_cannot_represent_filename(u): precondition(isinstance(u, unicode)) diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 2a0a6eb00..192b82e78 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -12,7 +12,7 @@ if PY2: from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, dict, list, object, range, max, min, str # noqa: F401 from past.builtins import chr as byteschr, long -from six import ensure_text, ensure_str, ensure_binary +from six import ensure_text, ensure_str import os, re, sys, time, json from functools import partial