From 51f3a416301184f084cdee9d668932716fd66e89 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 7 May 2016 13:29:35 +0300 Subject: [PATCH] init.py: adapt to Py 3 --- lib/python/init.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/python/init.py b/lib/python/init.py index 1690a42..359d549 100644 --- a/lib/python/init.py +++ b/lib/python/init.py @@ -9,7 +9,10 @@ def init(): - import __builtin__ + try: + import __builtin__ as builtins + except ImportError: + import builtins import os import sys @@ -159,7 +162,7 @@ def init(): def displayhook(value): if value is not None: - __builtin__._ = value + builtins._ = value pager = Pager() pager.pprint(value) pager.close() @@ -229,8 +232,8 @@ def init(): path = os.path.expanduser(os.path.expandvars(path or '~')) os.chdir(path) - __builtin__.ls = DirLister() - __builtin__.cd = DirChanger() + builtins.ls = DirLister() + builtins.cd = DirChanger() # print working directory @@ -241,7 +244,7 @@ def init(): def __call__(self): return repr(self) - __builtin__.pwd = Pwd() + builtins.pwd = Pwd() # exit REPL with 'exit', 'quit' or simple 'x' @@ -252,11 +255,11 @@ def init(): def __call__(self, msg=None): sys.exit(msg) - __builtin__.x = _Exit() + builtins.x = _Exit() # In Python 2.5+ exit and quit are objects - if isinstance(__builtin__.exit, str): - __builtin__.exit = __builtin__.quit = x # noqa: x is defined as _Exit + if isinstance(builtins.exit, str): + builtins.exit = builtins.quit = x # noqa: x is defined as _Exit # print conten of a file @@ -268,9 +271,9 @@ def init(): fp = open(filename, 'rU') text = fp.read() fp.close() - print text + print(text) - __builtin__.cat = _Cat() + builtins.cat = _Cat() # call shell @@ -282,7 +285,7 @@ def init(): def __call__(self, cmdline): os.system(cmdline) - __builtin__.sh = _Sh() + builtins.sh = _Sh() # paginate a file @@ -293,7 +296,7 @@ def init(): def __call__(self, filename): os.system("%s '%s'" % (pager, filename.replace("'", '"\'"'))) - __builtin__.pager = _Pager() + builtins.pager = _Pager() # edit a file @@ -306,7 +309,7 @@ def init(): or os.environ.get("EDITOR") or 'vi' os.system("%s '%s'" % (editor, filename.replace("'", '"\'"'))) - __builtin__.edit = __builtin__.editor = _Editor() + builtins.edit = builtins.editor = _Editor() init() -- 2.39.5