summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-05-22 10:40:00 +0000
committerGeorg Brandl <georg@python.org>2009-05-22 10:40:00 +0000
commitbc4af35f9ea902d0d4c992ee5e6613b708007f5e (patch)
treeb3606afd534e10bfc41945790ce965f3cf41da39
parent346a38dbc0cc28c4a308f81e41bc0a4f81eb49ea (diff)
downloadcpython-git-bc4af35f9ea902d0d4c992ee5e6613b708007f5e.tar.gz
#6086: fix spelling and use a better exception to catch.
-rw-r--r--Doc/howto/doanddont.rst10
-rw-r--r--Doc/howto/urllib2.rst2
2 files changed, 6 insertions, 6 deletions
diff --git a/Doc/howto/doanddont.rst b/Doc/howto/doanddont.rst
index a56fb8c13e..eee576596f 100644
--- a/Doc/howto/doanddont.rst
+++ b/Doc/howto/doanddont.rst
@@ -30,7 +30,7 @@ Inside Function Definitions
``from module import *`` is *invalid* inside function definitions. While many
versions of Python do not check for the invalidity, it does not make it more
-valid, no more then having a smart lawyer makes a man innocent. Do not use it
+valid, no more than having a smart lawyer makes a man innocent. Do not use it
like that ever. Even in versions where it was accepted, it made the function
execution slower, because the compiler could not be certain which names are
local and which are global. In Python 2.1 this construct causes warnings, and
@@ -111,7 +111,7 @@ Good examples::
from module import name1, name2
-------------------------------
-This is a "don't" which is much weaker then the previous "don't"s but is still
+This is a "don't" which is much weaker than the previous "don't"s but is still
something you should not do if you don't have good reasons to do that. The
reason it is usually bad idea is because you suddenly have an object which lives
in two separate namespaces. When the binding in one namespace changes, the
@@ -245,11 +245,11 @@ Using the Batteries
Every so often, people seem to be writing stuff in the Python library again,
usually poorly. While the occasional module has a poor interface, it is usually
much better to use the rich standard library and data types that come with
-Python then inventing your own.
+Python than inventing your own.
A useful module very few people know about is :mod:`os.path`. It always has the
correct path arithmetic for your operating system, and will usually be much
-better then whatever you come up with yourself.
+better than whatever you come up with yourself.
Compare::
@@ -284,7 +284,7 @@ Using Backslash to Continue Statements
======================================
Since Python treats a newline as a statement terminator, and since statements
-are often more then is comfortable to put in one line, many people do::
+are often more than is comfortable to put in one line, many people do::
if foo.bar()['first'][0] == baz.quux(1, 2)[5:9] and \
calculate_number(10, 20) != forbulate(500, 360):
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index 96f2ce2045..629c38d8f6 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -311,7 +311,7 @@ geturl, and info, methods. ::
>>> req = urllib2.Request('http://www.python.org/fish.html')
>>> try:
>>> urllib2.urlopen(req)
- >>> except URLError, e:
+ >>> except HTTPError, e:
>>> print e.code
>>> print e.read()
>>>