diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-08 16:02:50 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-08 16:02:50 (GMT) |
| commit | 015fa03058edbe2947a791f64461abf062267d0d (patch) | |
| tree | 22bd3437c9874dfe872496a3423c9264010faf15 /Lib | |
| parent | 6bf5a2e85bc549647cd050a5e38e70f81db80c5a (diff) | |
| download | cpython-015fa03058edbe2947a791f64461abf062267d0d.zip cpython-015fa03058edbe2947a791f64461abf062267d0d.tar.gz cpython-015fa03058edbe2947a791f64461abf062267d0d.tar.bz2 | |
Merged revisions 75284 via svnmerge from
svn+ssh://pythondev@www.python.org/python/branches/py3k
................
r75284 | mark.dickinson | 2009-10-08 16:59:20 +0100 (Thu, 08 Oct 2009) | 11 lines
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')
| -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 3784c05..b022355 100644 --- a/Lib/struct.py +++ b/Lib/struct.py @@ -1,2 +1,3 @@ from _struct import * from _struct import _clearcache +from _struct import __doc__ |