Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.3

This commit is contained in:
Georg Brandl 2014-03-02 09:28:24 +01:00
parent 150570a573 c186b23799
commit 9fb137cc3f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -120,6 +120,7 @@ d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3 c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1 fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
7ff62415e4263c432c8acf6e424224209211eadb v3.3.4 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1 46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2 9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3 dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3

1
Lib/test/test_robotparser.py
View File

@ -275,6 +275,7 @@ class NetworkTestCase(unittest.TestCase):
self.skipTest('%s is unavailable' % url) self.skipTest('%s is unavailable' % url)
self.assertEqual(parser.can_fetch("*", robots_url), False) self.assertEqual(parser.can_fetch("*", robots_url), False)
@unittest.skip('does not handle the gzip encoding delivered by pydotorg')
def testPythonOrg(self): def testPythonOrg(self):
support.requires('network') support.requires('network')
with support.transient_internet('www.python.org'): with support.transient_internet('www.python.org'):