diff options
| author | Georg Brandl <georg@python.org> | 2014-03-02 08:28:24 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-02 08:28:24 (GMT) |
| commit | 9fb137cc3fcdf0fddb28a61d7d40b923e439a780 (patch) | |
| tree | dd87e679131da0d7eab19df24728705ffb3d5bc1 | |
| parent | 150570a573cb0e5d0ca5d1ae1d59c99e97689d96 (diff) | |
| parent | c186b237993ac0c1c6ee1a195754702cc01625d7 (diff) | |
| download | cpython-9fb137cc3fcdf0fddb28a61d7d40b923e439a780.zip cpython-9fb137cc3fcdf0fddb28a61d7d40b923e439a780.tar.gz cpython-9fb137cc3fcdf0fddb28a61d7d40b923e439a780.tar.bz2 | |
merge with 3.3
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Lib/test/test_robotparser.py | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -120,6 +120,7 @@ d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2 c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3 fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4 +9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1 46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1 9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2 dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3 diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py index d1dfd9e..ebc819c 100644 --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -275,6 +275,7 @@ class NetworkTestCase(unittest.TestCase): self.skipTest('%s is unavailable' % url) self.assertEqual(parser.can_fetch("*", robots_url), False) + @unittest.skip('does not handle the gzip encoding delivered by pydotorg') def testPythonOrg(self): support.requires('network') with support.transient_internet('www.python.org'): |