Use repr instead of manually added single quotes
(cherry picked from commit 2ccece1a3d
)
This commit is contained in:
parent
4248f7f6d0
commit
0e9dae05bd
@ -62,7 +62,7 @@ init -100 python:
|
|||||||
value = renpy.random.choices(self.weather_types, weights=self.weather_weights)[0]
|
value = renpy.random.choices(self.weather_types, weights=self.weather_weights)[0]
|
||||||
|
|
||||||
if not value in self.weather_types:
|
if not value in self.weather_types:
|
||||||
raise ValueError("Unsupported weather type: '{}'".format(value))
|
raise ValueError("Unsupported weather type: {!r}".format(value))
|
||||||
|
|
||||||
self._weather = value
|
self._weather = value
|
||||||
|
|
||||||
|
@ -58,12 +58,12 @@ init 5 python:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
if not isinstance(req, str):
|
if not isinstance(req, str):
|
||||||
raise TypeError("MirrorEvent '{}' requirement has to be a string, got '{}'.".format(self.id, type(req)))
|
raise TypeError("MirrorEvent {!r} requirement has to be a string, got {!r}.".format(self.id, type(req)))
|
||||||
|
|
||||||
output = eval(req)
|
output = eval(req)
|
||||||
|
|
||||||
if not isinstance(output, bool):
|
if not isinstance(output, bool):
|
||||||
raise TypeError("MirrorEvent '{}' requirement must evaluate to a boolean type, got '{}'.".format(self.id, type(output)))
|
raise TypeError("MirrorEvent {!r} requirement must evaluate to a boolean type, got {!r}.".format(self.id, type(output)))
|
||||||
return req
|
return req
|
||||||
|
|
||||||
def play(self):
|
def play(self):
|
||||||
|
@ -86,7 +86,7 @@ init python:
|
|||||||
elif what == "temp_attr":
|
elif what == "temp_attr":
|
||||||
setattr(node, "temporary_attributes", tuple(contents))
|
setattr(node, "temporary_attributes", tuple(contents))
|
||||||
else:
|
else:
|
||||||
raise TypeError("Type '{}' is not implemented.".format(what))
|
raise TypeError("Type {!r} is not implemented.".format(what))
|
||||||
|
|
||||||
def replace_expression(self, expr, val):
|
def replace_expression(self, expr, val):
|
||||||
node = self.node
|
node = self.node
|
||||||
|
@ -92,7 +92,7 @@ init -1 python:
|
|||||||
# Node argument values are (fucking) raw
|
# Node argument values are (fucking) raw
|
||||||
val = strip(val)
|
val = strip(val)
|
||||||
|
|
||||||
msg = "'{}'".format(key)
|
msg = repr(key)
|
||||||
fp = f"characters/{SAYERS.get(who)}/poses/default/face/{key}/{val}/"
|
fp = f"characters/{SAYERS.get(who)}/poses/default/face/{key}/{val}/"
|
||||||
fn = next((f for f in files if f.startswith(fp)), f"{fp}expression.webp")
|
fn = next((f for f in files if f.startswith(fp)), f"{fp}expression.webp")
|
||||||
|
|
||||||
@ -137,7 +137,7 @@ init -1 python:
|
|||||||
renpy.lint.report_node = node
|
renpy.lint.report_node = node
|
||||||
has_failed = True
|
has_failed = True
|
||||||
|
|
||||||
msg = "'{}' requires an integer, or a pre-defined named position, not '{}'".format(key, val)
|
msg = "{!r} requires an integer, or a pre-defined named position, not {!r}".format(key, val)
|
||||||
renpy.lint.report(msg)
|
renpy.lint.report(msg)
|
||||||
|
|
||||||
# This would require fixing hundreds of calls. Might postpone it...
|
# This would require fixing hundreds of calls. Might postpone it...
|
||||||
@ -160,7 +160,7 @@ init -1 python:
|
|||||||
val = strip(val)
|
val = strip(val)
|
||||||
|
|
||||||
if key == "emote":
|
if key == "emote":
|
||||||
msg = "'{}'".format(key)
|
msg = repr(key)
|
||||||
fn = "characters/{}/emote/{}.webp".format(SAYERS.get(who), val)
|
fn = "characters/{}/emote/{}.webp".format(SAYERS.get(who), val)
|
||||||
|
|
||||||
if not has_failed:
|
if not has_failed:
|
||||||
|
Loading…
Reference in New Issue
Block a user