mirror of
https://github.com/fergalmoran/picard.git
synced 2026-01-06 08:34:01 +00:00
Add missing formatting code. Update test for missing code.
This commit is contained in:
@@ -103,7 +103,7 @@ class StackItem:
|
||||
self.line = line
|
||||
self.column = column
|
||||
if name is None:
|
||||
self.name = name
|
||||
self.name = None
|
||||
else:
|
||||
self.name = '$' + name
|
||||
|
||||
@@ -236,10 +236,7 @@ Grammar:
|
||||
raise ScriptEndOfFile(StackItem(line=self._y, column=self._x))
|
||||
|
||||
def __raise_char(self, ch):
|
||||
#line = self._text[self._line:].split("\n", 1)[0]
|
||||
#cursor = " " * (self._pos - self._line - 1) + "^"
|
||||
#raise ScriptSyntaxError("Unexpected character '%s' at position %d, line %d\n%s\n%s" % (ch, self._x, self._y, line, cursor))
|
||||
raise ScriptSyntaxError(StackItem(line=self._y, column=self._x), "Unexpected character '%s'")
|
||||
raise ScriptSyntaxError(StackItem(line=self._y, column=self._x), "Unexpected character '%s'" % ch)
|
||||
|
||||
def read(self):
|
||||
try:
|
||||
@@ -1327,10 +1324,7 @@ def func_datetime(parser, format=None):
|
||||
return datetime.datetime.now(tz=local_tz).strftime(format)
|
||||
except ValueError:
|
||||
stackitem = parser._function_stack.get()
|
||||
raise ScriptRuntimeError(
|
||||
stackitem,
|
||||
"Unsupported format code"
|
||||
)
|
||||
raise ScriptRuntimeError(stackitem, "Unsupported format code")
|
||||
|
||||
|
||||
@script_function(eval_args=False)
|
||||
|
||||
@@ -192,7 +192,7 @@ class ScriptParserTest(PicardTestCase):
|
||||
self.parser.eval("$")
|
||||
|
||||
def test_unexpected_character(self):
|
||||
areg = r"^\d+:\d+: Unexpected character"
|
||||
areg = r"^\d+:\d+: Unexpected character '\^'"
|
||||
with self.assertRaisesRegex(ScriptError, areg):
|
||||
self.parser.eval("$^noop()")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user