From 61071e61609f502760c0f767d4156bfb7df8d19e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 17 Jan 2007 23:05:14 +0000 Subject: [PATCH] some minor tweaks to make it possible to not show the default intro text git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wx/py/crust.py | 1 + wxPython/wx/py/interpreter.py | 12 +++++++----- wxPython/wx/py/shell.py | 7 ++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py index c8b8daa9ce..df4d830f04 100644 --- a/wxPython/wx/py/crust.py +++ b/wxPython/wx/py/crust.py @@ -96,6 +96,7 @@ class Crust(wx.SplitterWindow): self.lastsashpos = self.GetSashPosition() else: self.lastsashpos = -1 + self.issplit = self.IsSplit() def ToggleTools(self): """Toggle the display of the filling and other tools""" diff --git a/wxPython/wx/py/interpreter.py b/wxPython/wx/py/interpreter.py index 4eef617272..c2415b7458 100644 --- a/wxPython/wx/py/interpreter.py +++ b/wxPython/wx/py/interpreter.py @@ -17,7 +17,8 @@ class Interpreter(InteractiveInterpreter): revision = __revision__ def __init__(self, locals=None, rawin=None, - stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr): + stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr, + showInterpIntro=True): """Create an interactive interpreter object.""" InteractiveInterpreter.__init__(self, locals=locals) self.stdin = stdin @@ -27,10 +28,11 @@ class Interpreter(InteractiveInterpreter): import __builtin__ __builtin__.raw_input = rawin del __builtin__ - copyright = 'Type "help", "copyright", "credits" or "license"' - copyright += ' for more information.' - self.introText = 'Python %s on %s%s%s' % \ - (sys.version, sys.platform, os.linesep, copyright) + if showInterpIntro: + copyright = 'Type "help", "copyright", "credits" or "license"' + copyright += ' for more information.' + self.introText = 'Python %s on %s%s%s' % \ + (sys.version, sys.platform, os.linesep, copyright) try: sys.ps1 except AttributeError: diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py index fe60b38221..ec8d7f4dae 100644 --- a/wxPython/wx/py/shell.py +++ b/wxPython/wx/py/shell.py @@ -343,11 +343,12 @@ class Shell(editwindow.EditWindow): def showIntro(self, text=''): """Display introductory text in the shell.""" if text: - if not text.endswith(os.linesep): - text += os.linesep self.write(text) try: - self.write(self.interp.introText) + if self.interp.introText: + if text and not text.endswith(os.linesep): + self.write(os.linesep) + self.write(self.interp.introText) except AttributeError: pass -- 2.45.2