summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-09-20 18:18:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-09-20 18:18:51 (GMT)
commitfc2fb0f62197ada0dec658dbd3ae44fcd7fcb938 (patch)
tree30c761960c3df57a63edc52700ef28c5ea88f473 /Doc
parent86eb7300af07c2981ca8728ca1a36b518d47b3ac (diff)
parent16ad5cfad391a8e7c124ccaa984a56ad123d0ab2 (diff)
downloadcpython-fc2fb0f62197ada0dec658dbd3ae44fcd7fcb938.zip
cpython-fc2fb0f62197ada0dec658dbd3ae44fcd7fcb938.tar.gz
cpython-fc2fb0f62197ada0dec658dbd3ae44fcd7fcb938.tar.bz2
merge 3.4 (#25145)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/urllib2.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index 01ae513..e3d7714 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -174,7 +174,7 @@ Explorer [#]_. ::
import urllib.request
url = 'http://www.someserver.com/cgi-bin/register.cgi'
- user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
+ user_agent = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'
values = {'name' : 'Michael Foord',
'location' : 'Northampton',
'language' : 'Python' }
@@ -572,8 +572,7 @@ Footnotes
This document was reviewed and revised by John Lee.
-.. [#] Like Google for example. The *proper* way to use google from a program
- is to use `PyGoogle <http://pygoogle.sourceforge.net>`_ of course.
+.. [#] Google for example.
.. [#] Browser sniffing is a very bad practise for website design - building
sites using web standards is much more sensible. Unfortunately a lot of
sites still send different versions to different browsers.