Commit 629a7b80 authored by Benjamin Peterson's avatar Benjamin Peterson

merge 3.4 (#25145)

parents a53c038f 1306f909
...@@ -174,7 +174,7 @@ Explorer [#]_. :: ...@@ -174,7 +174,7 @@ Explorer [#]_. ::
import urllib.request import urllib.request
url = 'http://www.someserver.com/cgi-bin/register.cgi' 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', values = {'name' : 'Michael Foord',
'location' : 'Northampton', 'location' : 'Northampton',
'language' : 'Python' } 'language' : 'Python' }
...@@ -572,8 +572,7 @@ Footnotes ...@@ -572,8 +572,7 @@ Footnotes
This document was reviewed and revised by John Lee. This document was reviewed and revised by John Lee.
.. [#] Like Google for example. The *proper* way to use google from a program .. [#] Google for example.
is to use `PyGoogle <http://pygoogle.sourceforge.net>`_ of course.
.. [#] Browser sniffing is a very bad practise for website design - building .. [#] Browser sniffing is a very bad practise for website design - building
sites using web standards is much more sensible. Unfortunately a lot of sites using web standards is much more sensible. Unfortunately a lot of
sites still send different versions to different browsers. sites still send different versions to different browsers.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment