diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 17:00:03 +0000 |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 17:00:03 +0000 |
commit | 9b12553a87c54c9e92b79e934d892e77584fc492 (patch) | |
tree | f54e547fbf83fee4567ff353bc38e3ee3a48764d /Lib/struct.py | |
parent | 5e672d0ed685d96f93794e31c032e6259f997812 (diff) | |
download | cpython-git-9b12553a87c54c9e92b79e934d892e77584fc492.tar.gz |
Merged revisions 75283 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75283 | mark.dickinson | 2009-10-08 16:54:10 +0100 (Thu, 08 Oct 2009) | 4 lines
Issue #7078: _struct.__doc__ was being ignored. Import it into struct.
Also add description of '?' struct format character. Thanks Gabriel
Genellina for the patch.
........
Diffstat (limited to 'Lib/struct.py')
-rw-r--r-- | Lib/struct.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/struct.py b/Lib/struct.py index 3784c055be..b022355c18 100644 --- a/Lib/struct.py +++ b/Lib/struct.py @@ -1,2 +1,3 @@ from _struct import * from _struct import _clearcache +from _struct import __doc__ |