[Python-checkins] cpython (merge default -> default): Automated merge with ssh://hg.python.org/cpython

[senthil.kumaran]

http://hg.python.org/cpython/rev/ab4432daf69f
changeset:   79907:ab4432daf69f
parent:      79905:3c0e1f351dae
parent:      79906:1f92315d9568
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Oct 22 21:50:27 2012 -0700
summary:
  Automated merge with ssh://hg.python.org/cpython

files:
  Lib/test/test_urllib.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -275,6 +275,7 @@
         self.assertTrue(e.exception.filename)
         self.assertTrue(e.exception.reason)
 
+    @unittest.skipIf(sys.platform == "win32", "Skip on Windows: issue16300")
     def test_file_notexists(self):
         fd, tmp_file = tempfile.mkstemp()
         tmp_fileurl = 'file://localhost' + tmp_file

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