mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
This commit is contained in:
parent
9ada3d6e29
commit
49fd7fa443
640 changed files with 52240 additions and 18408 deletions
|
@ -6,6 +6,13 @@
|
|||
Lifted directly from rfc822.py. This should eventually be rewritten.
|
||||
"""
|
||||
|
||||
__all__ = [
|
||||
'mktime_tz',
|
||||
'parsedate',
|
||||
'parsedate_tz',
|
||||
'quote',
|
||||
]
|
||||
|
||||
import time
|
||||
|
||||
SPACE = ' '
|
||||
|
@ -117,7 +124,8 @@ def parsedate_tz(data):
|
|||
else:
|
||||
tzsign = 1
|
||||
tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
|
||||
return yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset
|
||||
# Daylight Saving Time flag is set to -1, since DST is unknown.
|
||||
return yy, mm, dd, thh, tmm, tss, 0, 1, -1, tzoffset
|
||||
|
||||
|
||||
def parsedate(data):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue