Merge pull request #21809 from edx/asad/prod-694

Upgrade python 3 decode error

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:

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