Revert "pylint: upgrade to 1.3.1"

third_party/pylint/reporters/__init__.py

Index: third_party/pylint/reporters/__init__.py
diff --git a/third_party/pylint/reporters/__init__.py b/third_party/pylint/reporters/__init__.py
index 12d193f5d6982c5af945d63abba168947f54a119..0582a6f06c112bd67876ccbc66594436e28eaee6 100644
--- a/third_party/pylint/reporters/__init__.py
+++ b/third_party/pylint/reporters/__init__.py
@@ -1,4 +1,3 @@
-# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
@@ -10,28 +9,17 @@
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-"""utilities methods and classes for reporters"""
+# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+"""utilities methods and classes for reporters
 
-import sys
-import locale
-import os
+Copyright (c) 2000-2003 LOGILAB S.A. (Paris, FRANCE).
+http://www.logilab.fr/ -- mailto:contact@logilab.fr
+"""
 
-from pylint.utils import MSG_TYPES
-
-from pylint import utils
+import sys, locale
 
 CMPS = ['=', '-', '+']
 
-# py3k has no more cmp builtin
-if sys.version_info >= (3, 0):
-    def cmp(a, b):
-        return (a > b) - (a < b)
-
-if sys.version_info < (2, 6):
-    import stringformat
-    stringformat.init(True)
-
 def diff_string(old, new):
     """given a old and new int value, return a string representing the
     difference
@@ -41,51 +29,21 @@ def diff_string(old, new):
     return diff_str
 
 
-class Message(object):
-    """This class represent a message to be issued by the reporters"""
-
-    def __init__(self, reporter, msg_id, location, msg):
-        self.msg_id = msg_id
-        self.abspath, self.module, self.obj, self.line, self.column = location
-        self.path = self.abspath.replace(reporter.path_strip_prefix, '')
-        self.msg = msg
-        self.C = msg_id[0]
-        self.category = MSG_TYPES[msg_id[0]]
-        self.symbol = reporter.linter.msgs_store.check_message_id(msg_id).symbol
-
-    def format(self, template):
-        """Format the message according to the given template.
-
-        The template format is the one of the format method :
-        cf. http://docs.python.org/2/library/string.html#formatstrings
-        """
-        return template.format(**(self.__dict__))
-
+class EmptyReport(Exception):
+    """raised when a report is empty and so should not be displayed"""
 
-class BaseReporter(object):
-    """base class for reporters
-
-    symbols: show short symbolic names for messages.
-    """
+class BaseReporter:
+    """base class for reporters"""
 
     extension = ''
 
     def __init__(self, output=None):
         self.linter = None
-        # self.include_ids = None # Deprecated
-        # self.symbols = None # Deprecated
+        self.include_ids = None
         self.section = 0
         self.out = None
         self.out_encoding = None
-        self.encode = None
         self.set_output(output)
-        # Build the path prefix to strip to get relative paths
-        self.path_strip_prefix = os.getcwd() + os.sep
-
-    def add_message(self, msg_id, location, msg):
-        """Client API to send a message"""
-        # Shall we store the message objects somewhere, do some validity checking ?
-        raise NotImplementedError
 
     def set_output(self, output=None):
         """set output stream"""
@@ -101,10 +59,7 @@ class BaseReporter(object):
             encoding = (getattr(self.out, 'encoding', None) or
                         locale.getdefaultlocale()[1] or
                         sys.getdefaultencoding())
-            # errors=replace, we don't want to crash when attempting to show
-            # source code line that can't be encoded with the current locale
-            # settings
-            return string.encode(encoding, 'replace')
+            return string.encode(encoding)
         self.encode = encode
 
     def writeln(self, string=''):
@@ -114,7 +69,7 @@ class BaseReporter(object):
     def display_results(self, layout):
         """display results encapsulated in the layout tree"""
         self.section = 0
-        if hasattr(layout, 'report_id'):
+        if self.include_ids and hasattr(layout, 'report_id'):
             layout.children[0].children[0].data += ' (%s)' % layout.report_id
         self._display(layout)
 
@@ -122,17 +77,3 @@ class BaseReporter(object):
         """display the layout"""
         raise NotImplementedError()
 
-    # Event callbacks
-
-    def on_set_current_module(self, module, filepath):
-        """starting analyzis of a module"""
-        pass
-
-    def on_close(self, stats, previous_stats):
-        """global end of analyzis"""
-        pass
-
-
-def initialize(linter):
-    """initialize linter with reporters in this package """
-    utils.register_plugins(linter, __path__[0])