From 14b273953acffb4d44dc9ca30d16f60b70864b14 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 12 Aug 2020 10:10:18 -0400 Subject: [PATCH] Better fix, maybe. --- src/allmydata/test/common_py3.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/allmydata/test/common_py3.py b/src/allmydata/test/common_py3.py index 157f22fdf..b4e9fb058 100644 --- a/src/allmydata/test/common_py3.py +++ b/src/allmydata/test/common_py3.py @@ -9,9 +9,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from future.utils import PY2, native_str, native_bytes +from future.utils import PY2 if PY2: from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 +from past.builtins import unicode import os import time @@ -72,7 +73,7 @@ class ShouldFailMixin(object): def shouldFail(self, expected_failure, which, substring, callable, *args, **kwargs): - assert substring is None or isinstance(substring, (native_str, native_bytes)) + assert substring is None or isinstance(substring, (bytes, unicode)) d = defer.maybeDeferred(callable, *args, **kwargs) def done(res): if isinstance(res, failure.Failure):