From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 15 Dec 2008 17:48:36 +0000 (+0000)
Subject: Merged revisions 67777,67779 via svnmerge from
X-Git-Tag: v2.6.2c1~324
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fced65aa36f9b5f384f19418430c2dd20e044d6;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 67777,67779 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67777 | antoine.pitrou | 2008-12-14 23:33:55 +0100 (dim., 14 déc. 2008) | 3 lines

  try to fix failure in test_bad_address on some buildbots
........
  r67779 | antoine.pitrou | 2008-12-15 01:39:51 +0100 (lun., 15 déc. 2008) | 1 line

  modify other occurrence of test_bad_address
........
---

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index 43edc0995f82..9920134f33df 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -474,7 +474,7 @@ class TestUrlopen(unittest.TestCase):
                           # domain will be spared to serve its defined
                           # purpose.
                           # urllib2.urlopen, "http://www.sadflkjsasadf.com/")
-                          urllib2.urlopen, "http://www.python.invalid./")
+                          urllib2.urlopen, "http://sadflkjsasf.i.nvali.d/")
 
 
 def test_main():
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 58fe282d3111..ffb8b988910d 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -137,7 +137,7 @@ class urlopenNetworkTests(unittest.TestCase):
                           # domain will be spared to serve its defined
                           # purpose.
                           # urllib.urlopen, "http://www.sadflkjsasadf.com/")
-                          urllib.urlopen, "http://www.python.invalid./")
+                          urllib.urlopen, "http://sadflkjsasf.i.nvali.d/")
 
 class urlretrieveNetworkTests(unittest.TestCase):
     """Tests urllib.urlretrieve using the network."""