mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
Merge alpha100 branch back to main trunk
This commit is contained in:
parent
2979b01ff8
commit
b6775db241
176 changed files with 5302 additions and 3668 deletions
|
|
@ -12,7 +12,7 @@ def tzparse(tzstr):
|
|||
if tzprog == None:
|
||||
import regex
|
||||
tzprog = regex.compile(tzpat)
|
||||
if not tzprog.match(tzstr):
|
||||
if tzprog.match(tzstr) < 0:
|
||||
raise ValueError, 'not the TZ syntax I understand'
|
||||
regs = tzprog.regs
|
||||
subs = []
|
||||
|
|
@ -78,5 +78,3 @@ def test():
|
|||
x = localtime(t)
|
||||
tm = x[:-1] + (0,)
|
||||
print 'd =', d, 't =', t, '=', asctime(tm), x[-1]
|
||||
|
||||
test()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue