From fijal at codespeak.net Fri Jun 15 17:27:33 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 15 Jun 2007 17:27:33 +0200 (CEST) Subject: [pyrepl-checkins] r44298 - pyrepl/trunk/pyrepl/pyrepl Message-ID: <20070615152733.DEA738293@code0.codespeak.net> Author: fijal Date: Fri Jun 15 17:27:33 2007 New Revision: 44298 Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py Log: Make module_list lazy, created first time tab is pressed after import Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py ============================================================================== --- pyrepl/trunk/pyrepl/pyrepl/python_reader.py (original) +++ pyrepl/trunk/pyrepl/pyrepl/python_reader.py Fri Jun 15 17:27:33 2007 @@ -114,6 +114,10 @@ b = self.get_unicode() m = import_line_prog.match(b) if m: + if not self._module_list_ready: + module_lister._make_module_list() + self._module_list_ready = True + mod = m.group("mod") try: return module_lister.find_modules(mod) @@ -361,15 +365,13 @@ else: encoding = None else: - encoding = None # so you get ASCII... + encoding = 'UTF-8' # so you get ASCII... con = UnixConsole(0, 1, None, encoding) print "Python", sys.version, "on", sys.platform print 'Type "help", "copyright", "credits" or "license" '\ 'for more information.' sys.path.insert(0, os.getcwd()) - module_lister._make_module_list() - if __name__ != '__main__': mainmod = new.module('__main__') sys.modules['__main__'] = mainmod @@ -377,6 +379,7 @@ mainmod = sys.modules['__main__'] rc = ReaderConsole(con, mainmod.__dict__) + rc.reader._module_list_ready = False rc.run_user_init_file() getattr(rc, interactmethod)() finally: From fijal at codespeak.net Sun Jun 17 17:09:35 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 17 Jun 2007 17:09:35 +0200 (CEST) Subject: [pyrepl-checkins] r44322 - pyrepl/trunk/pyrepl/pyrepl Message-ID: <20070617150935.472AE80DA@code0.codespeak.net> Author: fijal Date: Sun Jun 17 17:09:34 2007 New Revision: 44322 Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py Log: Revert stupid change Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py ============================================================================== --- pyrepl/trunk/pyrepl/pyrepl/python_reader.py (original) +++ pyrepl/trunk/pyrepl/pyrepl/python_reader.py Sun Jun 17 17:09:34 2007 @@ -29,15 +29,15 @@ import cPickle as pickle except ImportError: import pickle -try: - import imp - imp.find_module("twisted") - from twisted.internet import reactor - from twisted.internet.abstract import FileDescriptor -except ImportError: - default_interactmethod = "interact" -else: - default_interactmethod = "twistedinteract" +#try: +# import imp +# imp.find_module("twisted") +# from twisted.internet import reactor +# from twisted.internet.abstract import FileDescriptor +#except ImportError: +default_interactmethod = "interact" +#else: +# default_interactmethod = "twistedinteract" CommandCompiler = code.CommandCompiler @@ -365,7 +365,7 @@ else: encoding = None else: - encoding = 'UTF-8' # so you get ASCII... + encoding = None # so you get ASCII... con = UnixConsole(0, 1, None, encoding) print "Python", sys.version, "on", sys.platform print 'Type "help", "copyright", "credits" or "license" '\ @@ -378,6 +378,7 @@ else: mainmod = sys.modules['__main__'] + self._module_list_ready = False rc = ReaderConsole(con, mainmod.__dict__) rc.reader._module_list_ready = False rc.run_user_init_file() From fijal at codespeak.net Sun Jun 17 17:11:57 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 17 Jun 2007 17:11:57 +0200 (CEST) Subject: [pyrepl-checkins] r44323 - pyrepl/trunk/pyrepl/pyrepl Message-ID: <20070617151157.5C79D80DA@code0.codespeak.net> Author: fijal Date: Sun Jun 17 17:11:57 2007 New Revision: 44323 Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py Log: Argh Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py ============================================================================== --- pyrepl/trunk/pyrepl/pyrepl/python_reader.py (original) +++ pyrepl/trunk/pyrepl/pyrepl/python_reader.py Sun Jun 17 17:11:57 2007 @@ -29,15 +29,15 @@ import cPickle as pickle except ImportError: import pickle -#try: -# import imp -# imp.find_module("twisted") -# from twisted.internet import reactor -# from twisted.internet.abstract import FileDescriptor -#except ImportError: -default_interactmethod = "interact" -#else: -# default_interactmethod = "twistedinteract" +try: + import imp + imp.find_module("twisted") + from twisted.internet import reactor + from twisted.internet.abstract import FileDescriptor +except ImportError: + default_interactmethod = "interact" +else: + default_interactmethod = "twistedinteract" CommandCompiler = code.CommandCompiler @@ -378,7 +378,6 @@ else: mainmod = sys.modules['__main__'] - self._module_list_ready = False rc = ReaderConsole(con, mainmod.__dict__) rc.reader._module_list_ready = False rc.run_user_init_file() From fijal at codespeak.net Thu Jun 28 10:34:30 2007 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 28 Jun 2007 10:34:30 +0200 (CEST) Subject: [pyrepl-checkins] r44574 - pyrepl/trunk/pyrepl/pyrepl Message-ID: <20070628083430.83565810A@code0.codespeak.net> Author: fijal Date: Thu Jun 28 10:34:29 2007 New Revision: 44574 Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py Log: Add a print_banner option to control banner printing. Modified: pyrepl/trunk/pyrepl/pyrepl/python_reader.py ============================================================================== --- pyrepl/trunk/pyrepl/pyrepl/python_reader.py (original) +++ pyrepl/trunk/pyrepl/pyrepl/python_reader.py Thu Jun 28 10:34:29 2007 @@ -334,7 +334,7 @@ self.cocoainteracter = CocoaInteracter.alloc().init(self, inputfilehandle, outputfilehandle) -def main(use_pygame_console=0, interactmethod=default_interactmethod): +def main(use_pygame_console=0, interactmethod=default_interactmethod, print_banner=True): si, se, so = sys.stdin, sys.stderr, sys.stdout try: if 0 and use_pygame_console: # pygame currently borked @@ -367,9 +367,10 @@ else: encoding = None # so you get ASCII... con = UnixConsole(0, 1, None, encoding) - print "Python", sys.version, "on", sys.platform - print 'Type "help", "copyright", "credits" or "license" '\ - 'for more information.' + if print_banner: + print "Python", sys.version, "on", sys.platform + print 'Type "help", "copyright", "credits" or "license" '\ + 'for more information.' sys.path.insert(0, os.getcwd()) if __name__ != '__main__':