summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-06 18:46:57 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-06 18:46:57 (GMT)
commitc4a55fccaba4936458c32f5f3b3913fcf2848b42 (patch)
treea90e0efacec59c07bc943ba8ab8593a3a1f6f4ed /Doc/howto
parent3102bd9afe7fe657a8e3533b5cdee3e5e9282f27 (diff)
downloadcpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.zip
cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.gz
cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.bz2
Recorded merge of revisions 78024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78024 | georg.brandl | 2010-02-06 19:44:44 +0100 (Sa, 06 Feb 2010) | 1 line #5341: fix "builtin" where used as an adjective ("built-in" is correct). ........
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/doanddont.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/howto/doanddont.rst b/Doc/howto/doanddont.rst
index 989ae9f..a9302ed 100644
--- a/Doc/howto/doanddont.rst
+++ b/Doc/howto/doanddont.rst
@@ -52,10 +52,10 @@ One of the most awful question asked on the newsgroup is why this code::
f.read()
does not work. Of course, it works just fine (assuming you have a file called
-"www".) But it does not work if somewhere in the module, the statement ``from os
-import *`` is present. The :mod:`os` module has a function called :func:`open`
-which returns an integer. While it is very useful, shadowing builtins is one of
-its least useful properties.
+"www".) But it does not work if somewhere in the module, the statement ``from
+os import *`` is present. The :mod:`os` module has a function called
+:func:`open` which returns an integer. While it is very useful, shadowing a
+builtin is one of its least useful properties.
Remember, you can never know for sure what names a module exports, so either
take what you need --- ``from module import name1, name2``, or keep them in the