mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Idlelib: forward port changes that silenced 2.7 -3 deprecation warnings and

Browse source 
which are at least as efficient. On Py3, unpacking exceptions never works.
This commit is contained in:
Terry Jan Reedy 2014-01-28 23:13:45 -05:00
parent c369c2c688
commit 1e40295af6
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/idlelib/Debugger.py
View file

@ -254,8 +254,7 @@ class Debugger:
self.sync_source_line() self.sync_source_line()
def show_frame(self, stackitem): def show_frame(self, stackitem):
frame, lineno = stackitem self.frame = stackitem[0] # lineno is stackitem[1]
self.frame = frame
self.show_variables() self.show_variables()
localsviewer = None localsviewer = None

8
Lib/idlelib/SearchEngine.py
View file

@ -83,11 +83,9 @@ class SearchEngine:
try: try:
prog = re.compile(pat, flags) prog = re.compile(pat, flags)
except re.error as what: except re.error as what:
try: args = what.args
msg, col = what msg = args[0]
except: col = arg[1] if len(args) >= 2 else -1
msg = str(what)
col = -1
self.report_error(pat, msg, col) self.report_error(pat, msg, col)
return None return None
return prog return prog