Fix expansion of {path} in --msg-template.

1 files changed, 5 insertions, 4 deletions

diff --git a/utils.py b/utils.py
index 068afce6f..fd1470999 100644
--- a/utils.py
+++ b/utils.py
@@ -84,7 +84,7 @@ class WarningScope(object):
 _MsgBase = collections.namedtuple(
     '_MsgBase',
     ['msg_id', 'symbol', 'msg', 'C', 'category', 'confidence',
-     'abspath', 'module', 'obj', 'line', 'column'])
+     'abspath', 'path', 'module', 'obj', 'line', 'column'])
 
 
 class Message(_MsgBase):
@@ -391,14 +391,15 @@ class MessagesHandlerMixIn(object):
         # get module and object
         if node is None:
             module, obj = self.current_name, ''
-            path = self.current_file
+            abspath = self.current_file
         else:
             module, obj = get_module_and_frameid(node)
-            path = node.root().file
+            abspath = node.root().file
+        path = abspath.replace(self.reporter.path_strip_prefix, '')
         # add the message
         self.reporter.handle_message(
             Message(msgid, symbol,
-                    (path, module, obj, line or 1, col_offset or 0), msg, confidence))
+                    (abspath, path, module, obj, line or 1, col_offset or 0), msg, confidence))
 
     def print_full_documentation(self):
         """output a full documentation in ReST format"""