summaryrefslogtreecommitdiffstats
path: root/Doc/faq/programming.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-10-27 20:23:20 (GMT)
committerGeorg Brandl <georg@python.org>2009-10-27 20:23:20 (GMT)
commit1e8cbe36cc2455296d38f927d1ab54b93d894881 (patch)
tree2ed1df8c9dd684a27793897c2cf542cf0111e269 /Doc/faq/programming.rst
parentcb7cb247b32acdd0816663d35ad51057a8571894 (diff)
downloadcpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.zip
cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.tar.gz
cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.tar.bz2
Merged revisions 75393,75416,75581,75609,75615 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r75393 | georg.brandl | 2009-10-13 18:55:12 +0200 (Di, 13 Okt 2009) | 1 line Update module names in references in the FAQ. ................ r75416 | georg.brandl | 2009-10-14 20:46:15 +0200 (Mi, 14 Okt 2009) | 1 line #7129: add missing function. ................ r75581 | georg.brandl | 2009-10-21 09:17:48 +0200 (Mi, 21 Okt 2009) | 9 lines Merged revisions 75580 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75580 | georg.brandl | 2009-10-21 09:15:59 +0200 (Mi, 21 Okt 2009) | 1 line #7170: fix explanation about non-weakrefable builtin types. ........ ................ r75609 | georg.brandl | 2009-10-22 17:16:26 +0200 (Do, 22 Okt 2009) | 1 line #7137: fix makefile() documentation to match the new parameters. ................ r75615 | georg.brandl | 2009-10-22 18:08:10 +0200 (Do, 22 Okt 2009) | 1 line #6927: fix wrong word. ................
Diffstat (limited to 'Doc/faq/programming.rst')
-rw-r--r--Doc/faq/programming.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index f1dfccd..7d32939 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -364,7 +364,7 @@ What are the "best practices" for using import in a module?
In general, don't use ``from modulename import *``. Doing so clutters the
importer's namespace. Some people avoid this idiom even with the few modules
that were designed to be imported in this manner. Modules designed in this
-manner include :mod:`Tkinter`, and :mod:`threading`.
+manner include :mod:`tkinter`, and :mod:`threading`.
Import modules at the top of a file. Doing so makes it clear what other modules
your code requires and avoids questions of whether the module name is in scope.