fix for bug [819860]: make sure the buffer gets emptied, even if WEIn… · broncodans/python@ec66d24 · GitHub

broncodans / python Public

forked from glix/python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit ec66d24

Browse filesBrowse the repository at this point in the historyBrowse files

jvr

committed

fix for bug [819860]: make sure the buffer gets emptied, even if WEInsert() fails

git-svn-id: http://svn.python.org/projects/python/trunk@34399 6015fed2-1504-0410-9fe1-9d1591cc4771

1 parent f498186 commit ec66d24
Copy full SHA for ec66d24

1 file changed

+8-4Lines changed: 8 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Mac/Tools/IDE
  • PyConsole.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Mac/Tools/IDE/PyConsole.py‎

Copy file name to clipboardExpand all lines: Mac/Tools/IDE/PyConsole.py

+8-4Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -127,10 +127,12 @@ def flush(self):
127	127	stuff = string.split(self._buf, '\n')
128	128	stuff = string.join(stuff, '\r')
129	129	self.setselection_at_end()
130		- self.ted.WEInsert(stuff, None, None)
	130	+ try:
	131	+ self.ted.WEInsert(stuff, None, None)
	132	+ finally:
	133	+ self._buf = ""
131	134	selstart, selend = self.getselection()
132	135	self._inputstart = selstart
133		- self._buf = ""
134	136	self.ted.WEClearUndo()
135	137	self.updatescrollbars()
136	138	if self._parentwindow.wid.GetWindowPort().QDIsPortBuffered():
@@ -329,8 +331,10 @@ def flush(self):
329	331	end = self.w.outputtext.ted.WEGetTextLength()
330	332	self.w.outputtext.setselection(end, end)
331	333	self.w.outputtext.ted.WEFeatureFlag(WASTEconst.weFReadOnly, 0)
332		- self.w.outputtext.ted.WEInsert(stuff, None, None)
333		- self._buf = ""
	334	+ try:
	335	+ self.w.outputtext.ted.WEInsert(stuff, None, None)
	336	+ finally:
	337	+ self._buf = ""
334	338	self.w.outputtext.updatescrollbars()
335	339	self.w.outputtext.ted.WEFeatureFlag(WASTEconst.weFReadOnly, 1)
336	340	if self.w.wid.GetWindowPort().QDIsPortBuffered():

0 commit comments

Comments

0 (0)