INCR-229 ran modernize and isort on some files (#20463)

* INCR-229 ran modernize on common/lib/xmodule/xmodule/[a-g]*.py except for graders.py

* fix a couple xss-commit-linter issues
This commit is contained in:
Kyle Mulka
2019-05-09 00:57:09 -04:00
committed by Jeremy Bowman
parent 3b79bf85fe
commit d4cbcfd5d5
14 changed files with 87 additions and 48 deletions

View File

@@ -3,11 +3,14 @@ Modules that get shown to the users when an error has occurred while
loading or rendering other modules
"""
from __future__ import absolute_import
import hashlib
import json
import logging
import sys
import six
from lxml import etree
from xblock.field_data import DictFieldData
from xblock.fields import Scope, ScopeIds, String
@@ -111,7 +114,7 @@ class ErrorDescriptor(ErrorFields, XModuleDescriptor):
# real metadata stays in the content, but add a display name
field_data = DictFieldData({
'error_msg': unicode(error_msg),
'error_msg': six.text_type(error_msg),
'contents': contents,
'location': location,
'category': 'error'