diff options
Diffstat (limited to '_test/lib/test_reader.py')
| -rw-r--r-- | _test/lib/test_reader.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/_test/lib/test_reader.py b/_test/lib/test_reader.py index 6604f24..16b9cd7 100644 --- a/_test/lib/test_reader.py +++ b/_test/lib/test_reader.py @@ -1,17 +1,14 @@ -from __future__ import absolute_import -from __future__ import print_function import codecs # NOQA import io -from ruamel.yaml.compat import PY2 import ruamel.yaml.reader def _run_reader(data, verbose): try: stream = ruamel.yaml.py.reader.Reader(data) - while stream.peek() != u'\0': + while stream.peek() != '\0': stream.forward() except ruamel.yaml.py.reader.ReaderError as exc: if verbose: @@ -27,12 +24,8 @@ def test_stream_error(error_filename, verbose=False): _run_reader(fp0.read(), verbose) for encoding in ['utf-8', 'utf-16-le', 'utf-16-be']: try: - if PY2: - with open(error_filename, 'rb') as fp0: - data = unicode(fp0.read(), encoding) # NOQA - else: - with open(error_filename, 'rb') as fp0: - data = fp0.read().decode(encoding) + with open(error_filename, 'rb') as fp0: + data = fp0.read().decode(encoding) break except UnicodeDecodeError: pass |