]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97751fa 258f3f0)
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Wed, 5 Nov 2014 16:29:39 +0000 (11:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 5 Nov 2014 16:29:39 +0000 (11:29 -0500)
1  2 
Lib/test/test_urllib2net.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_urllib2net.py
index f50a2bb2205f72c1aa824bfc37d1baec0bca0cc5,f2d20c0bf8b454ebafbd459c0f7e82245306de6f..f618ecfdad6cea30e670ece0c9df35c6d050b362
mode 100644,100755..100644
--- 1/Lib/test/test_urllib2net.py
--- 2/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
Mirror of https://github.com/python/cpython.git