From db303eb0c3ef4ed77ba01de7e1193028961590b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= <mva.led@gmail.com>
Date: Mon, 14 Apr 2014 16:25:34 -0400
Subject: Fix merge error.  Closes #133.

---
 epylint.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'epylint.py')

diff --git a/epylint.py b/epylint.py
index 87ad79374..2e70ae45b 100755
--- a/epylint.py
+++ b/epylint.py
@@ -87,8 +87,9 @@ def lint(filename, options=None):
     from pylint import lint as lint_mod
     lint_path = lint_mod.__file__
     options = options or ['--disable=C,R,I']
-    cmd = [sys.executable, lint_path] + options + ['--msg-template',
-            '{path}:{line}: [{symbol}, {obj}] {msg}', '-r', 'n', child_path]
+    cmd = [sys.executable, lint_path] + options + [
+        '--msg-template', '{path}:{line}: {category} ({msg_id}, {symbol}, {obj}) {msg}',
+        '-r', 'n', child_path]
     process = Popen(cmd, stdout=PIPE, cwd=parent_path, env=_get_env(),
                     universal_newlines=True)
 
-- 
cgit v1.2.1