Merged revisions 80022 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80022 | brian.curtin | 2010-04-12 18:30:49 -0500 (Mon, 12 Apr 2010) | 2 lines
Fix #8364. Update the setquit docstring and change a built-in to builtin.
........
diff --git a/Lib/site.py b/Lib/site.py
index 3ecc568..55e662c 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -318,8 +318,10 @@
def setquit():
- """Define new built-ins 'quit' and 'exit'.
- These are simply strings that display a hint on how to exit.
+ """Define new builtins 'quit' and 'exit'.
+
+ These are objects which make the interpreter exit when called.
+ The repr of each object contains a hint at how it works.
"""
if os.sep == ':':
@@ -431,7 +433,7 @@
class _Helper(object):
- """Define the built-in 'help'.
+ """Define the builtin 'help'.
This is a wrapper around pydoc.help (with a twist).
"""