| Index: third_party/logilab/common/cli.py
|
| diff --git a/third_party/logilab/common/cli.py b/third_party/logilab/common/cli.py
|
| index 0ad4e4c3f6aa5509621be12a5f0baeb5a9df4da5..42837329020b30bc3405c6f93c036af59d238b7d 100644
|
| --- a/third_party/logilab/common/cli.py
|
| +++ b/third_party/logilab/common/cli.py
|
| @@ -44,8 +44,7 @@ Example::
|
|
|
| __docformat__ = "restructuredtext en"
|
|
|
| -from six.moves import builtins, input
|
| -
|
| +from logilab.common.compat import raw_input, builtins
|
| if not hasattr(builtins, '_'):
|
| builtins._ = str
|
|
|
| @@ -108,7 +107,7 @@ class CLIHelper:
|
| """loop on user input, exit on EOF"""
|
| while True:
|
| try:
|
| - line = input('>>> ')
|
| + line = raw_input('>>> ')
|
| except EOFError:
|
| print
|
| break
|
| @@ -195,7 +194,7 @@ class CLIHelper:
|
| import traceback
|
| traceback.print_exc()
|
| print 'ERROR in help method %s'% (
|
| - command_help_method.__name__)
|
| + command_help_method.func_name)
|
|
|
| help_do_help = ("help", "help [topic|command]",
|
| _("print help message for the given topic/command or \
|
|
|