From e596013ed3d242270fe49dac0e19d58ed02698e1 Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Sun, 27 Dec 2015 20:14:23 +0100
Subject: [PATCH] Fix bug: line number appeard twice in error message

---
 patacrep/songs/chordpro/lexer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/patacrep/songs/chordpro/lexer.py b/patacrep/songs/chordpro/lexer.py
index 7626a03c..93214448 100644
--- a/patacrep/songs/chordpro/lexer.py
+++ b/patacrep/songs/chordpro/lexer.py
@@ -140,8 +140,7 @@ class ChordProLexer:
 
     def error(self, token, more=""):
         """Display error message, and skip illegal token."""
-        message = "Line {line}: Illegal character '{char}'{more}.".format(
-            line=token.lexer.lineno,
+        message = "Illegal character '{char}'{more}.".format(
             char=token.value[0],
             more=more,
             )
@@ -151,7 +150,9 @@ class ChordProLexer:
             message=message,
         ))
         if self.filename is not None:
-            message = "File {}: {}".format(self.filename, message)
+            message = "File {}, line {}: {}".format(self.filename, token.lexer.lineno, message)
+        else:
+            message = "Line {}: {}".format(token.lexer.lineno, message)
         LOGGER.warning(message)
         token.lexer.skip(1)