summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-10-08 15:59:20 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-10-08 15:59:20 (GMT)
commit40714af07177cbb4de484b866a2f01fe72d42770 (patch)
tree66ca1de8575154613baca8386ba4df98cab4dcc7 /Lib
parent097e51fd49248eb1e53658b8cb7927b5bc0f8ef2 (diff)
downloadcpython-40714af07177cbb4de484b866a2f01fe72d42770.zip
cpython-40714af07177cbb4de484b866a2f01fe72d42770.tar.gz
cpython-40714af07177cbb4de484b866a2f01fe72d42770.tar.bz2
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.py1
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__