[Python-checkins] cpython (2.7): Issue #6500: Fix "maximum recursion depth exceeded" error caused by

[berker.peksag]

https://hg.python.org/cpython/rev/fbea8ff8db5e
changeset:   99772:fbea8ff8db5e
branch:      2.7
parent:      99770:f2a846c1b593
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed Jan 06 02:04:52 2016 +0200
summary:
  Issue #6500: Fix "maximum recursion depth exceeded" error caused by Request.__getattr__()

files:
  Lib/test/test_urllib2.py |  7 +++++++
  Lib/urllib2.py           |  3 +--
  Misc/NEWS                |  3 +++
  3 files changed, 11 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1302,6 +1302,13 @@
         self.assertEqual("POST", self.post.get_method())
         self.assertEqual("GET", self.get.get_method())
 
+    def test___getattr__(self):
+        self.assertEqual("GET", self.get._Request__r_method)
+        self.assertEqual("http://www.python.org/~jeremy/",
+                         self.get._Request__r_full_url)
+        with self.assertRaises(AttributeError):
+            self.get._Request__r_invalid_attr
+
     def test_add_data(self):
         self.assertTrue(not self.get.has_data())
         self.assertEqual("GET", self.get.get_method())
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -251,8 +251,7 @@
         if attr[:12] == '_Request__r_':
             name = attr[12:]
             if hasattr(Request, 'get_' + name):
-                getattr(self, 'get_' + name)()
-                return getattr(self, attr)
+                return getattr(self, 'get_' + name)()
         raise AttributeError, attr
 
     def get_method(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@
 Library
 -------
 
+- Issue #6500: Fix "maximum recursion depth exceeded" error caused
+  by urllib2.Request.__getattr__().
+
 - Issue #24103: Fixed possible use after free in ElementTree.iterparse().
 
 - Issue #20954: _args_from_interpreter_flags used by multiprocessing and some

-- 
Repository URL: https://hg.python.org/cpython