Issue #6500: Reverting fbea8ff8db5e since it broke tests
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 12a189a..32ffd0a 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1302,13 +1302,6 @@
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 1ae229e..9277b1d 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -251,7 +251,8 @@
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 13474c9..e28bc87 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,9 +36,6 @@
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