diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-06-29 12:56:21 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-06-29 12:56:21 (GMT) |
| commit | 15c6ed52390cade3b070bf4b7097cb1d121d9dac (patch) | |
| tree | cc3aba490dea384d22f9b2b709a7b5c01cde1d80 /Lib | |
| parent | 6cdcf0d5ed565c5ec3a36331e64fbf230550543a (diff) | |
| parent | ad324f6bccfe50b31b0c0769f4aa382baef42f91 (diff) | |
| download | cpython-15c6ed52390cade3b070bf4b7097cb1d121d9dac.zip cpython-15c6ed52390cade3b070bf4b7097cb1d121d9dac.tar.gz cpython-15c6ed52390cade3b070bf4b7097cb1d121d9dac.tar.bz2 | |
Issue #20753: Merge with 3.4.
Diffstat (limited to 'Lib')
| -rw-r--r-- | 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 index 68a5e9c..d01266f 100644 --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -4,8 +4,11 @@ import urllib.robotparser 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 @@ class RobotHandler(BaseHTTPRequestHandler): pass +@unittest.skipUnless(threading, 'threading required for this test') class PasswordProtectedSiteTestCase(unittest.TestCase): def setUp(self): |