diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-01-29 04:14:12 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-01-29 04:14:12 (GMT) |
| commit | d67650e24110832ba4b3742cf623a9d25a987d3a (patch) | |
| tree | d0c507e7832f9ec7e16a127c96c365fc25f334cc | |
| parent | 9b9ac953c84a5db1632090cb20ad71e5bb667393 (diff) | |
| parent | 1e40295af6be0e43e62a22300cbdfb62e28f237d (diff) | |
| download | cpython-d67650e24110832ba4b3742cf623a9d25a987d3a.zip cpython-d67650e24110832ba4b3742cf623a9d25a987d3a.tar.gz cpython-d67650e24110832ba4b3742cf623a9d25a987d3a.tar.bz2 | |
Merge with 3.3
| -rw-r--r-- | Lib/idlelib/Debugger.py | 3 | ||||
| -rw-r--r-- | Lib/idlelib/SearchEngine.py | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py index ed66084..d4872ed 100644 --- a/Lib/idlelib/Debugger.py +++ b/Lib/idlelib/Debugger.py @@ -254,8 +254,7 @@ class Debugger: self.sync_source_line() def show_frame(self, stackitem): - frame, lineno = stackitem - self.frame = frame + self.frame = stackitem[0] # lineno is stackitem[1] self.show_variables() localsviewer = None diff --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/SearchEngine.py index bbd221d..9d3c4cb 100644 --- a/Lib/idlelib/SearchEngine.py +++ b/Lib/idlelib/SearchEngine.py @@ -83,11 +83,9 @@ class SearchEngine: try: prog = re.compile(pat, flags) except re.error as what: - try: - msg, col = what - except: - msg = str(what) - col = -1 + args = what.args + msg = args[0] + col = arg[1] if len(args) >= 2 else -1 self.report_error(pat, msg, col) return None return prog |