From 6d52ca769982b0dcc0b2eda82c9a1204dadbca4c Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 23 Nov 2016 06:43:32 -0500 Subject: Use a 2/3 name for unicode --- coverage/phystokens.py | 4 ++-- tests/helpers.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/coverage/phystokens.py b/coverage/phystokens.py index 9a697b60..a2b23cfc 100644 --- a/coverage/phystokens.py +++ b/coverage/phystokens.py @@ -11,7 +11,7 @@ import token import tokenize from coverage import env -from coverage.backward import iternext +from coverage.backward import iternext, unicode_class from coverage.misc import contract @@ -281,7 +281,7 @@ def compile_unicode(source, filename, mode): """ source = neuter_encoding_declaration(source) - if env.PY2 and isinstance(filename, unicode): + if env.PY2 and isinstance(filename, unicode_class): filename = filename.encode(sys.getfilesystemencoding(), "replace") code = compile(source, filename, mode) return code diff --git a/tests/helpers.py b/tests/helpers.py index f4bff2b0..ebc15cd1 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -8,6 +8,7 @@ import subprocess import sys from coverage import env +from coverage.backward import unicode_class from coverage.misc import output_encoding @@ -17,7 +18,7 @@ def run_command(cmd): Returns the exit status code and the combined stdout and stderr. """ - if env.PY2 and isinstance(cmd, unicode): + if env.PY2 and isinstance(cmd, unicode_class): cmd = cmd.encode(sys.getfilesystemencoding()) # In some strange cases (PyPy3 in a virtualenv!?) the stdout encoding of -- cgit v1.2.1