From ba55818a3a0b96192fe9a43d13912baa58306ab0 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 10 Nov 2008 22:21:33 +0000 Subject: Merged revisions 67180 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r67180 | benjamin.peterson | 2008-11-10 16:11:12 -0600 (Mon, 10 Nov 2008) | 29 lines Merged revisions 66985,67170,67173,67177-67179 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66985 | benjamin.peterson | 2008-10-20 16:43:46 -0500 (Mon, 20 Oct 2008) | 1 line no need to use nested try, except, finally ........ r67170 | benjamin.peterson | 2008-11-08 12:28:31 -0600 (Sat, 08 Nov 2008) | 1 line fix #4271: fix_imports didn't recognize imports with parenthesis (ie from x import (a, b)) ........ r67173 | benjamin.peterson | 2008-11-08 17:42:08 -0600 (Sat, 08 Nov 2008) | 1 line consolidate test ........ r67177 | benjamin.peterson | 2008-11-09 21:52:52 -0600 (Sun, 09 Nov 2008) | 1 line let the metclass fixer handle complex assignments in the class body gracefully ........ r67178 | benjamin.peterson | 2008-11-10 15:26:43 -0600 (Mon, 10 Nov 2008) | 1 line the metaclass fixers shouldn't die when bases are not a simple name ........ r67179 | benjamin.peterson | 2008-11-10 15:29:58 -0600 (Mon, 10 Nov 2008) | 1 line allow the fix_import pattern to catch from imports with parenthesis ........ ................ --- Lib/lib2to3/refactor.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Lib/lib2to3/refactor.py') diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 31c80bed4e..87b0c59820 100755 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -363,10 +363,9 @@ class RefactoringTool(object): self.log_error("Can't create %s: %s", filename, err) return try: - try: - f.write(new_text) - except os.error as err: - self.log_error("Can't write %s: %s", filename, err) + f.write(new_text) + except os.error as err: + self.log_error("Can't write %s: %s", filename, err) finally: f.close() self.log_debug("Wrote changes to %s", filename) -- cgit v1.2.1