From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 5 Mar 2012 10:42:49 +0000 (+0100)
Subject: Flatten nested try ... finally, try ... except.
X-Git-Tag: v3.3.0a2~276^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb06746852f8d84455e15fe8ba650e87fc37fe97;p=thirdparty%2FPython%2Fcpython.git

Flatten nested try ... finally, try ... except.
---

diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index 1a25f9a6302a..10ee896c289d 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1674,12 +1674,11 @@ class XMLParser:
         except self._error as v:
             self._raiseerror(v)
         try:
-            try:
-                close_handler = self.target.close
-            except AttributeError:
-                pass
-            else:
-                return close_handler()
+            close_handler = self.target.close
+        except AttributeError:
+            pass
+        else:
+            return close_handler()
         finally:
             # get rid of circular references
             del self.parser, self._parser