Revert "Revert "pylint: upgrade to 1.3.1""

third_party/logilab/common/cli.py

 # copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of logilab-common.
 #
 # logilab-common is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation, either version 2.1 of the License, or (at your option) any
 # later version.
 #
@@ skipping 26 matching lines @@
 
         help_do_ronfle = ("ronfle", "ronfle volume", _("met les autres en veille"))
         def do_ronfle(self):
             print 'fuuuuuuuuuuuu rhhhhhrhrhrrh'
 
     cl = BookShell()
 """
 
 __docformat__ = "restructuredtext en"
 
-from logilab.common.compat import raw_input, builtins
+from six.moves import builtins, input
+
 if not hasattr(builtins, '_'):
     builtins._ = str
 
 
 def init_readline(complete_method, histfile=None):
     """Init the readline library if available."""
     try:
         import readline
         readline.parse_and_bind("tab: complete")
         readline.set_completer(complete_method)
@@ skipping 42 matching lines @@
     def __init__(self, histfile=None) :
         self._topics = {}
         self.commands = None
         self._completer = Completer(self._register_commands())
         init_readline(self._completer.complete, histfile)
 
     def run(self):
         """loop on user input, exit on EOF"""
         while True:
             try:
-                line = raw_input('>>> ')
+                line = input('>>> ')
             except EOFError:
                 print
                 break
             s_line = line.strip()
             if not s_line:
                 continue
             args = s_line.split()
             if args[0] in self.commands:
                 try:
                     cmd = 'do_%s' % self.commands[args[0]]
@@ skipping 66 matching lines @@
             for command_help_method in self._topics[command]:
                 try:
                     if callable(command_help_method):
                         self._print_help(*command_help_method())
                     else:
                         self._print_help(*command_help_method)
                 except:
                     import traceback
                     traceback.print_exc()
                     print 'ERROR in help method %s'% (
-                        command_help_method.func_name)
+                        command_help_method.__name__)
 
     help_do_help = ("help", "help [topic|command]",
                     _("print help message for the given topic/command or \
 available topics when no argument"))
 
     def do_quit(self):
         """quit the CLI"""
         raise EOFError()
 
     def help_do_quit(self):
         return ("quit", "quit", _("quit the application"))