summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Anclin <emile.anclin@logilab.fr>2010-09-21 15:00:17 +0200
committerEmile Anclin <emile.anclin@logilab.fr>2010-09-21 15:00:17 +0200
commita8ae81eed215104745f9b13599d7b648e711732a (patch)
treed4df60b6ad7d82ea9aaa5e4776afbd743f9b1829
parente5c13b05080459f7fb3c25d9c2ccbdd00f188df6 (diff)
downloadlogilab-common-a8ae81eed215104745f9b13599d7b648e711732a.tar.gz
[py3k] define raw_input for py3.x
-rw-r--r--cli.py2
-rw-r--r--compat.py5
-rw-r--r--configuration.py3
-rw-r--r--shellutils.py2
4 files changed, 11 insertions, 1 deletions
diff --git a/cli.py b/cli.py
index c499c76..5969eb3 100644
--- a/cli.py
+++ b/cli.py
@@ -48,6 +48,8 @@ import __builtin__
if not hasattr(__builtin__, '_'):
__builtin__._ = str
+from logilab.common.compat import raw_input
+
def init_readline(complete_method, histfile=None):
"""Init the readline library if available."""
diff --git a/compat.py b/compat.py
index c025878..b91f922 100644
--- a/compat.py
+++ b/compat.py
@@ -38,6 +38,11 @@ except NameError:# callable removed from py3k
return isinstance(something, collections.Callable)
del collections
+if sys.version_info < (3, 0):
+ raw_input = raw_input
+else:
+ raw_input = input
+
try:
set = set
frozenset = frozenset
diff --git a/configuration.py b/configuration.py
index 4abb340..fefe519 100644
--- a/configuration.py
+++ b/configuration.py
@@ -113,7 +113,8 @@ from ConfigParser import ConfigParser, NoOptionError, NoSectionError, \
DuplicateSectionError
from warnings import warn
-from logilab.common.compat import set, reversed, callable
+from logilab.common.compat import set, reversed, callable, raw_input
+
from logilab.common.textutils import normalize_text, unquote
from logilab.common.deprecation import deprecated
from logilab.common import optik_ext as optparse
diff --git a/shellutils.py b/shellutils.py
index 7180b5e..2f6e85a 100644
--- a/shellutils.py
+++ b/shellutils.py
@@ -32,6 +32,8 @@ import errno
from os.path import exists, isdir, islink, basename, join
from logilab.common import STD_BLACKLIST, _handle_blacklist
+from logilab.common.compat import raw_input
+
try:
from logilab.common.proc import ProcInfo, NoSuchProcess
except ImportError: