Skip to content

Commit c2f0f65

Browse files
irtazaakramirtazaakram
committed
fix: pylint issues
1 parent cdb3084 commit c2f0f65

13 files changed

Lines changed: 83 additions & 73 deletions

‎xmodule/capa/capa_problem.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ class LoncapaProblem(object):
134134
def __init__(
135135
self,
136136
problem_text,
137-
id,
137+
id, # pylint: disable=redefined-builtin
138138
capa_system,
139-
capa_block, # pylint: disable=redefined-builtin
139+
capa_block,
140140
state=None,
141141
seed=None,
142142
minimal_init=False,
@@ -961,9 +961,9 @@ def _extract_context(self, tree):
961961
unsafely=self.capa_system.can_execute_unsafe_code(),
962962
)
963963
except Exception as err:
964-
log.exception(
964+
log.exception( # lint-amnesty, pylint: disable=logging-not-lazy
965965
"Error while execing script code: " + all_code
966-
) # lint-amnesty, pylint: disable=logging-not-lazy
966+
)
967967
msg = Text("Error while executing script code: %s" % str(err))
968968
raise responsetypes.LoncapaProblemError(msg)
969969

‎xmodule/capa/checker.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ def main(): # lint-amnesty, pylint: disable=missing-function-docstring
5252
log.info("Opening {0}".format(problem_file.name))
5353

5454
try:
55-
problem = LoncapaProblem(
55+
problem = LoncapaProblem( # lint-amnesty, pylint: disable=no-value-for-parameter, unexpected-keyword-arg
5656
problem_file, "fakeid", seed=args.seed, system=system
57-
) # lint-amnesty, pylint: disable=no-value-for-parameter, unexpected-keyword-arg
57+
)
5858
except Exception as ex: # lint-amnesty, pylint: disable=broad-except
5959
log.error("Could not parse file {0}".format(problem_file.name))
6060
log.exception(ex)
@@ -137,8 +137,8 @@ def check_that_suggested_answers_work(problem):
137137
log.debug(real_results)
138138
assert all(result == "correct" for answer_id, result in real_results.items())
139139
except UndefinedVariable as uv_exc:
140-
log.error(
141-
'The variable "{0}" specified in the '.format(uv_exc) # lint-amnesty, pylint: disable=logging-not-lazy
140+
log.error( # lint-amnesty, pylint: disable=logging-not-lazy
141+
'The variable "{0}" specified in the '.format(uv_exc)
142142
+ "solution isn't recognized (is it a units measure?)."
143143
)
144144
except AssertionError:

‎xmodule/capa/customrender.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ def __init__(self, system, xml):
101101
self.system = system
102102
self.id = xml.get("id")
103103

104-
def get_html(self):
104+
def get_html(self): # pylint: disable=missing-function-docstring
105105
context = {"id": self.id}
106-
html = self.system.render_template(
106+
html = self.system.render_template( # lint-amnesty, pylint: disable=redefined-outer-name
107107
"solutionspan.html", context
108-
) # lint-amnesty, pylint: disable=redefined-outer-name
108+
)
109109
return etree.XML(html)
110110

111111

@@ -186,9 +186,9 @@ def get_html(self):
186186
Return the contents of this tag, rendered to html, as an etree element.
187187
"""
188188
context = {"clarification": self.inner_html}
189-
html = self.system.render_template(
189+
html = self.system.render_template( # lint-amnesty, pylint: disable=redefined-outer-name
190190
"clarification.html", context
191-
) # lint-amnesty, pylint: disable=redefined-outer-name
191+
)
192192
xml = etree.XML(html)
193193
# We must include any text that was following our original <clarification>...</clarification> XML node.:
194194
xml.tail = self.tail

‎xmodule/capa/inputtypes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ def setup(self):
842842
_ = self.capa_system.i18n.gettext
843843

844844
submitted_msg = _(
845-
"Submitted. As soon as a response is returned, " "this message will be replaced by that feedback."
845+
"Submitted. As soon as a response is returned, this message will be replaced by that feedback."
846846
)
847847
self.submitted_msg = submitted_msg
848848

@@ -960,7 +960,7 @@ def _parse_data(self, queue_msg):
960960
try:
961961
result = json.loads(queue_msg)
962962
except (TypeError, ValueError):
963-
log.error("External message should be a JSON serialized dict." " Received queue_msg = %s", queue_msg)
963+
log.error("External message should be a JSON serialized dict. Received queue_msg = %s", queue_msg)
964964
raise
965965
msg = result["msg"]
966966
return msg

‎xmodule/capa/responsetypes.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,12 +1446,12 @@ def get_score(self, student_answers):
14461446
return cmap
14471447

14481448
def get_answers(self):
1449-
amap = dict(
1449+
amap = dict( # lint-amnesty, pylint: disable=consider-using-dict-comprehension
14501450
[
14511451
(
14521452
af.get("id"),
14531453
contextualize_text(
1454-
af.get("correct"), # lint-amnesty, pylint: disable=consider-using-dict-comprehension
1454+
af.get("correct"),
14551455
self.context,
14561456
),
14571457
)
@@ -1531,7 +1531,7 @@ def setup_response(self):
15311531
if answer.startswith(("[", "(")) and answer.endswith(("]", ")")): # range tolerance case
15321532
self.range_tolerance = True
15331533
self.inclusion = (
1534-
True if answer.startswith("[") else False,
1534+
True if answer.startswith("[") else False, # lint-amnesty, pylint: disable=simplifiable-if-expression
15351535
True if answer.endswith("]") else False, # lint-amnesty, pylint: disable=simplifiable-if-expression
15361536
)
15371537
try:
@@ -3376,9 +3376,9 @@ def get_mapped_answers(self):
33763376
for ie in self.ielements
33773377
]
33783378
),
3379-
dict(
3379+
dict( # lint-amnesty, pylint: disable=consider-using-dict-comprehension
33803380
[(ie.get("id"), ie.get("regions")) for ie in self.ielements]
3381-
), # lint-amnesty, pylint: disable=consider-using-dict-comprehension
3381+
),
33823382
)
33833383
return answers
33843384

‎xmodule/capa/safe_exec/lazymod.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def __getattr__(self, name):
3838
__import__(subname)
3939
submod = getattr(mod, name) # lint-amnesty, pylint: disable=unused-variable
4040
except ImportError:
41-
raise AttributeError(
41+
raise AttributeError( # lint-amnesty, pylint: disable=raise-missing-from
4242
"'module' object has no attribute %r" % name
43-
) # lint-amnesty, pylint: disable=raise-missing-from
43+
)
4444
self.__dict__[name] = LazyModule(subname)
4545
return self.__dict__[name]

‎xmodule/capa/safe_exec/remote_exec.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def send_safe_exec_request_v0(data):
115115
"Failed to connect to codejail api service: url=%s, params=%s", codejail_service_endpoint, str(payload)
116116
)
117117
raise CodejailServiceUnavailable(
118-
_("Codejail API Service is unavailable. " "Please try again in a few minutes.")
118+
_("Codejail API Service is unavailable. Please try again in a few minutes.")
119119
) from err
120120

121121
try:

‎xmodule/capa/safe_exec/tests/test_safe_exec.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def test_random_is_still_importable(self):
6464
rnums = [r.randint(0, 999) for _ in range(100)]
6565

6666
# With a seed, the results are predictable even from the random module
67-
safe_exec("import random\n" "rnums = [random.randint(0, 999) for _ in xrange(100)]\n", g, random_seed=17)
67+
safe_exec("import random\nrnums = [random.randint(0, 999) for _ in xrange(100)]\n", g, random_seed=17)
6868
assert g["rnums"] == rnums
6969

7070
def test_python_lib(self):

‎xmodule/capa/tests/response_xml_factory.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,9 @@ def build_xml(self, **kwargs):
368368
# we should override the default behavior
369369
# of including a <solution> tag as well
370370
kwargs["explanation_text"] = None
371-
return super(CodeResponseXMLFactory, self).build_xml(
371+
return super(CodeResponseXMLFactory, self).build_xml( # lint-amnesty, pylint: disable=super-with-arguments
372372
**kwargs
373-
) # lint-amnesty, pylint: disable=super-with-arguments
373+
)
374374

375375
def create_response_element(self, **kwargs):
376376
"""

‎xmodule/capa/tests/test_input_templates.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ def render_to_xml(self, context_dict):
5858
try:
5959
xml_str = capa_render_template(self.TEMPLATE_NAME, context_dict)
6060
except:
61-
raise TemplateError(
61+
raise TemplateError( # lint-amnesty, pylint: disable=raise-missing-from
6262
exceptions.text_error_template().render()
63-
) # lint-amnesty, pylint: disable=raise-missing-from
63+
)
6464

6565
# Attempt to construct an XML tree from the template
6666
# This makes it easy to use XPath to make assertions, rather
@@ -70,10 +70,8 @@ def render_to_xml(self, context_dict):
7070
try:
7171
xml = etree.fromstring("<test>" + xml_str + "</test>")
7272
except Exception as exc:
73-
raise TemplateError(
74-
"Could not parse XML from '{0}': {1}".format( # lint-amnesty, pylint: disable=raise-missing-from
75-
xml_str, str(exc)
76-
)
73+
raise TemplateError( # lint-amnesty, pylint: disable=raise-missing-from
74+
"Could not parse XML from '{0}': {1}".format(xml_str, str(exc))
7775
)
7876
return xml
7977

0 commit comments

Comments
 (0)