diff options
| author | Guido van Rossum <guido@python.org> | 2007-06-30 05:01:58 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-06-30 05:01:58 +0000 |
| commit | 88bb5d478830cadda180bd8eb5a5146107efb1bf (patch) | |
| tree | 59106d63e446da566186eb7b38452b1a71aa7947 /Lib/keyword.py | |
| parent | 913ff50fb01385b784cda8f91dd87a53640d5300 (diff) | |
| download | cpython-88bb5d478830cadda180bd8eb5a5146107efb1bf.tar.gz | |
Merged revisions 56020-56124 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56037 | georg.brandl | 2007-06-19 05:33:20 -0700 (Tue, 19 Jun 2007) | 2 lines
Patch #1739659: don't slice dict.keys() in pydoc.
................
r56060 | martin.v.loewis | 2007-06-21 13:00:02 -0700 (Thu, 21 Jun 2007) | 2 lines
Regenerate to add True, False, None.
................
r56069 | neal.norwitz | 2007-06-21 22:31:56 -0700 (Thu, 21 Jun 2007) | 1 line
Get the doctest working again after adding None, True, and False as kewyords.
................
r56070 | neal.norwitz | 2007-06-21 23:25:33 -0700 (Thu, 21 Jun 2007) | 1 line
Add space to error message.
................
r56071 | neal.norwitz | 2007-06-21 23:40:04 -0700 (Thu, 21 Jun 2007) | 6 lines
Get pybench working, primarily
* Use print function
* Stop using string module
* Use sorted instead of assuming dict methods return lists
* Convert range result to a list
................
r56089 | collin.winter | 2007-06-26 10:31:48 -0700 (Tue, 26 Jun 2007) | 1 line
Fix AttributeError in distutils/dir_util.py.
................
r56124 | guido.van.rossum | 2007-06-29 18:04:31 -0700 (Fri, 29 Jun 2007) | 30 lines
Merged revisions 56014-56123 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56019 | lars.gustaebel | 2007-06-18 04:42:11 -0700 (Mon, 18 Jun 2007) | 2 lines
Added exclude keyword argument to the TarFile.add() method.
........
r56023 | lars.gustaebel | 2007-06-18 13:05:55 -0700 (Mon, 18 Jun 2007) | 3 lines
Added missing \versionchanged tag for the new exclude
parameter.
........
r56038 | georg.brandl | 2007-06-19 05:36:00 -0700 (Tue, 19 Jun 2007) | 2 lines
Bug #1737864: allow empty message in logging format routines.
........
r56040 | georg.brandl | 2007-06-19 05:38:20 -0700 (Tue, 19 Jun 2007) | 2 lines
Bug #1739115: make shutil.rmtree docs clear wrt. file deletion.
........
r56084 | georg.brandl | 2007-06-25 08:21:23 -0700 (Mon, 25 Jun 2007) | 2 lines
Bug #1742901: document None behavior of shlex.split.
........
r56091 | georg.brandl | 2007-06-27 07:09:56 -0700 (Wed, 27 Jun 2007) | 2 lines
Fix a variable name in winreg docs.
........
................
Diffstat (limited to 'Lib/keyword.py')
| -rwxr-xr-x | Lib/keyword.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/keyword.py b/Lib/keyword.py index 3fa801d30b..9c49cd2744 100755 --- a/Lib/keyword.py +++ b/Lib/keyword.py @@ -14,6 +14,9 @@ __all__ = ["iskeyword", "kwlist"] kwlist = [ #--start keywords-- + 'False', + 'None', + 'True', 'and', 'as', 'assert', |