[Python-checkins] cpython (merge 3.4 -> default): Issue #20753: Merge with 3.4.

[berker.peksag]

http://hg.python.org/cpython/rev/394e6bda5a70
changeset:   91464:394e6bda5a70
parent:      91462:4f3a8829c069
parent:      91463:0e08ca451b34
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sun Jun 29 15:56:21 2014 +0300
summary:
  Issue #20753: Merge with 3.4.

files:
  Lib/test/test_robotparser.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py
--- a/Lib/test/test_robotparser.py
+++ b/Lib/test/test_robotparser.py
@@ -4,8 +4,11 @@
 from urllib.error import URLError, HTTPError
 from urllib.request import urlopen
 from test import support
-import threading
 from http.server import BaseHTTPRequestHandler, HTTPServer
+try:
+    import threading
+except ImportError:
+    threading = None
 
 
 class RobotTestCase(unittest.TestCase):
@@ -259,6 +262,7 @@
         pass
 
 
+ at unittest.skipUnless(threading, 'threading required for this test')
 class PasswordProtectedSiteTestCase(unittest.TestCase):
 
     def setUp(self):

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