From 4ecc1028afe063804d12610081ba0dc594dac017 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Sun, 23 Nov 2008 12:58:37 +0100 Subject: [PATCH] Refactor warnings --- klc2xkb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/klc2xkb b/klc2xkb index c46d730..0516a07 100755 --- a/klc2xkb +++ b/klc2xkb @@ -44,6 +44,10 @@ import unicodedata import keysymdata from optparse import OptionParser +def warn(msg): + print >> sys.stderr, msg + print "//", msg + class KeyMapping(object): def __init__(self, scancode, normal, shifted, altgr, shiftedaltgr): self.scancode = scancode @@ -82,9 +86,7 @@ class KeyMapping(object): def to_xkb_def_str(self): xkbname = self.scancode_to_xkbname(self.scancode) if not xkbname: - msg = "// unknown scan code %(v)u/0x%(v)02x" % {'v': self.scancode} - print >> sys.stderr, msg - print msg + warn("unknown scan code %(v)u/0x%(v)02x" % {'v': self.scancode}) return ("key <%s> { [ %s, %s, %s, %s ] };" % tuple([xkbname] @@ -203,12 +205,12 @@ class MSKLCFile(object): if good: valid[shift % 4] = pieces[i] elif pieces[i] != '-1': - print >> sys.stderr, "skipping %(pc)s at position %(pos)u (shiftstate %(ss)u) for %(key)s" % { + warn("skipping %(pc)s at position %(pos)u (shiftstate %(ss)u) for %(key)s" % { 'pc': pieces[i], 'pos': i, 'ss': shift, 'key': pieces[0] - } + }) mapping = KeyMapping(scancode, *valid) self.mappings.append(mapping) -- 2.32.0.93.g670b81a890