From 7a43721f811e8f3fe60419b013a0eba8ad31e5a8 Mon Sep 17 00:00:00 2001 From: asadazam93 Date: Fri, 27 Sep 2019 16:07:36 +0500 Subject: [PATCH] Upgrade python 3 decode error --- openedx/tests/xblock_integration/test_recommender.py | 6 +++++- scripts/xsslint/xsslint/linters.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openedx/tests/xblock_integration/test_recommender.py b/openedx/tests/xblock_integration/test_recommender.py index 3202392f4c..a14e0f4bb2 100644 --- a/openedx/tests/xblock_integration/test_recommender.py +++ b/openedx/tests/xblock_integration/test_recommender.py @@ -5,6 +5,7 @@ recommender system from __future__ import absolute_import +import codecs import itertools import json from six import StringIO @@ -650,7 +651,10 @@ class TestRecommenderFileUploading(TestRecommender): happens or is rejected as expected. """ if 'magic_number' in test_case: - f_handler = StringIO(test_case['magic_number'].decode('hex')) + if six.PY2: + f_handler = StringIO(codecs.decode(test_case['magic_number'], 'hex_codec')) + else: + f_handler = StringIO(codecs.decode(test_case['magic_number'], 'hex_codec').decode('utf-8')) elif content is not None: f_handler = StringIO(json.dumps(content, sort_keys=True)) else: diff --git a/scripts/xsslint/xsslint/linters.py b/scripts/xsslint/xsslint/linters.py index ba2d32fe45..b32f8d27ac 100644 --- a/scripts/xsslint/xsslint/linters.py +++ b/scripts/xsslint/xsslint/linters.py @@ -4,10 +4,10 @@ Linter classes containing logic for checking various filetypes. from __future__ import absolute_import import ast +import io import os import re import textwrap -import io from xsslint import visitors from xsslint.reporting import ExpressionRuleViolation, FileResults, RuleViolation