[master] 3e20c80 Correct ParseError output
Federico G. Schwindt
fgsch at lodoss.net
Tue Mar 29 23:21:12 CEST 2016
commit 3e20c80735f3eb0812126b7c44ae1d8c0db39a25
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Tue Mar 29 21:47:34 2016 +0100
Correct ParseError output
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 21916f4..b04d91d 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -151,7 +151,7 @@ class Token(object):
class Vmod(object):
def __init__(self, nam, dnam, sec):
if not is_c_name(nam):
- raise ParseError("Module name '%s' is illegal", nam)
+ raise ParseError("Module name '%s' is illegal" % nam)
self.nam = nam
self.dnam = dnam
self.sec = sec
@@ -163,10 +163,10 @@ class Vmod(object):
def set_event(self, nam):
if self.event != None:
- raise ParseError("Module %s already has $Event",
+ raise ParseError("Module %s already has $Event" %
self.nam)
if not is_c_name(nam):
- raise ParseError("$Event name '%s' is illegal", nam)
+ raise ParseError("$Event name '%s' is illegal" % nam)
self.event = nam
def add_func(self, fn):
@@ -686,11 +686,11 @@ def parse_func(tl, rt_type=None, pobj=None):
if pobj != None and fname[0] == "." and is_c_name(fname[1:]):
fname = pobj + fname
elif not is_c_name(fname):
- raise ParseError("Function name '%s' is illegal", fname)
+ raise ParseError("Function name '%s' is illegal" % fname)
t = tl.get_token()
if t.str != "(":
- raise ParseError("Expected \"(\" got \"%s\"", t.str)
+ raise ParseError("Expected \"(\" got \"%s\"" % t.str)
while True:
t = parse_arg(tl, al)
More information about the varnish-commit
mailing list