mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#16887: merge with 3.3.

Browse source
This commit is contained in:
Roger Serwy 2013-04-06 20:31:26 -05:00
commit cdbb06c15c
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/idlelib/EditorWindow.py
View file

@ -1433,6 +1433,7 @@ class EditorWindow(object):
def tabify_region_event(self, event): def tabify_region_event(self, event):
head, tail, chars, lines = self.get_region() head, tail, chars, lines = self.get_region()
tabwidth = self._asktabwidth() tabwidth = self._asktabwidth()
if tabwidth is None: return
for pos in range(len(lines)): for pos in range(len(lines)):
line = lines[pos] line = lines[pos]
if line: if line:
@ -1444,6 +1445,7 @@ class EditorWindow(object):
def untabify_region_event(self, event): def untabify_region_event(self, event):
head, tail, chars, lines = self.get_region() head, tail, chars, lines = self.get_region()
tabwidth = self._asktabwidth() tabwidth = self._asktabwidth()
if tabwidth is None: return
for pos in range(len(lines)): for pos in range(len(lines)):
lines[pos] = lines[pos].expandtabs(tabwidth) lines[pos] = lines[pos].expandtabs(tabwidth)
self.set_region(head, tail, chars, lines) self.set_region(head, tail, chars, lines)
@ -1537,7 +1539,7 @@ class EditorWindow(object):
parent=self.text, parent=self.text,
initialvalue=self.indentwidth, initialvalue=self.indentwidth,
minvalue=2, minvalue=2,
maxvalue=16) or self.tabwidth maxvalue=16)
# Guess indentwidth from text content. # Guess indentwidth from text content.
# Return guessed indentwidth. This should not be believed unless # Return guessed indentwidth. This should not be believed unless

2
Misc/NEWS
View file

@ -1013,6 +1013,8 @@ _ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO
IDLE IDLE
---- ----
- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
- Issue #14254: IDLE now handles readline correctly across shell restarts. - Issue #14254: IDLE now handles readline correctly across shell restarts.
- Issue #17614: IDLE no longer raises exception when quickly closing a file. - Issue #17614: IDLE no longer raises exception when quickly closing a file.