Issue #6500: Reverting fbea8ff8db5e since it broke tests

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 12a189a952418284cbac87397de72a0783323d5f..32ffd0acefb2e2a16227352e06f2ebca4e1ceb89 100644 (file)
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1302,13 +1302,6 @@ class RequestTests(unittest.TestCase):
         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
index 1ae229e074ba6f3fba203d419c929f1ce05a0999..9277b1d1cdc89cb9d99892b6dc783b90b5c7ce7e 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -251,7 +251,8 @@ class Request:
         if attr[:12] == '_Request__r_':
             name = attr[12:]
             if hasattr(Request, 'get_' + name):
-                return getattr(self, 'get_' + name)()
+                getattr(self, 'get_' + name)()
+                return getattr(self, attr)
         raise AttributeError, attr
 
     def get_method(self):

diff --git a/Misc/NEWS b/Misc/NEWS
index 13474c971145655844d15ba81cca3bc1878f7af0..e28bc87fd01966335587c624414d09bdcd60229c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,9 +36,6 @@ Core and Builtins
 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