2003-01-08 16:40:01 -04:00
|
|
|
"""Test date/time type.
|
|
|
|
|
|
|
|
See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
|
|
|
|
"""
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
import sys
|
2003-01-30 18:06:23 -04:00
|
|
|
import pickle
|
2002-12-16 16:18:38 -04:00
|
|
|
import unittest
|
2006-08-17 17:24:18 -03:00
|
|
|
try:
|
|
|
|
import cPickle
|
|
|
|
except ImportError:
|
|
|
|
cPickle = None
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
from test import test_support
|
|
|
|
|
|
|
|
from datetime import MINYEAR, MAXYEAR
|
|
|
|
from datetime import timedelta
|
|
|
|
from datetime import tzinfo
|
2003-01-08 16:40:01 -04:00
|
|
|
from datetime import time
|
|
|
|
from datetime import date, datetime
|
|
|
|
|
2003-02-05 00:08:07 -04:00
|
|
|
pickle_choices = [(pickler, unpickler, proto)
|
|
|
|
for pickler in pickle, cPickle
|
2006-08-17 17:24:18 -03:00
|
|
|
if pickler is not None
|
2003-02-05 00:08:07 -04:00
|
|
|
for unpickler in pickle, cPickle
|
2006-08-17 17:24:18 -03:00
|
|
|
if unpickler is not None
|
2003-02-05 00:08:07 -04:00
|
|
|
for proto in range(3)]
|
2006-08-17 17:24:18 -03:00
|
|
|
if cPickle is None:
|
|
|
|
assert len(pickle_choices) == 3
|
|
|
|
else:
|
|
|
|
assert len(pickle_choices) == 2*2*3
|
2003-01-30 18:06:23 -04:00
|
|
|
|
2003-02-07 23:46:31 -04:00
|
|
|
# An arbitrary collection of objects of non-datetime types, for testing
|
|
|
|
# mixed-type comparisons.
|
|
|
|
OTHERSTUFF = (10, 10L, 34.5, "abc", {}, [], ())
|
2003-01-08 16:40:01 -04:00
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# module tests
|
|
|
|
|
|
|
|
class TestModule(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_constants(self):
|
|
|
|
import datetime
|
|
|
|
self.assertEqual(datetime.MINYEAR, 1)
|
|
|
|
self.assertEqual(datetime.MAXYEAR, 9999)
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# tzinfo tests
|
|
|
|
|
|
|
|
class FixedOffset(tzinfo):
|
|
|
|
def __init__(self, offset, name, dstoffset=42):
|
2003-01-02 17:28:08 -04:00
|
|
|
if isinstance(offset, int):
|
|
|
|
offset = timedelta(minutes=offset)
|
|
|
|
if isinstance(dstoffset, int):
|
|
|
|
dstoffset = timedelta(minutes=dstoffset)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.__offset = offset
|
|
|
|
self.__name = name
|
|
|
|
self.__dstoffset = dstoffset
|
|
|
|
def __repr__(self):
|
|
|
|
return self.__name.lower()
|
|
|
|
def utcoffset(self, dt):
|
|
|
|
return self.__offset
|
|
|
|
def tzname(self, dt):
|
|
|
|
return self.__name
|
|
|
|
def dst(self, dt):
|
|
|
|
return self.__dstoffset
|
|
|
|
|
2002-12-21 01:04:42 -04:00
|
|
|
class PicklableFixedOffset(FixedOffset):
|
|
|
|
def __init__(self, offset=None, name=None, dstoffset=None):
|
|
|
|
FixedOffset.__init__(self, offset, name, dstoffset)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
class TestTZInfo(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_non_abstractness(self):
|
|
|
|
# In order to allow subclasses to get pickled, the C implementation
|
|
|
|
# wasn't able to get away with having __init__ raise
|
|
|
|
# NotImplementedError.
|
|
|
|
useless = tzinfo()
|
|
|
|
dt = datetime.max
|
|
|
|
self.assertRaises(NotImplementedError, useless.tzname, dt)
|
|
|
|
self.assertRaises(NotImplementedError, useless.utcoffset, dt)
|
|
|
|
self.assertRaises(NotImplementedError, useless.dst, dt)
|
|
|
|
|
|
|
|
def test_subclass_must_override(self):
|
|
|
|
class NotEnough(tzinfo):
|
|
|
|
def __init__(self, offset, name):
|
|
|
|
self.__offset = offset
|
|
|
|
self.__name = name
|
|
|
|
self.failUnless(issubclass(NotEnough, tzinfo))
|
|
|
|
ne = NotEnough(3, "NotByALongShot")
|
|
|
|
self.failUnless(isinstance(ne, tzinfo))
|
|
|
|
|
|
|
|
dt = datetime.now()
|
|
|
|
self.assertRaises(NotImplementedError, ne.tzname, dt)
|
|
|
|
self.assertRaises(NotImplementedError, ne.utcoffset, dt)
|
|
|
|
self.assertRaises(NotImplementedError, ne.dst, dt)
|
|
|
|
|
|
|
|
def test_normal(self):
|
|
|
|
fo = FixedOffset(3, "Three")
|
|
|
|
self.failUnless(isinstance(fo, tzinfo))
|
|
|
|
for dt in datetime.now(), None:
|
2003-01-02 17:28:08 -04:00
|
|
|
self.assertEqual(fo.utcoffset(dt), timedelta(minutes=3))
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(fo.tzname(dt), "Three")
|
2003-01-02 17:28:08 -04:00
|
|
|
self.assertEqual(fo.dst(dt), timedelta(minutes=42))
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_pickling_base(self):
|
|
|
|
# There's no point to pickling tzinfo objects on their own (they
|
|
|
|
# carry no data), but they need to be picklable anyway else
|
|
|
|
# concrete subclasses can't be pickled.
|
|
|
|
orig = tzinfo.__new__(tzinfo)
|
|
|
|
self.failUnless(type(orig) is tzinfo)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-02-18 22:35:07 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.failUnless(type(derived) is tzinfo)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_pickling_subclass(self):
|
|
|
|
# Make sure we can pickle/unpickle an instance of a subclass.
|
2003-01-02 17:28:08 -04:00
|
|
|
offset = timedelta(minutes=-300)
|
|
|
|
orig = PicklableFixedOffset(offset, 'cookie')
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(isinstance(orig, tzinfo))
|
2002-12-21 01:04:42 -04:00
|
|
|
self.failUnless(type(orig) is PicklableFixedOffset)
|
2003-01-02 17:28:08 -04:00
|
|
|
self.assertEqual(orig.utcoffset(None), offset)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(orig.tzname(None), 'cookie')
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-02-18 22:35:07 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.failUnless(isinstance(derived, tzinfo))
|
|
|
|
self.failUnless(type(derived) is PicklableFixedOffset)
|
|
|
|
self.assertEqual(derived.utcoffset(None), offset)
|
|
|
|
self.assertEqual(derived.tzname(None), 'cookie')
|
2002-12-16 16:18:38 -04:00
|
|
|
|
2003-02-07 18:50:28 -04:00
|
|
|
#############################################################################
|
|
|
|
# Base clase for testing a particular aspect of timedelta, time, date and
|
|
|
|
# datetime comparisons.
|
|
|
|
|
|
|
|
class HarmlessMixedComparison(unittest.TestCase):
|
|
|
|
# Test that __eq__ and __ne__ don't complain for mixed-type comparisons.
|
|
|
|
|
|
|
|
# Subclasses must define 'theclass', and theclass(1, 1, 1) must be a
|
|
|
|
# legit constructor.
|
|
|
|
|
|
|
|
def test_harmless_mixed_comparison(self):
|
|
|
|
me = self.theclass(1, 1, 1)
|
|
|
|
|
|
|
|
self.failIf(me == ())
|
|
|
|
self.failUnless(me != ())
|
|
|
|
self.failIf(() == me)
|
|
|
|
self.failUnless(() != me)
|
|
|
|
|
|
|
|
self.failUnless(me in [1, 20L, [], me])
|
|
|
|
self.failIf(me not in [1, 20L, [], me])
|
|
|
|
|
|
|
|
self.failUnless([] in [me, 1, 20L, []])
|
|
|
|
self.failIf([] not in [me, 1, 20L, []])
|
|
|
|
|
|
|
|
def test_harmful_mixed_comparison(self):
|
|
|
|
me = self.theclass(1, 1, 1)
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, lambda: me < ())
|
|
|
|
self.assertRaises(TypeError, lambda: me <= ())
|
|
|
|
self.assertRaises(TypeError, lambda: me > ())
|
|
|
|
self.assertRaises(TypeError, lambda: me >= ())
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, lambda: () < me)
|
|
|
|
self.assertRaises(TypeError, lambda: () <= me)
|
|
|
|
self.assertRaises(TypeError, lambda: () > me)
|
|
|
|
self.assertRaises(TypeError, lambda: () >= me)
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, cmp, (), me)
|
|
|
|
self.assertRaises(TypeError, cmp, me, ())
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
#############################################################################
|
|
|
|
# timedelta tests
|
|
|
|
|
2003-02-07 18:50:28 -04:00
|
|
|
class TestTimeDelta(HarmlessMixedComparison):
|
|
|
|
|
|
|
|
theclass = timedelta
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_constructor(self):
|
|
|
|
eq = self.assertEqual
|
|
|
|
td = timedelta
|
|
|
|
|
|
|
|
# Check keyword args to constructor
|
|
|
|
eq(td(), td(weeks=0, days=0, hours=0, minutes=0, seconds=0,
|
|
|
|
milliseconds=0, microseconds=0))
|
|
|
|
eq(td(1), td(days=1))
|
|
|
|
eq(td(0, 1), td(seconds=1))
|
|
|
|
eq(td(0, 0, 1), td(microseconds=1))
|
|
|
|
eq(td(weeks=1), td(days=7))
|
|
|
|
eq(td(days=1), td(hours=24))
|
|
|
|
eq(td(hours=1), td(minutes=60))
|
|
|
|
eq(td(minutes=1), td(seconds=60))
|
|
|
|
eq(td(seconds=1), td(milliseconds=1000))
|
|
|
|
eq(td(milliseconds=1), td(microseconds=1000))
|
|
|
|
|
|
|
|
# Check float args to constructor
|
|
|
|
eq(td(weeks=1.0/7), td(days=1))
|
|
|
|
eq(td(days=1.0/24), td(hours=1))
|
|
|
|
eq(td(hours=1.0/60), td(minutes=1))
|
|
|
|
eq(td(minutes=1.0/60), td(seconds=1))
|
|
|
|
eq(td(seconds=0.001), td(milliseconds=1))
|
|
|
|
eq(td(milliseconds=0.001), td(microseconds=1))
|
|
|
|
|
|
|
|
def test_computations(self):
|
|
|
|
eq = self.assertEqual
|
|
|
|
td = timedelta
|
|
|
|
|
|
|
|
a = td(7) # One week
|
|
|
|
b = td(0, 60) # One minute
|
|
|
|
c = td(0, 0, 1000) # One millisecond
|
|
|
|
eq(a+b+c, td(7, 60, 1000))
|
|
|
|
eq(a-b, td(6, 24*3600 - 60))
|
|
|
|
eq(-a, td(-7))
|
|
|
|
eq(+a, td(7))
|
|
|
|
eq(-b, td(-1, 24*3600 - 60))
|
|
|
|
eq(-c, td(-1, 24*3600 - 1, 999000))
|
|
|
|
eq(abs(a), a)
|
|
|
|
eq(abs(-a), a)
|
|
|
|
eq(td(6, 24*3600), a)
|
|
|
|
eq(td(0, 0, 60*1000000), b)
|
|
|
|
eq(a*10, td(70))
|
|
|
|
eq(a*10, 10*a)
|
|
|
|
eq(a*10L, 10*a)
|
|
|
|
eq(b*10, td(0, 600))
|
|
|
|
eq(10*b, td(0, 600))
|
|
|
|
eq(b*10L, td(0, 600))
|
|
|
|
eq(c*10, td(0, 0, 10000))
|
|
|
|
eq(10*c, td(0, 0, 10000))
|
|
|
|
eq(c*10L, td(0, 0, 10000))
|
|
|
|
eq(a*-1, -a)
|
|
|
|
eq(b*-2, -b-b)
|
|
|
|
eq(c*-2, -c+-c)
|
|
|
|
eq(b*(60*24), (b*60)*24)
|
|
|
|
eq(b*(60*24), (60*b)*24)
|
|
|
|
eq(c*1000, td(0, 1))
|
|
|
|
eq(1000*c, td(0, 1))
|
|
|
|
eq(a//7, td(1))
|
|
|
|
eq(b//10, td(0, 6))
|
|
|
|
eq(c//1000, td(0, 0, 1))
|
|
|
|
eq(a//10, td(0, 7*24*360))
|
|
|
|
eq(a//3600000, td(0, 0, 7*24*1000))
|
|
|
|
|
|
|
|
def test_disallowed_computations(self):
|
|
|
|
a = timedelta(42)
|
|
|
|
|
|
|
|
# Add/sub ints, longs, floats should be illegal
|
|
|
|
for i in 1, 1L, 1.0:
|
|
|
|
self.assertRaises(TypeError, lambda: a+i)
|
|
|
|
self.assertRaises(TypeError, lambda: a-i)
|
|
|
|
self.assertRaises(TypeError, lambda: i+a)
|
|
|
|
self.assertRaises(TypeError, lambda: i-a)
|
|
|
|
|
|
|
|
# Mul/div by float isn't supported.
|
|
|
|
x = 2.3
|
|
|
|
self.assertRaises(TypeError, lambda: a*x)
|
|
|
|
self.assertRaises(TypeError, lambda: x*a)
|
|
|
|
self.assertRaises(TypeError, lambda: a/x)
|
|
|
|
self.assertRaises(TypeError, lambda: x/a)
|
|
|
|
self.assertRaises(TypeError, lambda: a // x)
|
|
|
|
self.assertRaises(TypeError, lambda: x // a)
|
|
|
|
|
|
|
|
# Divison of int by timedelta doesn't make sense.
|
|
|
|
# Division by zero doesn't make sense.
|
|
|
|
for zero in 0, 0L:
|
|
|
|
self.assertRaises(TypeError, lambda: zero // a)
|
|
|
|
self.assertRaises(ZeroDivisionError, lambda: a // zero)
|
|
|
|
|
|
|
|
def test_basic_attributes(self):
|
|
|
|
days, seconds, us = 1, 7, 31
|
|
|
|
td = timedelta(days, seconds, us)
|
|
|
|
self.assertEqual(td.days, days)
|
|
|
|
self.assertEqual(td.seconds, seconds)
|
|
|
|
self.assertEqual(td.microseconds, us)
|
|
|
|
|
|
|
|
def test_carries(self):
|
|
|
|
t1 = timedelta(days=100,
|
|
|
|
weeks=-7,
|
|
|
|
hours=-24*(100-49),
|
|
|
|
minutes=-3,
|
|
|
|
seconds=12,
|
|
|
|
microseconds=(3*60 - 12) * 1e6 + 1)
|
|
|
|
t2 = timedelta(microseconds=1)
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
|
|
|
|
def test_hash_equality(self):
|
|
|
|
t1 = timedelta(days=100,
|
|
|
|
weeks=-7,
|
|
|
|
hours=-24*(100-49),
|
|
|
|
minutes=-3,
|
|
|
|
seconds=12,
|
|
|
|
microseconds=(3*60 - 12) * 1000000)
|
|
|
|
t2 = timedelta()
|
|
|
|
self.assertEqual(hash(t1), hash(t2))
|
|
|
|
|
|
|
|
t1 += timedelta(weeks=7)
|
|
|
|
t2 += timedelta(days=7*7)
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
self.assertEqual(hash(t1), hash(t2))
|
|
|
|
|
|
|
|
d = {t1: 1}
|
|
|
|
d[t2] = 2
|
|
|
|
self.assertEqual(len(d), 1)
|
|
|
|
self.assertEqual(d[t1], 2)
|
|
|
|
|
|
|
|
def test_pickling(self):
|
|
|
|
args = 12, 34, 56
|
|
|
|
orig = timedelta(*args)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_compare(self):
|
|
|
|
t1 = timedelta(2, 3, 4)
|
|
|
|
t2 = timedelta(2, 3, 4)
|
|
|
|
self.failUnless(t1 == t2)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t1 >= t2)
|
|
|
|
self.failUnless(not t1 != t2)
|
|
|
|
self.failUnless(not t1 < t2)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.assertEqual(cmp(t1, t2), 0)
|
|
|
|
self.assertEqual(cmp(t2, t1), 0)
|
|
|
|
|
|
|
|
for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
|
|
|
|
t2 = timedelta(*args) # this is larger than t1
|
|
|
|
self.failUnless(t1 < t2)
|
|
|
|
self.failUnless(t2 > t1)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t2 >= t1)
|
|
|
|
self.failUnless(t1 != t2)
|
|
|
|
self.failUnless(t2 != t1)
|
|
|
|
self.failUnless(not t1 == t2)
|
|
|
|
self.failUnless(not t2 == t1)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.failUnless(not t2 < t1)
|
|
|
|
self.failUnless(not t1 >= t2)
|
|
|
|
self.failUnless(not t2 <= t1)
|
|
|
|
self.assertEqual(cmp(t1, t2), -1)
|
|
|
|
self.assertEqual(cmp(t2, t1), 1)
|
|
|
|
|
2003-02-07 23:46:31 -04:00
|
|
|
for badarg in OTHERSTUFF:
|
2003-02-07 18:50:28 -04:00
|
|
|
self.assertEqual(t1 == badarg, False)
|
|
|
|
self.assertEqual(t1 != badarg, True)
|
|
|
|
self.assertEqual(badarg == t1, False)
|
|
|
|
self.assertEqual(badarg != t1, True)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertRaises(TypeError, lambda: t1 <= badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 < badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 > badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 >= badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg <= t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg < t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg > t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg >= t1)
|
|
|
|
|
|
|
|
def test_str(self):
|
|
|
|
td = timedelta
|
|
|
|
eq = self.assertEqual
|
|
|
|
|
|
|
|
eq(str(td(1)), "1 day, 0:00:00")
|
|
|
|
eq(str(td(-1)), "-1 day, 0:00:00")
|
|
|
|
eq(str(td(2)), "2 days, 0:00:00")
|
|
|
|
eq(str(td(-2)), "-2 days, 0:00:00")
|
|
|
|
|
|
|
|
eq(str(td(hours=12, minutes=58, seconds=59)), "12:58:59")
|
|
|
|
eq(str(td(hours=2, minutes=3, seconds=4)), "2:03:04")
|
|
|
|
eq(str(td(weeks=-30, hours=23, minutes=12, seconds=34)),
|
|
|
|
"-210 days, 23:12:34")
|
|
|
|
|
|
|
|
eq(str(td(milliseconds=1)), "0:00:00.001000")
|
|
|
|
eq(str(td(microseconds=3)), "0:00:00.000003")
|
|
|
|
|
|
|
|
eq(str(td(days=999999999, hours=23, minutes=59, seconds=59,
|
|
|
|
microseconds=999999)),
|
|
|
|
"999999999 days, 23:59:59.999999")
|
|
|
|
|
|
|
|
def test_roundtrip(self):
|
|
|
|
for td in (timedelta(days=999999999, hours=23, minutes=59,
|
|
|
|
seconds=59, microseconds=999999),
|
|
|
|
timedelta(days=-999999999),
|
|
|
|
timedelta(days=1, seconds=2, microseconds=3)):
|
|
|
|
|
|
|
|
# Verify td -> string -> td identity.
|
|
|
|
s = repr(td)
|
|
|
|
self.failUnless(s.startswith('datetime.'))
|
|
|
|
s = s[9:]
|
|
|
|
td2 = eval(s)
|
|
|
|
self.assertEqual(td, td2)
|
|
|
|
|
|
|
|
# Verify identity via reconstructing from pieces.
|
|
|
|
td2 = timedelta(td.days, td.seconds, td.microseconds)
|
|
|
|
self.assertEqual(td, td2)
|
|
|
|
|
|
|
|
def test_resolution_info(self):
|
|
|
|
self.assert_(isinstance(timedelta.min, timedelta))
|
|
|
|
self.assert_(isinstance(timedelta.max, timedelta))
|
|
|
|
self.assert_(isinstance(timedelta.resolution, timedelta))
|
|
|
|
self.assert_(timedelta.max > timedelta.min)
|
|
|
|
self.assertEqual(timedelta.min, timedelta(-999999999))
|
|
|
|
self.assertEqual(timedelta.max, timedelta(999999999, 24*3600-1, 1e6-1))
|
|
|
|
self.assertEqual(timedelta.resolution, timedelta(0, 0, 1))
|
|
|
|
|
|
|
|
def test_overflow(self):
|
|
|
|
tiny = timedelta.resolution
|
|
|
|
|
|
|
|
td = timedelta.min + tiny
|
|
|
|
td -= tiny # no problem
|
|
|
|
self.assertRaises(OverflowError, td.__sub__, tiny)
|
|
|
|
self.assertRaises(OverflowError, td.__add__, -tiny)
|
|
|
|
|
|
|
|
td = timedelta.max - tiny
|
|
|
|
td += tiny # no problem
|
|
|
|
self.assertRaises(OverflowError, td.__add__, tiny)
|
|
|
|
self.assertRaises(OverflowError, td.__sub__, -tiny)
|
|
|
|
|
|
|
|
self.assertRaises(OverflowError, lambda: -timedelta.max)
|
|
|
|
|
|
|
|
def test_microsecond_rounding(self):
|
|
|
|
td = timedelta
|
|
|
|
eq = self.assertEqual
|
|
|
|
|
|
|
|
# Single-field rounding.
|
|
|
|
eq(td(milliseconds=0.4/1000), td(0)) # rounds to 0
|
|
|
|
eq(td(milliseconds=-0.4/1000), td(0)) # rounds to 0
|
|
|
|
eq(td(milliseconds=0.6/1000), td(microseconds=1))
|
|
|
|
eq(td(milliseconds=-0.6/1000), td(microseconds=-1))
|
|
|
|
|
|
|
|
# Rounding due to contributions from more than one field.
|
|
|
|
us_per_hour = 3600e6
|
|
|
|
us_per_day = us_per_hour * 24
|
|
|
|
eq(td(days=.4/us_per_day), td(0))
|
|
|
|
eq(td(hours=.2/us_per_hour), td(0))
|
|
|
|
eq(td(days=.4/us_per_day, hours=.2/us_per_hour), td(microseconds=1))
|
|
|
|
|
|
|
|
eq(td(days=-.4/us_per_day), td(0))
|
|
|
|
eq(td(hours=-.2/us_per_hour), td(0))
|
|
|
|
eq(td(days=-.4/us_per_day, hours=-.2/us_per_hour), td(microseconds=-1))
|
|
|
|
|
|
|
|
def test_massive_normalization(self):
|
|
|
|
td = timedelta(microseconds=-1)
|
|
|
|
self.assertEqual((td.days, td.seconds, td.microseconds),
|
|
|
|
(-1, 24*3600-1, 999999))
|
|
|
|
|
|
|
|
def test_bool(self):
|
|
|
|
self.failUnless(timedelta(1))
|
|
|
|
self.failUnless(timedelta(0, 1))
|
|
|
|
self.failUnless(timedelta(0, 0, 1))
|
|
|
|
self.failUnless(timedelta(microseconds=1))
|
|
|
|
self.failUnless(not timedelta(0))
|
|
|
|
|
2003-05-17 12:57:00 -03:00
|
|
|
def test_subclass_timedelta(self):
|
|
|
|
|
|
|
|
class T(timedelta):
|
2005-01-15 20:25:31 -04:00
|
|
|
@staticmethod
|
2003-05-17 12:57:00 -03:00
|
|
|
def from_td(td):
|
|
|
|
return T(td.days, td.seconds, td.microseconds)
|
|
|
|
|
|
|
|
def as_hours(self):
|
|
|
|
sum = (self.days * 24 +
|
|
|
|
self.seconds / 3600.0 +
|
|
|
|
self.microseconds / 3600e6)
|
|
|
|
return round(sum)
|
|
|
|
|
|
|
|
t1 = T(days=1)
|
|
|
|
self.assert_(type(t1) is T)
|
|
|
|
self.assertEqual(t1.as_hours(), 24)
|
|
|
|
|
|
|
|
t2 = T(days=-1, seconds=-3600)
|
|
|
|
self.assert_(type(t2) is T)
|
|
|
|
self.assertEqual(t2.as_hours(), -25)
|
|
|
|
|
|
|
|
t3 = t1 + t2
|
|
|
|
self.assert_(type(t3) is timedelta)
|
|
|
|
t4 = T.from_td(t3)
|
|
|
|
self.assert_(type(t4) is T)
|
|
|
|
self.assertEqual(t3.days, t4.days)
|
|
|
|
self.assertEqual(t3.seconds, t4.seconds)
|
|
|
|
self.assertEqual(t3.microseconds, t4.microseconds)
|
|
|
|
self.assertEqual(str(t3), str(t4))
|
|
|
|
self.assertEqual(t4.as_hours(), -1)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
#############################################################################
|
|
|
|
# date tests
|
|
|
|
|
|
|
|
class TestDateOnly(unittest.TestCase):
|
|
|
|
# Tests here won't pass if also run on datetime objects, so don't
|
|
|
|
# subclass this to test datetimes too.
|
|
|
|
|
|
|
|
def test_delta_non_days_ignored(self):
|
|
|
|
dt = date(2000, 1, 2)
|
|
|
|
delta = timedelta(days=1, hours=2, minutes=3, seconds=4,
|
|
|
|
microseconds=5)
|
|
|
|
days = timedelta(delta.days)
|
|
|
|
self.assertEqual(days, timedelta(1))
|
|
|
|
|
|
|
|
dt2 = dt + delta
|
|
|
|
self.assertEqual(dt2, dt + days)
|
|
|
|
|
|
|
|
dt2 = delta + dt
|
|
|
|
self.assertEqual(dt2, dt + days)
|
|
|
|
|
|
|
|
dt2 = dt - delta
|
|
|
|
self.assertEqual(dt2, dt - days)
|
|
|
|
|
|
|
|
delta = -delta
|
|
|
|
days = timedelta(delta.days)
|
|
|
|
self.assertEqual(days, timedelta(-2))
|
|
|
|
|
|
|
|
dt2 = dt + delta
|
|
|
|
self.assertEqual(dt2, dt + days)
|
|
|
|
|
|
|
|
dt2 = delta + dt
|
|
|
|
self.assertEqual(dt2, dt + days)
|
|
|
|
|
|
|
|
dt2 = dt - delta
|
|
|
|
self.assertEqual(dt2, dt - days)
|
|
|
|
|
2004-06-07 20:04:33 -03:00
|
|
|
class SubclassDate(date):
|
|
|
|
sub_var = 1
|
|
|
|
|
2003-02-07 18:50:28 -04:00
|
|
|
class TestDate(HarmlessMixedComparison):
|
2002-12-16 16:18:38 -04:00
|
|
|
# Tests here should pass for both dates and datetimes, except for a
|
|
|
|
# few tests that TestDateTime overrides.
|
|
|
|
|
|
|
|
theclass = date
|
|
|
|
|
|
|
|
def test_basic_attributes(self):
|
|
|
|
dt = self.theclass(2002, 3, 1)
|
|
|
|
self.assertEqual(dt.year, 2002)
|
|
|
|
self.assertEqual(dt.month, 3)
|
|
|
|
self.assertEqual(dt.day, 1)
|
|
|
|
|
|
|
|
def test_roundtrip(self):
|
|
|
|
for dt in (self.theclass(1, 2, 3),
|
|
|
|
self.theclass.today()):
|
|
|
|
# Verify dt -> string -> date identity.
|
|
|
|
s = repr(dt)
|
|
|
|
self.failUnless(s.startswith('datetime.'))
|
|
|
|
s = s[9:]
|
|
|
|
dt2 = eval(s)
|
|
|
|
self.assertEqual(dt, dt2)
|
|
|
|
|
|
|
|
# Verify identity via reconstructing from pieces.
|
|
|
|
dt2 = self.theclass(dt.year, dt.month, dt.day)
|
|
|
|
self.assertEqual(dt, dt2)
|
|
|
|
|
|
|
|
def test_ordinal_conversions(self):
|
|
|
|
# Check some fixed values.
|
|
|
|
for y, m, d, n in [(1, 1, 1, 1), # calendar origin
|
|
|
|
(1, 12, 31, 365),
|
|
|
|
(2, 1, 1, 366),
|
|
|
|
# first example from "Calendrical Calculations"
|
|
|
|
(1945, 11, 12, 710347)]:
|
|
|
|
d = self.theclass(y, m, d)
|
|
|
|
self.assertEqual(n, d.toordinal())
|
|
|
|
fromord = self.theclass.fromordinal(n)
|
|
|
|
self.assertEqual(d, fromord)
|
|
|
|
if hasattr(fromord, "hour"):
|
2003-02-18 22:35:07 -04:00
|
|
|
# if we're checking something fancier than a date, verify
|
|
|
|
# the extra fields have been zeroed out
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(fromord.hour, 0)
|
|
|
|
self.assertEqual(fromord.minute, 0)
|
|
|
|
self.assertEqual(fromord.second, 0)
|
|
|
|
self.assertEqual(fromord.microsecond, 0)
|
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
# Check first and last days of year spottily across the whole
|
|
|
|
# range of years supported.
|
|
|
|
for year in xrange(MINYEAR, MAXYEAR+1, 7):
|
2002-12-16 16:18:38 -04:00
|
|
|
# Verify (year, 1, 1) -> ordinal -> y, m, d is identity.
|
|
|
|
d = self.theclass(year, 1, 1)
|
|
|
|
n = d.toordinal()
|
|
|
|
d2 = self.theclass.fromordinal(n)
|
|
|
|
self.assertEqual(d, d2)
|
2003-01-08 16:40:01 -04:00
|
|
|
# Verify that moving back a day gets to the end of year-1.
|
|
|
|
if year > 1:
|
|
|
|
d = self.theclass.fromordinal(n-1)
|
|
|
|
d2 = self.theclass(year-1, 12, 31)
|
|
|
|
self.assertEqual(d, d2)
|
|
|
|
self.assertEqual(d2.toordinal(), n-1)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
# Test every day in a leap-year and a non-leap year.
|
|
|
|
dim = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
|
|
|
|
for year, isleap in (2000, True), (2002, False):
|
|
|
|
n = self.theclass(year, 1, 1).toordinal()
|
|
|
|
for month, maxday in zip(range(1, 13), dim):
|
|
|
|
if month == 2 and isleap:
|
|
|
|
maxday += 1
|
|
|
|
for day in range(1, maxday+1):
|
|
|
|
d = self.theclass(year, month, day)
|
|
|
|
self.assertEqual(d.toordinal(), n)
|
|
|
|
self.assertEqual(d, self.theclass.fromordinal(n))
|
|
|
|
n += 1
|
|
|
|
|
|
|
|
def test_extreme_ordinals(self):
|
|
|
|
a = self.theclass.min
|
|
|
|
a = self.theclass(a.year, a.month, a.day) # get rid of time parts
|
|
|
|
aord = a.toordinal()
|
|
|
|
b = a.fromordinal(aord)
|
|
|
|
self.assertEqual(a, b)
|
|
|
|
|
|
|
|
self.assertRaises(ValueError, lambda: a.fromordinal(aord - 1))
|
|
|
|
|
|
|
|
b = a + timedelta(days=1)
|
|
|
|
self.assertEqual(b.toordinal(), aord + 1)
|
|
|
|
self.assertEqual(b, self.theclass.fromordinal(aord + 1))
|
|
|
|
|
|
|
|
a = self.theclass.max
|
|
|
|
a = self.theclass(a.year, a.month, a.day) # get rid of time parts
|
|
|
|
aord = a.toordinal()
|
|
|
|
b = a.fromordinal(aord)
|
|
|
|
self.assertEqual(a, b)
|
|
|
|
|
|
|
|
self.assertRaises(ValueError, lambda: a.fromordinal(aord + 1))
|
|
|
|
|
|
|
|
b = a - timedelta(days=1)
|
|
|
|
self.assertEqual(b.toordinal(), aord - 1)
|
|
|
|
self.assertEqual(b, self.theclass.fromordinal(aord - 1))
|
|
|
|
|
|
|
|
def test_bad_constructor_arguments(self):
|
|
|
|
# bad years
|
|
|
|
self.theclass(MINYEAR, 1, 1) # no exception
|
|
|
|
self.theclass(MAXYEAR, 1, 1) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, MINYEAR-1, 1, 1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, MAXYEAR+1, 1, 1)
|
|
|
|
# bad months
|
|
|
|
self.theclass(2000, 1, 1) # no exception
|
|
|
|
self.theclass(2000, 12, 1) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 0, 1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 13, 1)
|
|
|
|
# bad days
|
|
|
|
self.theclass(2000, 2, 29) # no exception
|
|
|
|
self.theclass(2004, 2, 29) # no exception
|
|
|
|
self.theclass(2400, 2, 29) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 2, 30)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2001, 2, 29)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2100, 2, 29)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 1900, 2, 29)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 0)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 32)
|
|
|
|
|
|
|
|
def test_hash_equality(self):
|
|
|
|
d = self.theclass(2000, 12, 31)
|
|
|
|
# same thing
|
|
|
|
e = self.theclass(2000, 12, 31)
|
|
|
|
self.assertEqual(d, e)
|
|
|
|
self.assertEqual(hash(d), hash(e))
|
|
|
|
|
|
|
|
dic = {d: 1}
|
|
|
|
dic[e] = 2
|
|
|
|
self.assertEqual(len(dic), 1)
|
|
|
|
self.assertEqual(dic[d], 2)
|
|
|
|
self.assertEqual(dic[e], 2)
|
|
|
|
|
|
|
|
d = self.theclass(2001, 1, 1)
|
|
|
|
# same thing
|
|
|
|
e = self.theclass(2001, 1, 1)
|
|
|
|
self.assertEqual(d, e)
|
|
|
|
self.assertEqual(hash(d), hash(e))
|
|
|
|
|
|
|
|
dic = {d: 1}
|
|
|
|
dic[e] = 2
|
|
|
|
self.assertEqual(len(dic), 1)
|
|
|
|
self.assertEqual(dic[d], 2)
|
|
|
|
self.assertEqual(dic[e], 2)
|
|
|
|
|
|
|
|
def test_computations(self):
|
|
|
|
a = self.theclass(2002, 1, 31)
|
|
|
|
b = self.theclass(1956, 1, 31)
|
|
|
|
|
|
|
|
diff = a-b
|
|
|
|
self.assertEqual(diff.days, 46*365 + len(range(1956, 2002, 4)))
|
|
|
|
self.assertEqual(diff.seconds, 0)
|
|
|
|
self.assertEqual(diff.microseconds, 0)
|
|
|
|
|
|
|
|
day = timedelta(1)
|
|
|
|
week = timedelta(7)
|
|
|
|
a = self.theclass(2002, 3, 2)
|
|
|
|
self.assertEqual(a + day, self.theclass(2002, 3, 3))
|
|
|
|
self.assertEqual(day + a, self.theclass(2002, 3, 3))
|
|
|
|
self.assertEqual(a - day, self.theclass(2002, 3, 1))
|
|
|
|
self.assertEqual(-day + a, self.theclass(2002, 3, 1))
|
|
|
|
self.assertEqual(a + week, self.theclass(2002, 3, 9))
|
|
|
|
self.assertEqual(a - week, self.theclass(2002, 2, 23))
|
|
|
|
self.assertEqual(a + 52*week, self.theclass(2003, 3, 1))
|
|
|
|
self.assertEqual(a - 52*week, self.theclass(2001, 3, 3))
|
|
|
|
self.assertEqual((a + week) - a, week)
|
|
|
|
self.assertEqual((a + day) - a, day)
|
|
|
|
self.assertEqual((a - week) - a, -week)
|
|
|
|
self.assertEqual((a - day) - a, -day)
|
|
|
|
self.assertEqual(a - (a + week), -week)
|
|
|
|
self.assertEqual(a - (a + day), -day)
|
|
|
|
self.assertEqual(a - (a - week), week)
|
|
|
|
self.assertEqual(a - (a - day), day)
|
|
|
|
|
|
|
|
# Add/sub ints, longs, floats should be illegal
|
|
|
|
for i in 1, 1L, 1.0:
|
|
|
|
self.assertRaises(TypeError, lambda: a+i)
|
|
|
|
self.assertRaises(TypeError, lambda: a-i)
|
|
|
|
self.assertRaises(TypeError, lambda: i+a)
|
|
|
|
self.assertRaises(TypeError, lambda: i-a)
|
|
|
|
|
|
|
|
# delta - date is senseless.
|
|
|
|
self.assertRaises(TypeError, lambda: day - a)
|
|
|
|
# mixing date and (delta or date) via * or // is senseless
|
|
|
|
self.assertRaises(TypeError, lambda: day * a)
|
|
|
|
self.assertRaises(TypeError, lambda: a * day)
|
|
|
|
self.assertRaises(TypeError, lambda: day // a)
|
|
|
|
self.assertRaises(TypeError, lambda: a // day)
|
|
|
|
self.assertRaises(TypeError, lambda: a * a)
|
|
|
|
self.assertRaises(TypeError, lambda: a // a)
|
|
|
|
# date + date is senseless
|
|
|
|
self.assertRaises(TypeError, lambda: a + a)
|
|
|
|
|
|
|
|
def test_overflow(self):
|
|
|
|
tiny = self.theclass.resolution
|
|
|
|
|
|
|
|
dt = self.theclass.min + tiny
|
|
|
|
dt -= tiny # no problem
|
|
|
|
self.assertRaises(OverflowError, dt.__sub__, tiny)
|
|
|
|
self.assertRaises(OverflowError, dt.__add__, -tiny)
|
|
|
|
|
|
|
|
dt = self.theclass.max - tiny
|
|
|
|
dt += tiny # no problem
|
|
|
|
self.assertRaises(OverflowError, dt.__add__, tiny)
|
|
|
|
self.assertRaises(OverflowError, dt.__sub__, -tiny)
|
|
|
|
|
|
|
|
def test_fromtimestamp(self):
|
|
|
|
import time
|
|
|
|
|
|
|
|
# Try an arbitrary fixed value.
|
|
|
|
year, month, day = 1999, 9, 19
|
|
|
|
ts = time.mktime((year, month, day, 0, 0, 0, 0, 0, -1))
|
|
|
|
d = self.theclass.fromtimestamp(ts)
|
|
|
|
self.assertEqual(d.year, year)
|
|
|
|
self.assertEqual(d.month, month)
|
|
|
|
self.assertEqual(d.day, day)
|
|
|
|
|
2004-06-19 23:50:16 -03:00
|
|
|
def test_insane_fromtimestamp(self):
|
|
|
|
# It's possible that some platform maps time_t to double,
|
|
|
|
# and that this test will fail there. This test should
|
|
|
|
# exempt such platforms (provided they return reasonable
|
|
|
|
# results!).
|
|
|
|
for insane in -1e200, 1e200:
|
|
|
|
self.assertRaises(ValueError, self.theclass.fromtimestamp,
|
|
|
|
insane)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_today(self):
|
|
|
|
import time
|
|
|
|
|
|
|
|
# We claim that today() is like fromtimestamp(time.time()), so
|
|
|
|
# prove it.
|
|
|
|
for dummy in range(3):
|
|
|
|
today = self.theclass.today()
|
|
|
|
ts = time.time()
|
|
|
|
todayagain = self.theclass.fromtimestamp(ts)
|
|
|
|
if today == todayagain:
|
|
|
|
break
|
|
|
|
# There are several legit reasons that could fail:
|
|
|
|
# 1. It recently became midnight, between the today() and the
|
|
|
|
# time() calls.
|
|
|
|
# 2. The platform time() has such fine resolution that we'll
|
|
|
|
# never get the same value twice.
|
|
|
|
# 3. The platform time() has poor resolution, and we just
|
|
|
|
# happened to call today() right before a resolution quantum
|
|
|
|
# boundary.
|
|
|
|
# 4. The system clock got fiddled between calls.
|
|
|
|
# In any case, wait a little while and try again.
|
|
|
|
time.sleep(0.1)
|
|
|
|
|
|
|
|
# It worked or it didn't. If it didn't, assume it's reason #2, and
|
|
|
|
# let the test pass if they're within half a second of each other.
|
|
|
|
self.failUnless(today == todayagain or
|
|
|
|
abs(todayagain - today) < timedelta(seconds=0.5))
|
|
|
|
|
|
|
|
def test_weekday(self):
|
|
|
|
for i in range(7):
|
|
|
|
# March 4, 2002 is a Monday
|
|
|
|
self.assertEqual(self.theclass(2002, 3, 4+i).weekday(), i)
|
|
|
|
self.assertEqual(self.theclass(2002, 3, 4+i).isoweekday(), i+1)
|
|
|
|
# January 2, 1956 is a Monday
|
|
|
|
self.assertEqual(self.theclass(1956, 1, 2+i).weekday(), i)
|
|
|
|
self.assertEqual(self.theclass(1956, 1, 2+i).isoweekday(), i+1)
|
|
|
|
|
|
|
|
def test_isocalendar(self):
|
|
|
|
# Check examples from
|
|
|
|
# http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
|
|
|
|
for i in range(7):
|
|
|
|
d = self.theclass(2003, 12, 22+i)
|
|
|
|
self.assertEqual(d.isocalendar(), (2003, 52, i+1))
|
|
|
|
d = self.theclass(2003, 12, 29) + timedelta(i)
|
|
|
|
self.assertEqual(d.isocalendar(), (2004, 1, i+1))
|
|
|
|
d = self.theclass(2004, 1, 5+i)
|
|
|
|
self.assertEqual(d.isocalendar(), (2004, 2, i+1))
|
|
|
|
d = self.theclass(2009, 12, 21+i)
|
|
|
|
self.assertEqual(d.isocalendar(), (2009, 52, i+1))
|
|
|
|
d = self.theclass(2009, 12, 28) + timedelta(i)
|
|
|
|
self.assertEqual(d.isocalendar(), (2009, 53, i+1))
|
|
|
|
d = self.theclass(2010, 1, 4+i)
|
|
|
|
self.assertEqual(d.isocalendar(), (2010, 1, i+1))
|
|
|
|
|
|
|
|
def test_iso_long_years(self):
|
|
|
|
# Calculate long ISO years and compare to table from
|
|
|
|
# http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
|
|
|
|
ISO_LONG_YEARS_TABLE = """
|
|
|
|
4 32 60 88
|
|
|
|
9 37 65 93
|
|
|
|
15 43 71 99
|
|
|
|
20 48 76
|
|
|
|
26 54 82
|
|
|
|
|
|
|
|
105 133 161 189
|
|
|
|
111 139 167 195
|
|
|
|
116 144 172
|
|
|
|
122 150 178
|
|
|
|
128 156 184
|
|
|
|
|
|
|
|
201 229 257 285
|
|
|
|
207 235 263 291
|
|
|
|
212 240 268 296
|
|
|
|
218 246 274
|
|
|
|
224 252 280
|
|
|
|
|
|
|
|
303 331 359 387
|
|
|
|
308 336 364 392
|
|
|
|
314 342 370 398
|
|
|
|
320 348 376
|
|
|
|
325 353 381
|
|
|
|
"""
|
|
|
|
iso_long_years = map(int, ISO_LONG_YEARS_TABLE.split())
|
|
|
|
iso_long_years.sort()
|
|
|
|
L = []
|
|
|
|
for i in range(400):
|
|
|
|
d = self.theclass(2000+i, 12, 31)
|
|
|
|
d1 = self.theclass(1600+i, 12, 31)
|
|
|
|
self.assertEqual(d.isocalendar()[1:], d1.isocalendar()[1:])
|
|
|
|
if d.isocalendar()[1] == 53:
|
|
|
|
L.append(i)
|
|
|
|
self.assertEqual(L, iso_long_years)
|
|
|
|
|
|
|
|
def test_isoformat(self):
|
|
|
|
t = self.theclass(2, 3, 2)
|
|
|
|
self.assertEqual(t.isoformat(), "0002-03-02")
|
|
|
|
|
|
|
|
def test_ctime(self):
|
|
|
|
t = self.theclass(2002, 3, 2)
|
|
|
|
self.assertEqual(t.ctime(), "Sat Mar 2 00:00:00 2002")
|
|
|
|
|
|
|
|
def test_strftime(self):
|
|
|
|
t = self.theclass(2005, 3, 2)
|
|
|
|
self.assertEqual(t.strftime("m:%m d:%d y:%y"), "m:03 d:02 y:05")
|
2003-06-27 05:14:17 -03:00
|
|
|
self.assertEqual(t.strftime(""), "") # SF bug #761337
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
self.assertRaises(TypeError, t.strftime) # needs an arg
|
|
|
|
self.assertRaises(TypeError, t.strftime, "one", "two") # too many args
|
|
|
|
self.assertRaises(TypeError, t.strftime, 42) # arg wrong type
|
|
|
|
|
|
|
|
# A naive object replaces %z and %Z w/ empty strings.
|
|
|
|
self.assertEqual(t.strftime("'%z' '%Z'"), "'' ''")
|
|
|
|
|
|
|
|
def test_resolution_info(self):
|
|
|
|
self.assert_(isinstance(self.theclass.min, self.theclass))
|
|
|
|
self.assert_(isinstance(self.theclass.max, self.theclass))
|
|
|
|
self.assert_(isinstance(self.theclass.resolution, timedelta))
|
|
|
|
self.assert_(self.theclass.max > self.theclass.min)
|
|
|
|
|
|
|
|
def test_extreme_timedelta(self):
|
|
|
|
big = self.theclass.max - self.theclass.min
|
|
|
|
# 3652058 days, 23 hours, 59 minutes, 59 seconds, 999999 microseconds
|
|
|
|
n = (big.days*24*3600 + big.seconds)*1000000 + big.microseconds
|
|
|
|
# n == 315537897599999999 ~= 2**58.13
|
|
|
|
justasbig = timedelta(0, 0, n)
|
|
|
|
self.assertEqual(big, justasbig)
|
|
|
|
self.assertEqual(self.theclass.min + big, self.theclass.max)
|
|
|
|
self.assertEqual(self.theclass.max - big, self.theclass.min)
|
|
|
|
|
|
|
|
def test_timetuple(self):
|
|
|
|
for i in range(7):
|
|
|
|
# January 2, 1956 is a Monday (0)
|
|
|
|
d = self.theclass(1956, 1, 2+i)
|
|
|
|
t = d.timetuple()
|
|
|
|
self.assertEqual(t, (1956, 1, 2+i, 0, 0, 0, i, 2+i, -1))
|
|
|
|
# February 1, 1956 is a Wednesday (2)
|
|
|
|
d = self.theclass(1956, 2, 1+i)
|
|
|
|
t = d.timetuple()
|
|
|
|
self.assertEqual(t, (1956, 2, 1+i, 0, 0, 0, (2+i)%7, 32+i, -1))
|
|
|
|
# March 1, 1956 is a Thursday (3), and is the 31+29+1 = 61st day
|
|
|
|
# of the year.
|
|
|
|
d = self.theclass(1956, 3, 1+i)
|
|
|
|
t = d.timetuple()
|
|
|
|
self.assertEqual(t, (1956, 3, 1+i, 0, 0, 0, (3+i)%7, 61+i, -1))
|
|
|
|
self.assertEqual(t.tm_year, 1956)
|
|
|
|
self.assertEqual(t.tm_mon, 3)
|
|
|
|
self.assertEqual(t.tm_mday, 1+i)
|
|
|
|
self.assertEqual(t.tm_hour, 0)
|
|
|
|
self.assertEqual(t.tm_min, 0)
|
|
|
|
self.assertEqual(t.tm_sec, 0)
|
|
|
|
self.assertEqual(t.tm_wday, (3+i)%7)
|
|
|
|
self.assertEqual(t.tm_yday, 61+i)
|
|
|
|
self.assertEqual(t.tm_isdst, -1)
|
|
|
|
|
|
|
|
def test_pickling(self):
|
|
|
|
args = 6, 7, 23
|
|
|
|
orig = self.theclass(*args)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_compare(self):
|
|
|
|
t1 = self.theclass(2, 3, 4)
|
|
|
|
t2 = self.theclass(2, 3, 4)
|
|
|
|
self.failUnless(t1 == t2)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t1 >= t2)
|
|
|
|
self.failUnless(not t1 != t2)
|
|
|
|
self.failUnless(not t1 < t2)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.assertEqual(cmp(t1, t2), 0)
|
|
|
|
self.assertEqual(cmp(t2, t1), 0)
|
|
|
|
|
|
|
|
for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
|
|
|
|
t2 = self.theclass(*args) # this is larger than t1
|
|
|
|
self.failUnless(t1 < t2)
|
|
|
|
self.failUnless(t2 > t1)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t2 >= t1)
|
|
|
|
self.failUnless(t1 != t2)
|
|
|
|
self.failUnless(t2 != t1)
|
|
|
|
self.failUnless(not t1 == t2)
|
|
|
|
self.failUnless(not t2 == t1)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.failUnless(not t2 < t1)
|
|
|
|
self.failUnless(not t1 >= t2)
|
|
|
|
self.failUnless(not t2 <= t1)
|
|
|
|
self.assertEqual(cmp(t1, t2), -1)
|
|
|
|
self.assertEqual(cmp(t2, t1), 1)
|
|
|
|
|
2003-02-07 23:46:31 -04:00
|
|
|
for badarg in OTHERSTUFF:
|
2003-02-07 18:50:28 -04:00
|
|
|
self.assertEqual(t1 == badarg, False)
|
|
|
|
self.assertEqual(t1 != badarg, True)
|
|
|
|
self.assertEqual(badarg == t1, False)
|
|
|
|
self.assertEqual(badarg != t1, True)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertRaises(TypeError, lambda: t1 < badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 > badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 >= badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg <= t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg < t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg > t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg >= t1)
|
|
|
|
|
date and datetime comparison: when we don't know how to
compare against "the other" argument, we raise TypeError,
in order to prevent comparison from falling back to the
default (and worse than useless, in this case) comparison
by object address.
That's fine so far as it goes, but leaves no way for
another date/datetime object to make itself comparable
to our objects. For example, it leaves Marc-Andre no way
to teach mxDateTime dates how to compare against Python
dates.
Discussion on Python-Dev raised a number of impractical
ideas, and the simple one implemented here: when we don't
know how to compare against "the other" argument, we raise
TypeError *unless* the other object has a timetuple attr.
In that case, we return NotImplemented instead, and Python
will give the other object a shot at handling the
comparison then.
Note that comparisons of time and timedelta objects still
suffer the original problem, though.
2003-01-24 18:36:34 -04:00
|
|
|
def test_mixed_compare(self):
|
|
|
|
our = self.theclass(2000, 4, 5)
|
|
|
|
self.assertRaises(TypeError, cmp, our, 1)
|
|
|
|
self.assertRaises(TypeError, cmp, 1, our)
|
|
|
|
|
|
|
|
class AnotherDateTimeClass(object):
|
|
|
|
def __cmp__(self, other):
|
|
|
|
# Return "equal" so calling this can't be confused with
|
|
|
|
# compare-by-address (which never says "equal" for distinct
|
|
|
|
# objects).
|
|
|
|
return 0
|
|
|
|
|
|
|
|
# This still errors, because date and datetime comparison raise
|
|
|
|
# TypeError instead of NotImplemented when they don't know what to
|
|
|
|
# do, in order to stop comparison from falling back to the default
|
|
|
|
# compare-by-address.
|
|
|
|
their = AnotherDateTimeClass()
|
|
|
|
self.assertRaises(TypeError, cmp, our, their)
|
|
|
|
# Oops: The next stab raises TypeError in the C implementation,
|
|
|
|
# but not in the Python implementation of datetime. The difference
|
|
|
|
# is due to that the Python implementation defines __cmp__ but
|
|
|
|
# the C implementation defines tp_richcompare. This is more pain
|
|
|
|
# to fix than it's worth, so commenting out the test.
|
|
|
|
# self.assertEqual(cmp(their, our), 0)
|
|
|
|
|
|
|
|
# But date and datetime comparison return NotImplemented instead if the
|
|
|
|
# other object has a timetuple attr. This gives the other object a
|
|
|
|
# chance to do the comparison.
|
|
|
|
class Comparable(AnotherDateTimeClass):
|
|
|
|
def timetuple(self):
|
|
|
|
return ()
|
|
|
|
|
|
|
|
their = Comparable()
|
|
|
|
self.assertEqual(cmp(our, their), 0)
|
|
|
|
self.assertEqual(cmp(their, our), 0)
|
|
|
|
self.failUnless(our == their)
|
|
|
|
self.failUnless(their == our)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_bool(self):
|
|
|
|
# All dates are considered true.
|
|
|
|
self.failUnless(self.theclass.min)
|
|
|
|
self.failUnless(self.theclass.max)
|
|
|
|
|
2002-12-22 16:58:42 -04:00
|
|
|
def test_srftime_out_of_range(self):
|
|
|
|
# For nasty technical reasons, we can't handle years before 1900.
|
|
|
|
cls = self.theclass
|
|
|
|
self.assertEqual(cls(1900, 1, 1).strftime("%Y"), "1900")
|
|
|
|
for y in 1, 49, 51, 99, 100, 1000, 1899:
|
|
|
|
self.assertRaises(ValueError, cls(y, 1, 1).strftime, "%Y")
|
2002-12-24 01:41:27 -04:00
|
|
|
|
|
|
|
def test_replace(self):
|
|
|
|
cls = self.theclass
|
|
|
|
args = [1, 2, 3]
|
|
|
|
base = cls(*args)
|
|
|
|
self.assertEqual(base, base.replace())
|
|
|
|
|
|
|
|
i = 0
|
|
|
|
for name, newval in (("year", 2),
|
|
|
|
("month", 3),
|
|
|
|
("day", 4)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = newval
|
|
|
|
expected = cls(*newargs)
|
|
|
|
got = base.replace(**{name: newval})
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
i += 1
|
|
|
|
|
|
|
|
# Out of bounds.
|
|
|
|
base = cls(2000, 2, 29)
|
|
|
|
self.assertRaises(ValueError, base.replace, year=2001)
|
|
|
|
|
2003-05-17 02:55:19 -03:00
|
|
|
def test_subclass_date(self):
|
|
|
|
|
|
|
|
class C(self.theclass):
|
|
|
|
theAnswer = 42
|
|
|
|
|
|
|
|
def __new__(cls, *args, **kws):
|
|
|
|
temp = kws.copy()
|
|
|
|
extra = temp.pop('extra')
|
|
|
|
result = self.theclass.__new__(cls, *args, **temp)
|
|
|
|
result.extra = extra
|
|
|
|
return result
|
|
|
|
|
|
|
|
def newmeth(self, start):
|
|
|
|
return start + self.year + self.month
|
|
|
|
|
|
|
|
args = 2003, 4, 14
|
|
|
|
|
|
|
|
dt1 = self.theclass(*args)
|
|
|
|
dt2 = C(*args, **{'extra': 7})
|
|
|
|
|
|
|
|
self.assertEqual(dt2.__class__, C)
|
|
|
|
self.assertEqual(dt2.theAnswer, 42)
|
|
|
|
self.assertEqual(dt2.extra, 7)
|
|
|
|
self.assertEqual(dt1.toordinal(), dt2.toordinal())
|
|
|
|
self.assertEqual(dt2.newmeth(-7), dt1.year + dt1.month - 7)
|
|
|
|
|
2004-06-07 20:04:33 -03:00
|
|
|
def test_pickling_subclass_date(self):
|
|
|
|
|
|
|
|
args = 6, 7, 23
|
|
|
|
orig = SubclassDate(*args)
|
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
|
|
|
|
2004-03-21 19:38:41 -04:00
|
|
|
def test_backdoor_resistance(self):
|
|
|
|
# For fast unpickling, the constructor accepts a pickle string.
|
|
|
|
# This is a low-overhead backdoor. A user can (by intent or
|
|
|
|
# mistake) pass a string directly, which (if it's the right length)
|
|
|
|
# will get treated like a pickle, and bypass the normal sanity
|
|
|
|
# checks in the constructor. This can create insane objects.
|
|
|
|
# The constructor doesn't want to burn the time to validate all
|
|
|
|
# fields, but does check the month field. This stops, e.g.,
|
|
|
|
# datetime.datetime('1995-03-25') from yielding an insane object.
|
|
|
|
base = '1995-03-25'
|
|
|
|
if not issubclass(self.theclass, datetime):
|
|
|
|
base = base[:4]
|
|
|
|
for month_byte in '9', chr(0), chr(13), '\xff':
|
|
|
|
self.assertRaises(TypeError, self.theclass,
|
|
|
|
base[:2] + month_byte + base[3:])
|
|
|
|
for ord_byte in range(1, 13):
|
|
|
|
# This shouldn't blow up because of the month byte alone. If
|
|
|
|
# the implementation changes to do more-careful checking, it may
|
|
|
|
# blow up because other fields are insane.
|
|
|
|
self.theclass(base[:2] + chr(ord_byte) + base[3:])
|
2003-05-16 23:25:20 -03:00
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
#############################################################################
|
|
|
|
# datetime tests
|
|
|
|
|
2004-06-07 20:04:33 -03:00
|
|
|
class SubclassDatetime(datetime):
|
|
|
|
sub_var = 1
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
class TestDateTime(TestDate):
|
|
|
|
|
|
|
|
theclass = datetime
|
|
|
|
|
|
|
|
def test_basic_attributes(self):
|
|
|
|
dt = self.theclass(2002, 3, 1, 12, 0)
|
|
|
|
self.assertEqual(dt.year, 2002)
|
|
|
|
self.assertEqual(dt.month, 3)
|
|
|
|
self.assertEqual(dt.day, 1)
|
|
|
|
self.assertEqual(dt.hour, 12)
|
|
|
|
self.assertEqual(dt.minute, 0)
|
|
|
|
self.assertEqual(dt.second, 0)
|
|
|
|
self.assertEqual(dt.microsecond, 0)
|
|
|
|
|
|
|
|
def test_basic_attributes_nonzero(self):
|
|
|
|
# Make sure all attributes are non-zero so bugs in
|
|
|
|
# bit-shifting access show up.
|
|
|
|
dt = self.theclass(2002, 3, 1, 12, 59, 59, 8000)
|
|
|
|
self.assertEqual(dt.year, 2002)
|
|
|
|
self.assertEqual(dt.month, 3)
|
|
|
|
self.assertEqual(dt.day, 1)
|
|
|
|
self.assertEqual(dt.hour, 12)
|
|
|
|
self.assertEqual(dt.minute, 59)
|
|
|
|
self.assertEqual(dt.second, 59)
|
|
|
|
self.assertEqual(dt.microsecond, 8000)
|
|
|
|
|
|
|
|
def test_roundtrip(self):
|
|
|
|
for dt in (self.theclass(1, 2, 3, 4, 5, 6, 7),
|
|
|
|
self.theclass.now()):
|
|
|
|
# Verify dt -> string -> datetime identity.
|
|
|
|
s = repr(dt)
|
|
|
|
self.failUnless(s.startswith('datetime.'))
|
|
|
|
s = s[9:]
|
|
|
|
dt2 = eval(s)
|
|
|
|
self.assertEqual(dt, dt2)
|
|
|
|
|
|
|
|
# Verify identity via reconstructing from pieces.
|
|
|
|
dt2 = self.theclass(dt.year, dt.month, dt.day,
|
|
|
|
dt.hour, dt.minute, dt.second,
|
|
|
|
dt.microsecond)
|
|
|
|
self.assertEqual(dt, dt2)
|
|
|
|
|
|
|
|
def test_isoformat(self):
|
|
|
|
t = self.theclass(2, 3, 2, 4, 5, 1, 123)
|
|
|
|
self.assertEqual(t.isoformat(), "0002-03-02T04:05:01.000123")
|
|
|
|
self.assertEqual(t.isoformat('T'), "0002-03-02T04:05:01.000123")
|
|
|
|
self.assertEqual(t.isoformat(' '), "0002-03-02 04:05:01.000123")
|
|
|
|
# str is ISO format with the separator forced to a blank.
|
|
|
|
self.assertEqual(str(t), "0002-03-02 04:05:01.000123")
|
|
|
|
|
|
|
|
t = self.theclass(2, 3, 2)
|
|
|
|
self.assertEqual(t.isoformat(), "0002-03-02T00:00:00")
|
|
|
|
self.assertEqual(t.isoformat('T'), "0002-03-02T00:00:00")
|
|
|
|
self.assertEqual(t.isoformat(' '), "0002-03-02 00:00:00")
|
|
|
|
# str is ISO format with the separator forced to a blank.
|
|
|
|
self.assertEqual(str(t), "0002-03-02 00:00:00")
|
|
|
|
|
|
|
|
def test_more_ctime(self):
|
|
|
|
# Test fields that TestDate doesn't touch.
|
|
|
|
import time
|
|
|
|
|
|
|
|
t = self.theclass(2002, 3, 2, 18, 3, 5, 123)
|
|
|
|
self.assertEqual(t.ctime(), "Sat Mar 2 18:03:05 2002")
|
|
|
|
# Oops! The next line fails on Win2K under MSVC 6, so it's commented
|
|
|
|
# out. The difference is that t.ctime() produces " 2" for the day,
|
|
|
|
# but platform ctime() produces "02" for the day. According to
|
|
|
|
# C99, t.ctime() is correct here.
|
|
|
|
# self.assertEqual(t.ctime(), time.ctime(time.mktime(t.timetuple())))
|
|
|
|
|
|
|
|
# So test a case where that difference doesn't matter.
|
|
|
|
t = self.theclass(2002, 3, 22, 18, 3, 5, 123)
|
|
|
|
self.assertEqual(t.ctime(), time.ctime(time.mktime(t.timetuple())))
|
|
|
|
|
|
|
|
def test_tz_independent_comparing(self):
|
|
|
|
dt1 = self.theclass(2002, 3, 1, 9, 0, 0)
|
|
|
|
dt2 = self.theclass(2002, 3, 1, 10, 0, 0)
|
|
|
|
dt3 = self.theclass(2002, 3, 1, 9, 0, 0)
|
|
|
|
self.assertEqual(dt1, dt3)
|
|
|
|
self.assert_(dt2 > dt3)
|
|
|
|
|
|
|
|
# Make sure comparison doesn't forget microseconds, and isn't done
|
|
|
|
# via comparing a float timestamp (an IEEE double doesn't have enough
|
|
|
|
# precision to span microsecond resolution across years 1 thru 9999,
|
|
|
|
# so comparing via timestamp necessarily calls some distinct values
|
|
|
|
# equal).
|
|
|
|
dt1 = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999998)
|
|
|
|
us = timedelta(microseconds=1)
|
|
|
|
dt2 = dt1 + us
|
|
|
|
self.assertEqual(dt2 - dt1, us)
|
|
|
|
self.assert_(dt1 < dt2)
|
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
def test_strftime_with_bad_tzname_replace(self):
|
|
|
|
# verify ok if tzinfo.tzname().replace() returns a non-string
|
|
|
|
class MyTzInfo(FixedOffset):
|
|
|
|
def tzname(self, dt):
|
|
|
|
class MyStr(str):
|
|
|
|
def replace(self, *args):
|
|
|
|
return None
|
|
|
|
return MyStr('name')
|
|
|
|
t = self.theclass(2005, 3, 2, 0, 0, 0, 0, MyTzInfo(3, 'name'))
|
|
|
|
self.assertRaises(TypeError, t.strftime, '%Z')
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_bad_constructor_arguments(self):
|
|
|
|
# bad years
|
|
|
|
self.theclass(MINYEAR, 1, 1) # no exception
|
|
|
|
self.theclass(MAXYEAR, 1, 1) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, MINYEAR-1, 1, 1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, MAXYEAR+1, 1, 1)
|
|
|
|
# bad months
|
|
|
|
self.theclass(2000, 1, 1) # no exception
|
|
|
|
self.theclass(2000, 12, 1) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 0, 1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 13, 1)
|
|
|
|
# bad days
|
|
|
|
self.theclass(2000, 2, 29) # no exception
|
|
|
|
self.theclass(2004, 2, 29) # no exception
|
|
|
|
self.theclass(2400, 2, 29) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 2, 30)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2001, 2, 29)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2100, 2, 29)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 1900, 2, 29)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 0)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 32)
|
|
|
|
# bad hours
|
|
|
|
self.theclass(2000, 1, 31, 0) # no exception
|
|
|
|
self.theclass(2000, 1, 31, 23) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 31, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 24)
|
|
|
|
# bad minutes
|
|
|
|
self.theclass(2000, 1, 31, 23, 0) # no exception
|
|
|
|
self.theclass(2000, 1, 31, 23, 59) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 60)
|
|
|
|
# bad seconds
|
|
|
|
self.theclass(2000, 1, 31, 23, 59, 0) # no exception
|
|
|
|
self.theclass(2000, 1, 31, 23, 59, 59) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, 60)
|
|
|
|
# bad microseconds
|
|
|
|
self.theclass(2000, 1, 31, 23, 59, 59, 0) # no exception
|
|
|
|
self.theclass(2000, 1, 31, 23, 59, 59, 999999) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass,
|
|
|
|
2000, 1, 31, 23, 59, 59, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass,
|
|
|
|
2000, 1, 31, 23, 59, 59,
|
|
|
|
1000000)
|
|
|
|
|
|
|
|
def test_hash_equality(self):
|
|
|
|
d = self.theclass(2000, 12, 31, 23, 30, 17)
|
|
|
|
e = self.theclass(2000, 12, 31, 23, 30, 17)
|
|
|
|
self.assertEqual(d, e)
|
|
|
|
self.assertEqual(hash(d), hash(e))
|
|
|
|
|
|
|
|
dic = {d: 1}
|
|
|
|
dic[e] = 2
|
|
|
|
self.assertEqual(len(dic), 1)
|
|
|
|
self.assertEqual(dic[d], 2)
|
|
|
|
self.assertEqual(dic[e], 2)
|
|
|
|
|
|
|
|
d = self.theclass(2001, 1, 1, 0, 5, 17)
|
|
|
|
e = self.theclass(2001, 1, 1, 0, 5, 17)
|
|
|
|
self.assertEqual(d, e)
|
|
|
|
self.assertEqual(hash(d), hash(e))
|
|
|
|
|
|
|
|
dic = {d: 1}
|
|
|
|
dic[e] = 2
|
|
|
|
self.assertEqual(len(dic), 1)
|
|
|
|
self.assertEqual(dic[d], 2)
|
|
|
|
self.assertEqual(dic[e], 2)
|
|
|
|
|
|
|
|
def test_computations(self):
|
|
|
|
a = self.theclass(2002, 1, 31)
|
|
|
|
b = self.theclass(1956, 1, 31)
|
|
|
|
diff = a-b
|
|
|
|
self.assertEqual(diff.days, 46*365 + len(range(1956, 2002, 4)))
|
|
|
|
self.assertEqual(diff.seconds, 0)
|
|
|
|
self.assertEqual(diff.microseconds, 0)
|
|
|
|
a = self.theclass(2002, 3, 2, 17, 6)
|
|
|
|
millisec = timedelta(0, 0, 1000)
|
|
|
|
hour = timedelta(0, 3600)
|
|
|
|
day = timedelta(1)
|
|
|
|
week = timedelta(7)
|
|
|
|
self.assertEqual(a + hour, self.theclass(2002, 3, 2, 18, 6))
|
|
|
|
self.assertEqual(hour + a, self.theclass(2002, 3, 2, 18, 6))
|
|
|
|
self.assertEqual(a + 10*hour, self.theclass(2002, 3, 3, 3, 6))
|
|
|
|
self.assertEqual(a - hour, self.theclass(2002, 3, 2, 16, 6))
|
|
|
|
self.assertEqual(-hour + a, self.theclass(2002, 3, 2, 16, 6))
|
|
|
|
self.assertEqual(a - hour, a + -hour)
|
|
|
|
self.assertEqual(a - 20*hour, self.theclass(2002, 3, 1, 21, 6))
|
|
|
|
self.assertEqual(a + day, self.theclass(2002, 3, 3, 17, 6))
|
|
|
|
self.assertEqual(a - day, self.theclass(2002, 3, 1, 17, 6))
|
|
|
|
self.assertEqual(a + week, self.theclass(2002, 3, 9, 17, 6))
|
|
|
|
self.assertEqual(a - week, self.theclass(2002, 2, 23, 17, 6))
|
|
|
|
self.assertEqual(a + 52*week, self.theclass(2003, 3, 1, 17, 6))
|
|
|
|
self.assertEqual(a - 52*week, self.theclass(2001, 3, 3, 17, 6))
|
|
|
|
self.assertEqual((a + week) - a, week)
|
|
|
|
self.assertEqual((a + day) - a, day)
|
|
|
|
self.assertEqual((a + hour) - a, hour)
|
|
|
|
self.assertEqual((a + millisec) - a, millisec)
|
|
|
|
self.assertEqual((a - week) - a, -week)
|
|
|
|
self.assertEqual((a - day) - a, -day)
|
|
|
|
self.assertEqual((a - hour) - a, -hour)
|
|
|
|
self.assertEqual((a - millisec) - a, -millisec)
|
|
|
|
self.assertEqual(a - (a + week), -week)
|
|
|
|
self.assertEqual(a - (a + day), -day)
|
|
|
|
self.assertEqual(a - (a + hour), -hour)
|
|
|
|
self.assertEqual(a - (a + millisec), -millisec)
|
|
|
|
self.assertEqual(a - (a - week), week)
|
|
|
|
self.assertEqual(a - (a - day), day)
|
|
|
|
self.assertEqual(a - (a - hour), hour)
|
|
|
|
self.assertEqual(a - (a - millisec), millisec)
|
|
|
|
self.assertEqual(a + (week + day + hour + millisec),
|
|
|
|
self.theclass(2002, 3, 10, 18, 6, 0, 1000))
|
|
|
|
self.assertEqual(a + (week + day + hour + millisec),
|
|
|
|
(((a + week) + day) + hour) + millisec)
|
|
|
|
self.assertEqual(a - (week + day + hour + millisec),
|
|
|
|
self.theclass(2002, 2, 22, 16, 5, 59, 999000))
|
|
|
|
self.assertEqual(a - (week + day + hour + millisec),
|
|
|
|
(((a - week) - day) - hour) - millisec)
|
|
|
|
# Add/sub ints, longs, floats should be illegal
|
|
|
|
for i in 1, 1L, 1.0:
|
|
|
|
self.assertRaises(TypeError, lambda: a+i)
|
|
|
|
self.assertRaises(TypeError, lambda: a-i)
|
|
|
|
self.assertRaises(TypeError, lambda: i+a)
|
|
|
|
self.assertRaises(TypeError, lambda: i-a)
|
|
|
|
|
|
|
|
# delta - datetime is senseless.
|
|
|
|
self.assertRaises(TypeError, lambda: day - a)
|
|
|
|
# mixing datetime and (delta or datetime) via * or // is senseless
|
|
|
|
self.assertRaises(TypeError, lambda: day * a)
|
|
|
|
self.assertRaises(TypeError, lambda: a * day)
|
|
|
|
self.assertRaises(TypeError, lambda: day // a)
|
|
|
|
self.assertRaises(TypeError, lambda: a // day)
|
|
|
|
self.assertRaises(TypeError, lambda: a * a)
|
|
|
|
self.assertRaises(TypeError, lambda: a // a)
|
|
|
|
# datetime + datetime is senseless
|
|
|
|
self.assertRaises(TypeError, lambda: a + a)
|
|
|
|
|
|
|
|
def test_pickling(self):
|
|
|
|
args = 6, 7, 23, 20, 59, 1, 64**2
|
|
|
|
orig = self.theclass(*args)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
2003-02-07 17:49:01 -04:00
|
|
|
def test_more_pickling(self):
|
|
|
|
a = self.theclass(2003, 2, 7, 16, 48, 37, 444116)
|
|
|
|
s = pickle.dumps(a)
|
|
|
|
b = pickle.loads(s)
|
|
|
|
self.assertEqual(b.year, 2003)
|
|
|
|
self.assertEqual(b.month, 2)
|
|
|
|
self.assertEqual(b.day, 7)
|
|
|
|
|
2004-06-07 20:04:33 -03:00
|
|
|
def test_pickling_subclass_datetime(self):
|
|
|
|
args = 6, 7, 23, 20, 59, 1, 64**2
|
|
|
|
orig = SubclassDatetime(*args)
|
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_more_compare(self):
|
|
|
|
# The test_compare() inherited from TestDate covers the error cases.
|
|
|
|
# We just want to test lexicographic ordering on the members datetime
|
|
|
|
# has that date lacks.
|
|
|
|
args = [2000, 11, 29, 20, 58, 16, 999998]
|
|
|
|
t1 = self.theclass(*args)
|
|
|
|
t2 = self.theclass(*args)
|
|
|
|
self.failUnless(t1 == t2)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t1 >= t2)
|
|
|
|
self.failUnless(not t1 != t2)
|
|
|
|
self.failUnless(not t1 < t2)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.assertEqual(cmp(t1, t2), 0)
|
|
|
|
self.assertEqual(cmp(t2, t1), 0)
|
|
|
|
|
|
|
|
for i in range(len(args)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = args[i] + 1
|
|
|
|
t2 = self.theclass(*newargs) # this is larger than t1
|
|
|
|
self.failUnless(t1 < t2)
|
|
|
|
self.failUnless(t2 > t1)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t2 >= t1)
|
|
|
|
self.failUnless(t1 != t2)
|
|
|
|
self.failUnless(t2 != t1)
|
|
|
|
self.failUnless(not t1 == t2)
|
|
|
|
self.failUnless(not t2 == t1)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.failUnless(not t2 < t1)
|
|
|
|
self.failUnless(not t1 >= t2)
|
|
|
|
self.failUnless(not t2 <= t1)
|
|
|
|
self.assertEqual(cmp(t1, t2), -1)
|
|
|
|
self.assertEqual(cmp(t2, t1), 1)
|
|
|
|
|
|
|
|
|
|
|
|
# A helper for timestamp constructor tests.
|
|
|
|
def verify_field_equality(self, expected, got):
|
|
|
|
self.assertEqual(expected.tm_year, got.year)
|
|
|
|
self.assertEqual(expected.tm_mon, got.month)
|
|
|
|
self.assertEqual(expected.tm_mday, got.day)
|
|
|
|
self.assertEqual(expected.tm_hour, got.hour)
|
|
|
|
self.assertEqual(expected.tm_min, got.minute)
|
|
|
|
self.assertEqual(expected.tm_sec, got.second)
|
|
|
|
|
|
|
|
def test_fromtimestamp(self):
|
|
|
|
import time
|
|
|
|
|
|
|
|
ts = time.time()
|
|
|
|
expected = time.localtime(ts)
|
|
|
|
got = self.theclass.fromtimestamp(ts)
|
|
|
|
self.verify_field_equality(expected, got)
|
|
|
|
|
|
|
|
def test_utcfromtimestamp(self):
|
|
|
|
import time
|
|
|
|
|
|
|
|
ts = time.time()
|
|
|
|
expected = time.gmtime(ts)
|
|
|
|
got = self.theclass.utcfromtimestamp(ts)
|
|
|
|
self.verify_field_equality(expected, got)
|
|
|
|
|
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Inherits test_gzip/test_tarfile failures on 64-bit platforms from the trunk,
but I don't want the merge to hang around too long (even though the regular
p3yk-contributors are/have been busy with other things.)
Merged revisions 45621-46490 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r45621 | george.yoshida | 2006-04-21 18:34:17 +0200 (Fri, 21 Apr 2006) | 2 lines
Correct the grammar
........
r45622 | tim.peters | 2006-04-21 18:34:54 +0200 (Fri, 21 Apr 2006) | 2 lines
Whitespace normalization.
........
r45624 | thomas.heller | 2006-04-21 18:48:56 +0200 (Fri, 21 Apr 2006) | 1 line
Merge in changes from ctypes 0.9.9.6 upstream version.
........
r45625 | thomas.heller | 2006-04-21 18:51:04 +0200 (Fri, 21 Apr 2006) | 1 line
Merge in changes from ctypes 0.9.9.6 upstream version.
........
r45630 | thomas.heller | 2006-04-21 20:29:17 +0200 (Fri, 21 Apr 2006) | 8 lines
Documentation for ctypes.
I think that 'generic operating system services' is the best category.
Note that the Doc/lib/libctypes.latex file is generated from reST sources.
You are welcome to make typo fixes, and I'll try to keep the reST sources
in sync, but markup changes would be lost - they should be fixed in the tool
that creates the latex file.
The conversion script is external/ctypes/docs/manual/mkpydoc.py.
........
r45631 | tim.peters | 2006-04-21 23:18:10 +0200 (Fri, 21 Apr 2006) | 24 lines
SF bug #1473760 TempFile can hang on Windows.
Python 2.4 changed ntpath.abspath to do an import
inside the function. As a result, due to Python's
import lock, anything calling abspath on Windows
(directly, or indirectly like tempfile.TemporaryFile)
hung when it was called from a thread spawned as a
side effect of importing a module.
This is a depressingly frequent problem, and
deserves a more general fix. I'm settling for
a micro-fix here because this specific one accounts
for a report of Zope Corp's ZEO hanging on Windows,
and it was an odd way to change abspath to begin
with (ntpath needs a different implementation
depending on whether we're actually running on
Windows, and the _obvious_ way to arrange for that
is not to bury a possibly-failing import _inside_
the function).
Note that if/when other micro-fixes of this kind
get made, the new Lib/test/threaded_import_hangers.py
is a convenient place to add tests for them.
........
r45634 | phillip.eby | 2006-04-21 23:53:37 +0200 (Fri, 21 Apr 2006) | 2 lines
Guido wrote contextlib, not me, but thanks anyway. ;)
........
r45636 | andrew.kuchling | 2006-04-22 03:51:41 +0200 (Sat, 22 Apr 2006) | 1 line
Typo fixes
........
r45638 | andrew.kuchling | 2006-04-22 03:58:40 +0200 (Sat, 22 Apr 2006) | 1 line
Fix comment typo
........
r45639 | andrew.kuchling | 2006-04-22 04:06:03 +0200 (Sat, 22 Apr 2006) | 8 lines
Make copy of test_mailbox.py. We'll still want to check the backward
compatibility classes in the new mailbox.py that I'll be committing in
a few minutes.
One change has been made: the tests use len(mbox) instead of len(mbox.boxes).
The 'boxes' attribute was never documented and contains some internal state
that seems unlikely to have been useful.
........
r45640 | andrew.kuchling | 2006-04-22 04:32:43 +0200 (Sat, 22 Apr 2006) | 16 lines
Add Gregory K. Johnson's revised version of mailbox.py (funded by
the 2005 Summer of Code).
The revision adds a number of new mailbox classes that support adding
and removing messages; these classes also support mailbox locking and
default to using email.Message instead of rfc822.Message.
The old mailbox classes are largely left alone for backward compatibility.
The exception is the Maildir class, which was present in the old module
and now inherits from the new classes. The Maildir class's interface
is pretty simple, though, so I think it'll be compatible with existing
code.
(The change to the NEWS file also adds a missing word to a different
news item, which unfortunately required rewrapping the line.)
........
r45641 | tim.peters | 2006-04-22 07:52:59 +0200 (Sat, 22 Apr 2006) | 2 lines
Whitespace normalization.
........
r45642 | neal.norwitz | 2006-04-22 08:07:46 +0200 (Sat, 22 Apr 2006) | 1 line
Add libctypes as a dep
........
r45643 | martin.v.loewis | 2006-04-22 13:15:41 +0200 (Sat, 22 Apr 2006) | 1 line
Fix more ssize_t problems.
........
r45644 | martin.v.loewis | 2006-04-22 13:40:03 +0200 (Sat, 22 Apr 2006) | 1 line
Fix more ssize_t issues.
........
r45645 | george.yoshida | 2006-04-22 17:10:49 +0200 (Sat, 22 Apr 2006) | 2 lines
Typo fixes
........
r45647 | martin.v.loewis | 2006-04-22 17:19:54 +0200 (Sat, 22 Apr 2006) | 1 line
Port to Python 2.5. Drop .DEF file. Change output file names to .pyd.
........
r45648 | george.yoshida | 2006-04-22 17:27:14 +0200 (Sat, 22 Apr 2006) | 3 lines
- add versionadded tag
- make arbitrary arguments come last
........
r45649 | hyeshik.chang | 2006-04-22 17:48:15 +0200 (Sat, 22 Apr 2006) | 3 lines
Remove $CJKCodecs$ RCS tags. The CJKCodecs isn't maintained outside
anymore.
........
r45654 | greg.ward | 2006-04-23 05:47:58 +0200 (Sun, 23 Apr 2006) | 2 lines
Update optparse to Optik 1.5.1.
........
r45658 | george.yoshida | 2006-04-23 11:27:10 +0200 (Sun, 23 Apr 2006) | 2 lines
wrap SyntaxError with \exception{}
........
r45660 | ronald.oussoren | 2006-04-23 13:59:25 +0200 (Sun, 23 Apr 2006) | 6 lines
Patch 1471925 - Weak linking support for OSX
This patch causes several symbols in the socket and posix module to be weakly
linked on OSX and disables usage of ftime on OSX. These changes make it possible
to use a binary build on OSX 10.4 on a 10.3 system.
........
r45661 | ronald.oussoren | 2006-04-23 14:36:23 +0200 (Sun, 23 Apr 2006) | 5 lines
Patch 1471761 - test for broken poll at runtime
This patch checks if poll is broken when the select module is loaded instead
of doing so at configure-time. This functionality is only active on Mac OS X.
........
r45662 | nick.coghlan | 2006-04-23 17:13:32 +0200 (Sun, 23 Apr 2006) | 1 line
Add a Context Types section to parallel the Iterator Types section (uses the same terminology as the 2.5a1 implementation)
........
r45663 | nick.coghlan | 2006-04-23 17:14:37 +0200 (Sun, 23 Apr 2006) | 1 line
Update contextlib documentation to use the same terminology as the module implementation
........
r45664 | gerhard.haering | 2006-04-23 17:24:26 +0200 (Sun, 23 Apr 2006) | 2 lines
Updated the sqlite3 module to the external pysqlite 2.2.2 version.
........
r45666 | nick.coghlan | 2006-04-23 17:39:16 +0200 (Sun, 23 Apr 2006) | 1 line
Update with statement documentation to use same terminology as 2.5a1 implementation
........
r45667 | nick.coghlan | 2006-04-23 18:05:04 +0200 (Sun, 23 Apr 2006) | 1 line
Add a (very) brief mention of the with statement to the end of chapter 8
........
r45668 | nick.coghlan | 2006-04-23 18:35:19 +0200 (Sun, 23 Apr 2006) | 1 line
Take 2 on mentioning the with statement, this time without inadvertently killing the Unicode examples
........
r45669 | nick.coghlan | 2006-04-23 19:04:07 +0200 (Sun, 23 Apr 2006) | 1 line
Backdated NEWS entry to record the implementation of PEP 338 for alpha 1
........
r45670 | tim.peters | 2006-04-23 20:13:45 +0200 (Sun, 23 Apr 2006) | 2 lines
Whitespace normalization.
........
r45671 | skip.montanaro | 2006-04-23 21:14:27 +0200 (Sun, 23 Apr 2006) | 1 line
first cut at trace module doc
........
r45672 | skip.montanaro | 2006-04-23 21:26:33 +0200 (Sun, 23 Apr 2006) | 1 line
minor tweak
........
r45673 | skip.montanaro | 2006-04-23 21:30:50 +0200 (Sun, 23 Apr 2006) | 1 line
it's always helpful if the example works...
........
r45674 | skip.montanaro | 2006-04-23 21:32:14 +0200 (Sun, 23 Apr 2006) | 1 line
correct example
........
r45675 | andrew.kuchling | 2006-04-23 23:01:04 +0200 (Sun, 23 Apr 2006) | 1 line
Edits to the PEP 343 section
........
r45676 | andrew.kuchling | 2006-04-23 23:51:10 +0200 (Sun, 23 Apr 2006) | 1 line
Add two items
........
r45677 | tim.peters | 2006-04-24 04:03:16 +0200 (Mon, 24 Apr 2006) | 5 lines
Bug #1337990: clarified that `doctest` does not support examples
requiring both expected output and an exception.
I'll backport to 2.4 next.
........
r45679 | nick.coghlan | 2006-04-24 05:04:43 +0200 (Mon, 24 Apr 2006) | 1 line
Note changes made to PEP 343 related documentation
........
r45681 | nick.coghlan | 2006-04-24 06:17:02 +0200 (Mon, 24 Apr 2006) | 1 line
Change PEP 343 related documentation to use the term context specifier instead of context object
........
r45682 | nick.coghlan | 2006-04-24 06:32:47 +0200 (Mon, 24 Apr 2006) | 1 line
Add unit tests for the -m and -c command line switches
........
r45683 | nick.coghlan | 2006-04-24 06:37:15 +0200 (Mon, 24 Apr 2006) | 1 line
Fix contextlib.nested to cope with exit methods raising and handling exceptions
........
r45685 | nick.coghlan | 2006-04-24 06:59:28 +0200 (Mon, 24 Apr 2006) | 1 line
Fix broken contextlib test from last checkin (I'd've sworn I tested that before checking it in. . .)
........
r45686 | nick.coghlan | 2006-04-24 07:24:26 +0200 (Mon, 24 Apr 2006) | 1 line
Back out new command line tests (broke buildbot)
........
r45687 | nick.coghlan | 2006-04-24 07:52:15 +0200 (Mon, 24 Apr 2006) | 1 line
More reliable version of new command line tests that just checks the exit codes
........
r45688 | thomas.wouters | 2006-04-24 13:37:13 +0200 (Mon, 24 Apr 2006) | 4 lines
Stop test_tcl's testLoadTk from leaking the Tk commands 'loadtk' registers.
........
r45690 | andrew.kuchling | 2006-04-24 16:30:47 +0200 (Mon, 24 Apr 2006) | 2 lines
Edits, using the new term
'context specifier' in a few places
........
r45697 | phillip.eby | 2006-04-24 22:53:13 +0200 (Mon, 24 Apr 2006) | 2 lines
Revert addition of setuptools
........
r45698 | tim.peters | 2006-04-25 00:45:13 +0200 (Tue, 25 Apr 2006) | 2 lines
Whitespace normalization.
........
r45700 | trent.mick | 2006-04-25 02:34:50 +0200 (Tue, 25 Apr 2006) | 4 lines
Put break at correct level so *all* root HKEYs acutally get checked for
an installed VC6. Otherwise only the first such tree gets checked and this
warning doesn't get displayed.
........
r45701 | tim.peters | 2006-04-25 05:31:36 +0200 (Tue, 25 Apr 2006) | 3 lines
Patch #1475231: add a new SKIP doctest option, thanks to
Edward Loper.
........
r45702 | neal.norwitz | 2006-04-25 07:04:35 +0200 (Tue, 25 Apr 2006) | 1 line
versionadded for SKIP
........
r45703 | neal.norwitz | 2006-04-25 07:05:03 +0200 (Tue, 25 Apr 2006) | 1 line
Restore Walters name
........
r45704 | neal.norwitz | 2006-04-25 07:49:42 +0200 (Tue, 25 Apr 2006) | 1 line
Revert previous change, SKIP had a versionadded elsewhere
........
r45706 | nick.coghlan | 2006-04-25 12:56:51 +0200 (Tue, 25 Apr 2006) | 31 lines
Move the PEP 343 documentation and implementation closer to the
terminology in the alpha 1 documentation.
- "context manager" reverts to its alpha 1 definition
- the term "context specifier" goes away entirely
- contextlib.GeneratorContextManager is renamed GeneratorContext
There are still a number of changes relative to alpha 1:
- the expression in the with statement is explicitly called the
"context expression" in the language reference
- the terms 'with statement context', 'context object' or 'with
statement context' are used in several places instead of a bare
'context'. The aim of this is to avoid ambiguity in relation to the
runtime context set up when the block is executed, and the context
objects that already exist in various application domains (such as
decimal.Context)
- contextlib.contextmanager is renamed to contextfactory
This best reflects the nature of the function resulting from the
use of that decorator
- decimal.ContextManager is renamed to WithStatementContext
Simple dropping the 'Manager' part wasn't possible due to the
fact that decimal.Context already exists and means something
different. WithStatementContext is ugly but workable.
A technically unrelated change snuck into this commit:
contextlib.closing now avoids the overhead of creating a
generator, since it's trivial to implement that particular
context manager directly.
........
r45707 | nick.coghlan | 2006-04-25 13:05:56 +0200 (Tue, 25 Apr 2006) | 1 line
Fix latex typo
........
r45708 | thomas.wouters | 2006-04-25 14:28:56 +0200 (Tue, 25 Apr 2006) | 4 lines
Fix markup glitch in unittest docs. Will backport.
........
r45710 | andrew.kuchling | 2006-04-25 14:31:38 +0200 (Tue, 25 Apr 2006) | 1 line
Add two items; easy_install is now off the table, though pkgutil still is
........
r45711 | andrew.kuchling | 2006-04-25 14:47:25 +0200 (Tue, 25 Apr 2006) | 1 line
Rework context terminology
........
r45712 | thomas.wouters | 2006-04-25 15:53:23 +0200 (Tue, 25 Apr 2006) | 9 lines
SF bug/patch #1433877: string parameter to ioctl not null terminated
The new char-array used in ioctl calls wasn't explicitly NUL-terminated;
quite probably the cause for the test_pty failures on Solaris that we
circumvented earlier. (I wasn't able to reproduce it with this patch, but it
has been somewhat elusive to start with.)
........
r45713 | george.yoshida | 2006-04-25 16:09:58 +0200 (Tue, 25 Apr 2006) | 2 lines
minor tweak
........
r45714 | thomas.wouters | 2006-04-25 17:08:10 +0200 (Tue, 25 Apr 2006) | 7 lines
Fix SF bug #1476111: SystemError in socket sendto. The AF_INET6 and
AF_PACKET cases in getsockaddrarg were missing their own checks for
tuple-ness of the address argument, which means a confusing SystemError was
raised by PyArg_ParseTuple instead.
........
r45715 | thomas.wouters | 2006-04-25 17:29:46 +0200 (Tue, 25 Apr 2006) | 10 lines
Define MAXPATHLEN to be at least PATH_MAX, if that's defined. Python uses
MAXPATHLEN-sized buffers for various output-buffers (like to realpath()),
and that's correct on BSD platforms, but not Linux (which uses PATH_MAX, and
does not define MAXPATHLEN.) Cursory googling suggests Linux is following a
newer standard than BSD, but in cases like this, who knows. Using the
greater of PATH_MAX and 1024 as a fallback for MAXPATHLEN seems to be the
most portable solution.
........
r45717 | thomas.heller | 2006-04-25 20:26:08 +0200 (Tue, 25 Apr 2006) | 3 lines
Fix compiler warnings on Darwin.
Patch by Brett Canon, see
https://sourceforge.net/tracker/?func=detail&atid=532156&aid=1475959&group_id=71702
........
r45718 | guido.van.rossum | 2006-04-25 22:12:45 +0200 (Tue, 25 Apr 2006) | 4 lines
Implement MvL's improvement on __context__ in Condition;
this can just call __context__ on the underlying lock.
(The same change for Semaphore does *not* work!)
........
r45721 | tim.peters | 2006-04-26 03:15:53 +0200 (Wed, 26 Apr 2006) | 13 lines
Rev 45706 renamed stuff in contextlib.py, but didn't rename
uses of it in test_with.py. As a result, test_with has been skipped
(due to failing imports) on all buildbot boxes since. Alas, that's
not a test failure -- you have to pay attention to the
1 skip unexpected on PLATFORM:
test_with
kinds of output at the ends of test runs to notice that this got
broken.
It's likely that more renaming in test_with.py would be desirable.
........
r45722 | fred.drake | 2006-04-26 07:15:41 +0200 (Wed, 26 Apr 2006) | 1 line
markup fixes, cleanup
........
r45723 | fred.drake | 2006-04-26 07:19:39 +0200 (Wed, 26 Apr 2006) | 1 line
minor adjustment suggested by Peter Gephardt
........
r45724 | neal.norwitz | 2006-04-26 07:34:03 +0200 (Wed, 26 Apr 2006) | 10 lines
Patch from Aldo Cortesi (OpenBSD buildbot owner).
After the patch (45590) to add extra debug stats to the gc module, Python
was crashing on OpenBSD due to:
Fatal Python error: Interpreter not initialized (version mismatch?)
This seems to occur due to calling collect() when initialized (in pythonrun.c)
is set to 0. Now, the import will occur in the init function which
shouldn't suffer this problem.
........
r45725 | neal.norwitz | 2006-04-26 08:26:12 +0200 (Wed, 26 Apr 2006) | 3 lines
Fix this test on Solaris. There can be embedded \r, so don't just replace
the one at the end.
........
r45727 | nick.coghlan | 2006-04-26 13:50:04 +0200 (Wed, 26 Apr 2006) | 1 line
Fix an error in the last contextlib.closing example
........
r45728 | andrew.kuchling | 2006-04-26 14:21:06 +0200 (Wed, 26 Apr 2006) | 1 line
[Bug #1475080] Fix example
........
r45729 | andrew.kuchling | 2006-04-26 14:23:39 +0200 (Wed, 26 Apr 2006) | 1 line
Add labels to all sections
........
r45730 | thomas.wouters | 2006-04-26 17:53:30 +0200 (Wed, 26 Apr 2006) | 7 lines
The result of SF patch #1471578: big-memory tests for strings, lists and
tuples. Lots to be added, still, but this will give big-memory people
something to play with in 2.5 alpha 2, and hopefully get more people to
write these tests.
........
r45731 | tim.peters | 2006-04-26 19:11:16 +0200 (Wed, 26 Apr 2006) | 2 lines
Whitespace normalization.
........
r45732 | martin.v.loewis | 2006-04-26 19:19:44 +0200 (Wed, 26 Apr 2006) | 1 line
Use GS- and bufferoverlowU.lib where appropriate, for AMD64.
........
r45733 | thomas.wouters | 2006-04-26 20:46:01 +0200 (Wed, 26 Apr 2006) | 5 lines
Add tests for += and *= on strings, and fix the memory-use estimate for the
list.extend tests (they were estimating half the actual use.)
........
r45734 | thomas.wouters | 2006-04-26 21:14:46 +0200 (Wed, 26 Apr 2006) | 5 lines
Some more test-size-estimate fixes: test_append and test_insert trigger a
list resize, which overallocates.
........
r45735 | hyeshik.chang | 2006-04-26 21:20:26 +0200 (Wed, 26 Apr 2006) | 3 lines
Fix build on MIPS for libffi. I haven't tested this yet because I
don't have an access on MIPS machines. Will be tested by buildbot. :)
........
r45737 | fred.drake | 2006-04-27 01:40:32 +0200 (Thu, 27 Apr 2006) | 1 line
one more place to use the current Python version
........
r45738 | fred.drake | 2006-04-27 02:02:24 +0200 (Thu, 27 Apr 2006) | 3 lines
- update version numbers in file names again, until we have a better way
- elaborate instructions for Cygwin support (closes SF #839709)
........
r45739 | fred.drake | 2006-04-27 02:20:14 +0200 (Thu, 27 Apr 2006) | 1 line
add missing word
........
r45740 | anthony.baxter | 2006-04-27 04:11:24 +0200 (Thu, 27 Apr 2006) | 2 lines
2.5a2
........
r45741 | anthony.baxter | 2006-04-27 04:13:13 +0200 (Thu, 27 Apr 2006) | 1 line
2.5a2
........
r45749 | andrew.kuchling | 2006-04-27 14:22:37 +0200 (Thu, 27 Apr 2006) | 1 line
Now that 2.5a2 is out, revert to the current date
........
r45750 | andrew.kuchling | 2006-04-27 14:23:07 +0200 (Thu, 27 Apr 2006) | 1 line
Bump document version
........
r45751 | andrew.kuchling | 2006-04-27 14:34:39 +0200 (Thu, 27 Apr 2006) | 6 lines
[Bug #1477102] Add necessary import to example
This may be a useful style question for the docs -- should examples show
the necessary imports, or should it be assumed that the reader will
figure it out? In the What's New, I'm not consistent but usually opt
for omitting the imports.
........
r45753 | andrew.kuchling | 2006-04-27 14:38:35 +0200 (Thu, 27 Apr 2006) | 1 line
[Bug #1477140] Import Error base class
........
r45754 | andrew.kuchling | 2006-04-27 14:42:54 +0200 (Thu, 27 Apr 2006) | 1 line
Mention the xmlrpclib.Error base class, which is used in one of the examples
........
r45756 | george.yoshida | 2006-04-27 15:41:07 +0200 (Thu, 27 Apr 2006) | 2 lines
markup fix
........
r45757 | thomas.wouters | 2006-04-27 15:46:59 +0200 (Thu, 27 Apr 2006) | 4 lines
Some more size-estimate fixes, for large-list-tests.
........
r45758 | thomas.heller | 2006-04-27 17:50:42 +0200 (Thu, 27 Apr 2006) | 3 lines
Rerun the libffi configuration if any of the files used for that
are newer then fficonfig.py.
........
r45766 | thomas.wouters | 2006-04-28 00:37:50 +0200 (Fri, 28 Apr 2006) | 6 lines
Some style fixes and size-calculation fixes. Also do the small-memory run
using a prime number, rather than a convenient power-of-2-and-multiple-of-5,
so incorrect testing algorithms fail more easily.
........
r45767 | thomas.wouters | 2006-04-28 00:38:32 +0200 (Fri, 28 Apr 2006) | 6 lines
Do the small-memory run of big-meormy tests using a prime number, rather
than a convenient power-of-2-and-multiple-of-5, so incorrect testing
algorithms fail more easily.
........
r45768 | david.goodger | 2006-04-28 00:53:05 +0200 (Fri, 28 Apr 2006) | 1 line
Added SVN access for Steven Bethard and Talin, for PEP updating.
........
r45770 | thomas.wouters | 2006-04-28 01:13:20 +0200 (Fri, 28 Apr 2006) | 16 lines
- Add new Warning class, ImportWarning
- Warn-raise ImportWarning when importing would have picked up a directory
as package, if only it'd had an __init__.py. This swaps two tests (for
case-ness and __init__-ness), but case-test is not really more expensive,
and it's not in a speed-critical section.
- Test for the new warning by importing a common non-package directory on
sys.path: site-packages
- In regrtest.py, silence warnings generated by the build-environment
because Modules/ (which is added to sys.path for Setup-created modules)
has 'zlib' and '_ctypes' directories without __init__.py's.
........
r45771 | thomas.wouters | 2006-04-28 01:41:27 +0200 (Fri, 28 Apr 2006) | 6 lines
Add more ignores of ImportWarnings; these are all just potential triggers
(since they won't trigger if zlib is already sucessfully imported); they
were found by grepping .py files, instead of looking at warning output :)
........
r45773 | neal.norwitz | 2006-04-28 06:32:20 +0200 (Fri, 28 Apr 2006) | 1 line
Add some whitespace to be more consistent.
........
r45774 | neal.norwitz | 2006-04-28 06:34:43 +0200 (Fri, 28 Apr 2006) | 5 lines
Try to really fix the slow buildbots this time.
Printing to stdout, doesn't mean the data was actually written.
It depends on the buffering, so we need to flush. This will hopefully
really fix the buildbots getting killed due to no output on the slow bots.
........
r45775 | neal.norwitz | 2006-04-28 07:28:05 +0200 (Fri, 28 Apr 2006) | 1 line
Fix some warnings on Mac OS X 10.4
........
r45776 | neal.norwitz | 2006-04-28 07:28:30 +0200 (Fri, 28 Apr 2006) | 1 line
Fix a warning on alpha
........
r45777 | neal.norwitz | 2006-04-28 07:28:54 +0200 (Fri, 28 Apr 2006) | 1 line
Fix a warning on ppc (debian)
........
r45778 | george.yoshida | 2006-04-28 18:09:45 +0200 (Fri, 28 Apr 2006) | 2 lines
fix markup glitch
........
r45780 | georg.brandl | 2006-04-28 18:31:17 +0200 (Fri, 28 Apr 2006) | 3 lines
Add SeaMonkey to the list of Mozilla browsers.
........
r45781 | georg.brandl | 2006-04-28 18:36:55 +0200 (Fri, 28 Apr 2006) | 2 lines
Bug #1475009: clarify ntpath.join behavior with absolute components
........
r45783 | george.yoshida | 2006-04-28 18:40:14 +0200 (Fri, 28 Apr 2006) | 2 lines
correct a dead link
........
r45785 | georg.brandl | 2006-04-28 18:54:25 +0200 (Fri, 28 Apr 2006) | 4 lines
Bug #1472949: stringify IOErrors in shutil.copytree when appending
them to the Error errors list.
........
r45786 | georg.brandl | 2006-04-28 18:58:52 +0200 (Fri, 28 Apr 2006) | 3 lines
Bug #1478326: don't allow '/' in distutils.util.get_platform machine names
since this value is used to name the build directory.
........
r45788 | thomas.heller | 2006-04-28 19:02:18 +0200 (Fri, 28 Apr 2006) | 1 line
Remove a duplicated test (the same test is in test_incomplete.py).
........
r45792 | georg.brandl | 2006-04-28 21:09:24 +0200 (Fri, 28 Apr 2006) | 3 lines
Bug #1478429: make datetime.datetime.fromtimestamp accept every float,
possibly "rounding up" to the next whole second.
........
r45796 | george.yoshida | 2006-04-29 04:43:30 +0200 (Sat, 29 Apr 2006) | 2 lines
grammar fix
........
r45800 | ronald.oussoren | 2006-04-29 13:31:35 +0200 (Sat, 29 Apr 2006) | 2 lines
Patch 1471883: --enable-universalsdk on Mac OS X
........
r45801 | andrew.kuchling | 2006-04-29 13:53:15 +0200 (Sat, 29 Apr 2006) | 1 line
Add item
........
r45802 | andrew.kuchling | 2006-04-29 14:10:28 +0200 (Sat, 29 Apr 2006) | 1 line
Make case of 'ZIP' consistent
........
r45803 | andrew.kuchling | 2006-04-29 14:10:43 +0200 (Sat, 29 Apr 2006) | 1 line
Add item
........
r45808 | martin.v.loewis | 2006-04-29 14:37:25 +0200 (Sat, 29 Apr 2006) | 3 lines
Further changes for #1471883: Edit Misc/NEWS, and
add expat_config.h.
........
r45809 | brett.cannon | 2006-04-29 23:29:50 +0200 (Sat, 29 Apr 2006) | 2 lines
Fix docstring for contextfactory; mentioned old contextmanager name.
........
r45810 | gerhard.haering | 2006-04-30 01:12:41 +0200 (Sun, 30 Apr 2006) | 3 lines
This is the start of documentation for the sqlite3 module. Please feel free to
find a better place for the link to it than alongside bsddb & friends.
........
r45811 | andrew.kuchling | 2006-04-30 03:07:09 +0200 (Sun, 30 Apr 2006) | 1 line
Add two items
........
r45814 | george.yoshida | 2006-04-30 05:49:56 +0200 (Sun, 30 Apr 2006) | 2 lines
Use \versionchanged instead of \versionadded for new parameter support.
........
r45815 | georg.brandl | 2006-04-30 09:06:11 +0200 (Sun, 30 Apr 2006) | 2 lines
Patch #1470846: fix urllib2 ProxyBasicAuthHandler.
........
r45817 | georg.brandl | 2006-04-30 10:57:35 +0200 (Sun, 30 Apr 2006) | 3 lines
In stdlib, use hashlib instead of deprecated md5 and sha modules.
........
r45819 | georg.brandl | 2006-04-30 11:23:59 +0200 (Sun, 30 Apr 2006) | 3 lines
Patch #1470976: don't NLST files when retrieving over FTP.
........
r45821 | georg.brandl | 2006-04-30 13:13:56 +0200 (Sun, 30 Apr 2006) | 6 lines
Bug #1473625: stop cPickle making float dumps locale dependent in protocol 0.
On the way, add a decorator to test_support to facilitate running single
test functions in different locales with automatic cleanup.
........
r45822 | phillip.eby | 2006-04-30 17:59:26 +0200 (Sun, 30 Apr 2006) | 2 lines
Fix infinite regress when inspecting <string> or <stdin> frames.
........
r45824 | georg.brandl | 2006-04-30 19:42:26 +0200 (Sun, 30 Apr 2006) | 3 lines
Fix another problem in inspect: if the module for an object cannot be found, don't try to give its __dict__ to linecache.
........
r45825 | georg.brandl | 2006-04-30 20:14:54 +0200 (Sun, 30 Apr 2006) | 3 lines
Patch #1472854: make the rlcompleter.Completer class usable on non-
UNIX platforms.
........
r45826 | georg.brandl | 2006-04-30 21:34:19 +0200 (Sun, 30 Apr 2006) | 3 lines
Patch #1479438: add \keyword markup for "with".
........
r45827 | andrew.kuchling | 2006-04-30 23:19:31 +0200 (Sun, 30 Apr 2006) | 1 line
Add urllib2 HOWTO from Michael Foord
........
r45828 | andrew.kuchling | 2006-04-30 23:19:49 +0200 (Sun, 30 Apr 2006) | 1 line
Add item
........
r45830 | barry.warsaw | 2006-05-01 05:03:02 +0200 (Mon, 01 May 2006) | 11 lines
Port forward from 2.4 branch:
Patch #1464708 from William McVey: fixed handling of nested comments in mail
addresses. E.g.
"Foo ((Foo Bar)) <foo@example.com>"
Fixes for both rfc822.py and email package. This patch needs to be back
ported to Python 2.3 for email 2.5.
........
r45832 | fred.drake | 2006-05-01 08:25:58 +0200 (Mon, 01 May 2006) | 4 lines
- minor clarification in section title
- markup adjustments
(there is clearly much to be done in this section)
........
r45833 | martin.v.loewis | 2006-05-01 08:28:01 +0200 (Mon, 01 May 2006) | 2 lines
Work around deadlock risk. Will backport.
........
r45836 | andrew.kuchling | 2006-05-01 14:45:02 +0200 (Mon, 01 May 2006) | 1 line
Some ElementTree fixes: import from xml, not xmlcore; fix case of module name; mention list() instead of getchildren()
........
r45837 | gerhard.haering | 2006-05-01 17:14:48 +0200 (Mon, 01 May 2006) | 3 lines
Further integration of the documentation for the sqlite3 module. There's still
quite some content to move over from the pysqlite manual, but it's a start now.
........
r45838 | martin.v.loewis | 2006-05-01 17:56:03 +0200 (Mon, 01 May 2006) | 2 lines
Rename uisample to text, drop all non-text tables.
........
r45839 | martin.v.loewis | 2006-05-01 18:12:44 +0200 (Mon, 01 May 2006) | 2 lines
Add msilib documentation.
........
r45840 | martin.v.loewis | 2006-05-01 18:14:16 +0200 (Mon, 01 May 2006) | 4 lines
Rename parameters to match the documentation (which
in turn matches Microsoft's documentation).
Drop unused parameter in CAB.append.
........
r45841 | fred.drake | 2006-05-01 18:28:54 +0200 (Mon, 01 May 2006) | 1 line
add dependency
........
r45842 | andrew.kuchling | 2006-05-01 18:30:25 +0200 (Mon, 01 May 2006) | 1 line
Markup fixes; add some XXX comments noting problems
........
r45843 | andrew.kuchling | 2006-05-01 18:32:49 +0200 (Mon, 01 May 2006) | 1 line
Add item
........
r45844 | andrew.kuchling | 2006-05-01 19:06:54 +0200 (Mon, 01 May 2006) | 1 line
Markup fixes
........
r45850 | neal.norwitz | 2006-05-02 06:43:14 +0200 (Tue, 02 May 2006) | 3 lines
SF #1479181: split open() and file() from being aliases for each other.
........
r45852 | neal.norwitz | 2006-05-02 08:23:22 +0200 (Tue, 02 May 2006) | 1 line
Try to fix breakage caused by patch #1479181, r45850
........
r45853 | fred.drake | 2006-05-02 08:53:59 +0200 (Tue, 02 May 2006) | 3 lines
SF #1479988: add methods to allow access to weakrefs for the
weakref.WeakKeyDictionary and weakref.WeakValueDictionary
........
r45854 | neal.norwitz | 2006-05-02 09:27:47 +0200 (Tue, 02 May 2006) | 5 lines
Fix breakage from patch 1471883 (r45800 & r45808) on OSF/1.
The problem was that pyconfig.h was being included before some system headers
which caused redefinitions and other breakage. This moves system headers
after expat_config.h which includes pyconfig.h.
........
r45855 | vinay.sajip | 2006-05-02 10:35:36 +0200 (Tue, 02 May 2006) | 1 line
Replaced my dumb way of calculating seconds to midnight with Tim Peters' much more sensible suggestion. What was I thinking ?!?
........
r45856 | andrew.kuchling | 2006-05-02 13:30:03 +0200 (Tue, 02 May 2006) | 1 line
Provide encoding as keyword argument; soften warning paragraph about encodings
........
r45858 | guido.van.rossum | 2006-05-02 19:36:09 +0200 (Tue, 02 May 2006) | 2 lines
Fix the formatting of KeyboardInterrupt -- a bad issubclass() call.
........
r45862 | guido.van.rossum | 2006-05-02 21:47:52 +0200 (Tue, 02 May 2006) | 7 lines
Get rid of __context__, per the latest changes to PEP 343 and python-dev
discussion.
There are two places of documentation that still mention __context__:
Doc/lib/libstdtypes.tex -- I wasn't quite sure how to rewrite that without
spending a whole lot of time thinking about it; and whatsnew, which Andrew
usually likes to change himself.
........
r45863 | armin.rigo | 2006-05-02 21:52:32 +0200 (Tue, 02 May 2006) | 4 lines
Documentation bug: PySet_Pop() returns a new reference (because the
caller becomes the owner of that reference).
........
r45864 | guido.van.rossum | 2006-05-02 22:47:36 +0200 (Tue, 02 May 2006) | 4 lines
Hopefully this will fix the spurious failures of test_mailbox.py that I'm
experiencing. (This code and mailbox.py itself are full of calls to file()
that should be calls to open() -- but I'm not fixing those.)
........
r45865 | andrew.kuchling | 2006-05-02 23:44:33 +0200 (Tue, 02 May 2006) | 1 line
Use open() instead of file()
........
r45866 | andrew.kuchling | 2006-05-03 00:47:49 +0200 (Wed, 03 May 2006) | 1 line
Update context manager section for removal of __context__
........
r45867 | fred.drake | 2006-05-03 03:46:52 +0200 (Wed, 03 May 2006) | 1 line
remove unnecessary assignment
........
r45868 | fred.drake | 2006-05-03 03:48:24 +0200 (Wed, 03 May 2006) | 4 lines
tell LaTeX2HTML to:
- use UTF-8 output
- not mess with the >>> prompt!
........
r45869 | fred.drake | 2006-05-03 04:04:40 +0200 (Wed, 03 May 2006) | 3 lines
avoid ugly markup based on the unfortunate conversions of ">>" and "<<" to
guillemets; no need for magic here
........
r45870 | fred.drake | 2006-05-03 04:12:47 +0200 (Wed, 03 May 2006) | 1 line
at least comment on why curly-quotes are not enabled
........
r45871 | fred.drake | 2006-05-03 04:27:40 +0200 (Wed, 03 May 2006) | 1 line
one more place to avoid extra markup
........
r45872 | fred.drake | 2006-05-03 04:29:09 +0200 (Wed, 03 May 2006) | 1 line
one more place to avoid extra markup (how many will there be?)
........
r45873 | fred.drake | 2006-05-03 04:29:39 +0200 (Wed, 03 May 2006) | 1 line
fix up whitespace in prompt strings
........
r45876 | tim.peters | 2006-05-03 06:46:14 +0200 (Wed, 03 May 2006) | 2 lines
Whitespace normalization.
........
r45877 | martin.v.loewis | 2006-05-03 06:52:04 +0200 (Wed, 03 May 2006) | 2 lines
Correct some formulations, fix XXX comments.
........
r45879 | georg.brandl | 2006-05-03 07:05:02 +0200 (Wed, 03 May 2006) | 2 lines
Patch #1480067: don't redirect HTTP digest auth in urllib2
........
r45881 | georg.brandl | 2006-05-03 07:15:10 +0200 (Wed, 03 May 2006) | 3 lines
Move network tests from test_urllib2 to test_urllib2net.
........
r45887 | nick.coghlan | 2006-05-03 15:02:47 +0200 (Wed, 03 May 2006) | 1 line
Finish bringing SVN into line with latest version of PEP 343 by getting rid of all remaining references to context objects that I could find. Without a __context__() method context objects no longer exist. Also get test_with working again, and adopt a suggestion from Neal for decimal.Context.get_manager()
........
r45888 | nick.coghlan | 2006-05-03 15:17:49 +0200 (Wed, 03 May 2006) | 1 line
Get rid of a couple more context object references, fix some markup and clarify what happens when a generator context function swallows an exception.
........
r45889 | georg.brandl | 2006-05-03 19:46:13 +0200 (Wed, 03 May 2006) | 3 lines
Add seamonkey to list of Windows browsers too.
........
r45890 | georg.brandl | 2006-05-03 20:03:22 +0200 (Wed, 03 May 2006) | 3 lines
RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary.
........
r45891 | georg.brandl | 2006-05-03 20:12:33 +0200 (Wed, 03 May 2006) | 2 lines
Bug #1472191: convert breakpoint indices to ints before comparing them to ints
........
r45893 | georg.brandl | 2006-05-03 20:18:32 +0200 (Wed, 03 May 2006) | 3 lines
Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package.
........
r45894 | thomas.heller | 2006-05-03 20:35:39 +0200 (Wed, 03 May 2006) | 1 line
Don't fail the tests when libglut.so or libgle.so cannot be loaded.
........
r45895 | georg.brandl | 2006-05-04 07:08:10 +0200 (Thu, 04 May 2006) | 2 lines
Bug #1481530: allow "from os.path import ..." with imputil
........
r45897 | martin.v.loewis | 2006-05-04 07:51:03 +0200 (Thu, 04 May 2006) | 2 lines
Patch #1475845: Raise IndentationError for unexpected indent.
........
r45898 | martin.v.loewis | 2006-05-04 12:08:42 +0200 (Thu, 04 May 2006) | 1 line
Implement os.{chdir,rename,rmdir,remove} using Win32 directly.
........
r45899 | martin.v.loewis | 2006-05-04 14:04:27 +0200 (Thu, 04 May 2006) | 2 lines
Drop now-unnecessary arguments to posix_2str.
........
r45900 | martin.v.loewis | 2006-05-04 16:27:52 +0200 (Thu, 04 May 2006) | 1 line
Update checks to consider Windows error numbers.
........
r45913 | thomas.heller | 2006-05-05 20:42:14 +0200 (Fri, 05 May 2006) | 2 lines
Export the 'free' standard C function for use in the test suite.
........
r45914 | thomas.heller | 2006-05-05 20:43:24 +0200 (Fri, 05 May 2006) | 3 lines
Fix memory leaks in the ctypes test suite, reported by valgrind, by
free()ing the memory we allocate.
........
r45915 | thomas.heller | 2006-05-05 20:46:27 +0200 (Fri, 05 May 2006) | 1 line
oops - the function is exported as 'my_free', not 'free'.
........
r45916 | thomas.heller | 2006-05-05 21:14:24 +0200 (Fri, 05 May 2006) | 2 lines
Clean up.
........
r45920 | george.yoshida | 2006-05-06 15:09:45 +0200 (Sat, 06 May 2006) | 2 lines
describe optional arguments for DocFileSuite
........
r45924 | george.yoshida | 2006-05-06 16:16:51 +0200 (Sat, 06 May 2006) | 2 lines
Use \versionchanged for the feature change
........
r45925 | martin.v.loewis | 2006-05-06 18:32:54 +0200 (Sat, 06 May 2006) | 1 line
Port access, chmod, parts of getcwdu, mkdir, and utime to direct Win32 API.
........
r45926 | martin.v.loewis | 2006-05-06 22:04:08 +0200 (Sat, 06 May 2006) | 2 lines
Handle ERROR_ALREADY_EXISTS.
........
r45931 | andrew.kuchling | 2006-05-07 19:12:12 +0200 (Sun, 07 May 2006) | 1 line
[Patch #1479977] Revised version of urllib2 HOWTO, edited by John J. Lee
........
r45932 | andrew.kuchling | 2006-05-07 19:14:53 +0200 (Sun, 07 May 2006) | 1 line
Minor language edit
........
r45934 | georg.brandl | 2006-05-07 22:44:34 +0200 (Sun, 07 May 2006) | 3 lines
Patch #1483395: add new TLDs to cookielib
........
r45936 | martin.v.loewis | 2006-05-08 07:25:56 +0200 (Mon, 08 May 2006) | 2 lines
Add missing PyMem_Free.
........
r45938 | georg.brandl | 2006-05-08 19:28:47 +0200 (Mon, 08 May 2006) | 3 lines
Add test for rev. 45934.
........
r45939 | georg.brandl | 2006-05-08 19:36:08 +0200 (Mon, 08 May 2006) | 3 lines
Patch #1479302: Make urllib2 digest auth and basic auth play together.
........
r45940 | georg.brandl | 2006-05-08 19:48:01 +0200 (Mon, 08 May 2006) | 3 lines
Patch #1478993: take advantage of BaseException/Exception split in cookielib
........
r45941 | neal.norwitz | 2006-05-09 07:38:56 +0200 (Tue, 09 May 2006) | 5 lines
Micro optimization. In the first case, we know that frame->f_exc_type
is NULL, so there's no reason to do anything with it. In the second case,
we know frame->f_exc_type is not NULL, so we can just do an INCREF.
........
r45943 | thomas.heller | 2006-05-09 22:20:15 +0200 (Tue, 09 May 2006) | 2 lines
Disable a test that is unreliable.
........
r45944 | tim.peters | 2006-05-10 04:43:01 +0200 (Wed, 10 May 2006) | 4 lines
Variant of patch #1478292. doctest.register_optionflag(name)
shouldn't create a new flag when `name` is already the name of
an option flag.
........
r45947 | neal.norwitz | 2006-05-10 08:57:58 +0200 (Wed, 10 May 2006) | 14 lines
Fix problems found by Coverity.
longobject.c: also fix an ssize_t problem
<a> could have been NULL, so hoist the size calc to not use <a>.
_ssl.c: under fail: self is DECREF'd, but it would have been NULL.
_elementtree.c: delete self if there was an error.
_csv.c: I'm not sure if lineterminator could have been anything other than
a string. However, other string method calls are checked, so check this
one too.
........
r45948 | thomas.wouters | 2006-05-10 17:04:11 +0200 (Wed, 10 May 2006) | 4 lines
Ignore reflog.txt, too.
........
r45949 | georg.brandl | 2006-05-10 17:59:06 +0200 (Wed, 10 May 2006) | 3 lines
Bug #1482988: indicate more prominently that the Stats class is in the pstats module.
........
r45950 | georg.brandl | 2006-05-10 18:09:03 +0200 (Wed, 10 May 2006) | 2 lines
Bug #1485447: subprocess: document that the "cwd" parameter isn't used to find the executable. Misc. other markup fixes.
........
r45952 | georg.brandl | 2006-05-10 18:11:44 +0200 (Wed, 10 May 2006) | 2 lines
Bug #1484978: curses.panel: clarify that Panel objects are destroyed on garbage collection.
........
r45954 | georg.brandl | 2006-05-10 18:26:03 +0200 (Wed, 10 May 2006) | 4 lines
Patch #1484695: Update the tarfile module to version 0.8. This fixes
a couple of issues, notably handling of long file names using the
GNU LONGNAME extension.
........
r45955 | georg.brandl | 2006-05-10 19:13:20 +0200 (Wed, 10 May 2006) | 4 lines
Patch #721464: pdb.Pdb instances can now be given explicit stdin and
stdout arguments, making it possible to redirect input and output
for remote debugging.
........
r45956 | andrew.kuchling | 2006-05-10 19:19:04 +0200 (Wed, 10 May 2006) | 1 line
Clarify description of exception handling
........
r45957 | georg.brandl | 2006-05-10 22:09:23 +0200 (Wed, 10 May 2006) | 2 lines
Fix two small errors in argument lists.
........
r45960 | brett.cannon | 2006-05-11 07:11:33 +0200 (Thu, 11 May 2006) | 5 lines
Detect if %zd is supported by printf() during configure and sets
PY_FORMAT_SIZE_T appropriately. Removes warnings on
OS X under gcc 4.0.1 when PY_FORMAT_SIZE_T is set to "" instead of "z" as is
needed.
........
r45963 | neal.norwitz | 2006-05-11 09:51:59 +0200 (Thu, 11 May 2006) | 1 line
Don't mask a no memory error with a less meaningful one as discussed on python-checkins
........
r45964 | martin.v.loewis | 2006-05-11 15:28:43 +0200 (Thu, 11 May 2006) | 3 lines
Change WindowsError to carry the Win32 error code in winerror,
and the DOS error code in errno. Revert changes where
WindowsError catch blocks unnecessarily special-case OSError.
........
r45965 | george.yoshida | 2006-05-11 17:53:27 +0200 (Thu, 11 May 2006) | 2 lines
Grammar fix
........
r45967 | andrew.kuchling | 2006-05-11 18:32:24 +0200 (Thu, 11 May 2006) | 1 line
typo fix
........
r45968 | tim.peters | 2006-05-11 18:37:42 +0200 (Thu, 11 May 2006) | 5 lines
BaseThreadedTestCase.setup(): stop special-casing WindowsError.
Rev 45964 fiddled with WindowsError, and broke test_bsddb3 on all
the Windows buildbot slaves as a result. This should repair it.
........
r45969 | georg.brandl | 2006-05-11 21:57:09 +0200 (Thu, 11 May 2006) | 2 lines
Typo fix.
........
r45970 | tim.peters | 2006-05-12 03:57:59 +0200 (Fri, 12 May 2006) | 5 lines
SF patch #1473132: Improve docs for tp_clear and tp_traverse,
by Collin Winter.
Bugfix candidate (but I'm not going to bother).
........
r45974 | martin.v.loewis | 2006-05-12 14:27:28 +0200 (Fri, 12 May 2006) | 4 lines
Dynamically allocate path name buffer for Unicode
path name in listdir. Fixes #1431582.
Stop overallocating MAX_PATH characters for ANSI
path names. Stop assigning to errno.
........
r45975 | martin.v.loewis | 2006-05-12 15:57:36 +0200 (Fri, 12 May 2006) | 1 line
Move icon files into DLLs dir. Fixes #1477968.
........
r45976 | george.yoshida | 2006-05-12 18:40:11 +0200 (Fri, 12 May 2006) | 2 lines
At first there were 6 steps, but one was removed after that.
........
r45977 | martin.v.loewis | 2006-05-12 19:22:04 +0200 (Fri, 12 May 2006) | 1 line
Fix alignment error on Itanium.
........
r45978 | george.yoshida | 2006-05-12 19:25:26 +0200 (Fri, 12 May 2006) | 3 lines
Duplicated description about the illegal continue usage can be found in nearly the same place.
They are same, so keep the original one and remove the later-added one.
........
r45980 | thomas.heller | 2006-05-12 20:16:03 +0200 (Fri, 12 May 2006) | 2 lines
Add missing svn properties.
........
r45981 | thomas.heller | 2006-05-12 20:47:35 +0200 (Fri, 12 May 2006) | 1 line
set svn properties
........
r45982 | thomas.heller | 2006-05-12 21:31:46 +0200 (Fri, 12 May 2006) | 1 line
add svn:eol-style native svn:keywords Id
........
r45987 | gerhard.haering | 2006-05-13 01:49:49 +0200 (Sat, 13 May 2006) | 3 lines
Integrated the rest of the pysqlite reference manual into the Python
documentation. Ready to be reviewed and improved upon.
........
r45988 | george.yoshida | 2006-05-13 08:53:31 +0200 (Sat, 13 May 2006) | 2 lines
Add \exception markup
........
r45990 | martin.v.loewis | 2006-05-13 15:34:04 +0200 (Sat, 13 May 2006) | 2 lines
Revert 43315: Printing of %zd must be signed.
........
r45992 | tim.peters | 2006-05-14 01:28:20 +0200 (Sun, 14 May 2006) | 11 lines
Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV
about "%u", "%lu" and "%zu" formats.
Since PyString_FromFormat and PyErr_Format have exactly the same rules
(both inherited from PyString_FromFormatV), it would be good if someone
with more LaTeX Fu changed one of them to just point to the other.
Their docs were way out of synch before this patch, and I just did a
mass copy+paste to repair that.
Not a backport candidate (this is a new feature).
........
r45993 | tim.peters | 2006-05-14 01:31:05 +0200 (Sun, 14 May 2006) | 2 lines
Typo repair.
........
r45994 | tim.peters | 2006-05-14 01:33:19 +0200 (Sun, 14 May 2006) | 2 lines
Remove lie in new comment.
........
r45995 | ronald.oussoren | 2006-05-14 21:56:34 +0200 (Sun, 14 May 2006) | 11 lines
Rework the build system for osx applications:
* Don't use xcodebuild for building PythonLauncher, but use a normal unix
makefile. This makes it a lot easier to use the same build flags as for the
rest of python (e.g. make a universal version of python launcher)
* Convert the mac makefile-s to makefile.in-s and use configure to set makefile
variables instead of forwarding them as command-line arguments
* Add a C version of pythonw, that we you can use '#!/usr/local/bin/pythonw'
* Build IDLE.app using bundlebuilder instead of BuildApplet, that will allow
easier modification of the bundle contents later on.
........
r45996 | ronald.oussoren | 2006-05-14 22:35:41 +0200 (Sun, 14 May 2006) | 6 lines
A first cut at replacing the icons on MacOS X. This replaces all icons by icons
based on the new python.org logo. These are also the first icons that are
"proper" OSX icons.
These icons were created by Jacob Rus.
........
r45997 | ronald.oussoren | 2006-05-14 23:07:41 +0200 (Sun, 14 May 2006) | 3 lines
I missed one small detail in my rewrite of the osx build files: the path
to the Python.app template.
........
r45998 | martin.v.loewis | 2006-05-15 07:51:36 +0200 (Mon, 15 May 2006) | 2 lines
Fix memory leak.
........
r45999 | neal.norwitz | 2006-05-15 08:48:14 +0200 (Mon, 15 May 2006) | 1 line
Move items implemented after a2 into the new a3 section
........
r46000 | neal.norwitz | 2006-05-15 09:04:36 +0200 (Mon, 15 May 2006) | 5 lines
- Bug #1487966: Fix SystemError with conditional expression in assignment
Most of the test_syntax changes are just updating the numbers.
........
r46001 | neal.norwitz | 2006-05-15 09:17:23 +0200 (Mon, 15 May 2006) | 1 line
Patch #1488312, Fix memory alignment problem on SPARC in unicode. Will backport
........
r46003 | martin.v.loewis | 2006-05-15 11:22:27 +0200 (Mon, 15 May 2006) | 3 lines
Remove bogus DECREF of self.
Change __str__() functions to METH_O.
Change WindowsError__str__ to use PyTuple_Pack.
........
r46005 | georg.brandl | 2006-05-15 21:30:35 +0200 (Mon, 15 May 2006) | 3 lines
[ 1488881 ] tarfile.py: support for file-objects and bz2 (cp. #1488634)
........
r46007 | tim.peters | 2006-05-15 22:44:10 +0200 (Mon, 15 May 2006) | 9 lines
ReadDetectFileobjTest: repair Windows disasters by opening
the file object in binary mode.
The Windows buildbot slaves shouldn't swap themselves to death
anymore. However, test_tarfile may still fail because of a
temp directory left behind from a previous failing run.
Windows buildbot owners may need to remove that directory
by hand.
........
r46009 | tim.peters | 2006-05-15 23:32:25 +0200 (Mon, 15 May 2006) | 3 lines
test_directory(): Remove the leftover temp directory that's making
the Windows buildbots fail test_tarfile.
........
r46010 | martin.v.loewis | 2006-05-16 09:05:37 +0200 (Tue, 16 May 2006) | 4 lines
- Test for sys/statvfs.h before including it, as statvfs is present
on some OSX installation, but its header file is not.
Will backport to 2.4
........
r46012 | georg.brandl | 2006-05-16 09:38:27 +0200 (Tue, 16 May 2006) | 3 lines
Patch #1435422: zlib's compress and decompress objects now have a
copy() method.
........
r46015 | andrew.kuchling | 2006-05-16 18:11:54 +0200 (Tue, 16 May 2006) | 1 line
Add item
........
r46016 | andrew.kuchling | 2006-05-16 18:27:31 +0200 (Tue, 16 May 2006) | 3 lines
PEP 243 has been withdrawn, so don't refer to it any more.
The PyPI upload material has been moved into the section on PEP314.
........
r46017 | george.yoshida | 2006-05-16 19:42:16 +0200 (Tue, 16 May 2006) | 2 lines
Update for 'ImportWarning'
........
r46018 | george.yoshida | 2006-05-16 20:07:00 +0200 (Tue, 16 May 2006) | 4 lines
Mention that Exception is now a subclass of BaseException.
Remove a sentence that says that BaseException inherits from BaseException.
(I guess this is just a copy & paste mistake.)
........
r46019 | george.yoshida | 2006-05-16 20:26:10 +0200 (Tue, 16 May 2006) | 2 lines
Document ImportWarning
........
r46020 | tim.peters | 2006-05-17 01:22:20 +0200 (Wed, 17 May 2006) | 2 lines
Whitespace normalization.
........
r46021 | tim.peters | 2006-05-17 01:24:08 +0200 (Wed, 17 May 2006) | 2 lines
Text files missing the SVN eol-style property.
........
r46022 | tim.peters | 2006-05-17 03:30:11 +0200 (Wed, 17 May 2006) | 2 lines
PyZlib_copy(), PyZlib_uncopy(): Repair leaks on the normal-case path.
........
r46023 | georg.brandl | 2006-05-17 16:06:07 +0200 (Wed, 17 May 2006) | 3 lines
Remove misleading comment about type-class unification.
........
r46024 | georg.brandl | 2006-05-17 16:11:36 +0200 (Wed, 17 May 2006) | 3 lines
Apply patch #1489784 from Michael Foord.
........
r46025 | georg.brandl | 2006-05-17 16:18:20 +0200 (Wed, 17 May 2006) | 3 lines
Fix typo in os.utime docstring (patch #1490189)
........
r46026 | georg.brandl | 2006-05-17 16:26:50 +0200 (Wed, 17 May 2006) | 3 lines
Patch #1490224: set time.altzone correctly on Cygwin.
........
r46027 | georg.brandl | 2006-05-17 16:45:06 +0200 (Wed, 17 May 2006) | 4 lines
Add global debug flag to cookielib to avoid heavy dependency on the logging module.
Resolves #1484758.
........
r46028 | georg.brandl | 2006-05-17 16:56:04 +0200 (Wed, 17 May 2006) | 3 lines
Patch #1486962: Several bugs in the turtle Tk demo module were fixed
and several features added, such as speed and geometry control.
........
r46029 | georg.brandl | 2006-05-17 17:17:00 +0200 (Wed, 17 May 2006) | 4 lines
Delay-import some large modules to speed up urllib2 import.
(fixes #1484793).
........
r46030 | georg.brandl | 2006-05-17 17:51:16 +0200 (Wed, 17 May 2006) | 3 lines
Patch #1180296: improve locale string formatting functions
........
r46032 | tim.peters | 2006-05-18 04:06:40 +0200 (Thu, 18 May 2006) | 2 lines
Whitespace normalization.
........
r46033 | georg.brandl | 2006-05-18 08:11:19 +0200 (Thu, 18 May 2006) | 3 lines
Amendments to patch #1484695.
........
r46034 | georg.brandl | 2006-05-18 08:18:06 +0200 (Thu, 18 May 2006) | 3 lines
Remove unused import.
........
r46035 | georg.brandl | 2006-05-18 08:33:27 +0200 (Thu, 18 May 2006) | 3 lines
Fix test_locale for platforms without a default thousands separator.
........
r46036 | neal.norwitz | 2006-05-18 08:51:46 +0200 (Thu, 18 May 2006) | 1 line
Little cleanup
........
r46037 | georg.brandl | 2006-05-18 09:01:27 +0200 (Thu, 18 May 2006) | 4 lines
Bug #1462152: file() now checks more thoroughly for invalid mode
strings and removes a possible "U" before passing the mode to the
C library function.
........
r46038 | georg.brandl | 2006-05-18 09:20:05 +0200 (Thu, 18 May 2006) | 3 lines
Bug #1490688: properly document %e, %f, %g format subtleties.
........
r46039 | vinay.sajip | 2006-05-18 09:28:58 +0200 (Thu, 18 May 2006) | 1 line
Changed status from "beta" to "production"; since logging has been part of the stdlib since 2.3, it should be safe to make this assertion ;-)
........
r46040 | ronald.oussoren | 2006-05-18 11:04:15 +0200 (Thu, 18 May 2006) | 2 lines
Fix some minor issues with the generated application bundles on MacOSX
........
r46041 | andrew.kuchling | 2006-05-19 02:03:55 +0200 (Fri, 19 May 2006) | 1 line
Typo fix; add clarifying word
........
r46044 | neal.norwitz | 2006-05-19 08:31:23 +0200 (Fri, 19 May 2006) | 3 lines
Fix #132 from Coverity, retval could have been derefed
if a continue inside a try failed.
........
r46045 | neal.norwitz | 2006-05-19 08:43:50 +0200 (Fri, 19 May 2006) | 2 lines
Fix #1474677, non-keyword argument following keyword.
........
r46046 | neal.norwitz | 2006-05-19 09:00:58 +0200 (Fri, 19 May 2006) | 4 lines
Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.
I suppose this could be backported if anyone cares.
........
r46047 | neal.norwitz | 2006-05-19 09:05:01 +0200 (Fri, 19 May 2006) | 7 lines
Oops, I forgot to include this file in the last commit (46046):
Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.
I suppose this could be backported if anyone cares.
........
r46050 | ronald.oussoren | 2006-05-19 20:17:31 +0200 (Fri, 19 May 2006) | 6 lines
* Change working directory to the users home
directory, that makes the file open/save
dialogs more useable.
* Don't use argv emulator, its not needed
for idle.
........
r46052 | tim.peters | 2006-05-19 21:16:34 +0200 (Fri, 19 May 2006) | 2 lines
Whitespace normalization.
........
r46054 | ronald.oussoren | 2006-05-20 08:17:01 +0200 (Sat, 20 May 2006) | 9 lines
Fix bug #1000914 (again).
This patches a file that is generated by bgen, however the code is now the
same as a current copy of bgen would generate. Without this patch most types
in the Carbon.CF module are unusable.
I haven't managed to coax bgen into generating a complete copy of _CFmodule.c
yet :-(, hence the manual patching.
........
r46055 | george.yoshida | 2006-05-20 17:36:19 +0200 (Sat, 20 May 2006) | 3 lines
- markup fix
- add clarifying words
........
r46057 | george.yoshida | 2006-05-20 18:29:14 +0200 (Sat, 20 May 2006) | 3 lines
- Add 'as' and 'with' as new keywords in 2.5.
- Regenerate keyword lists with reswords.py.
........
r46058 | george.yoshida | 2006-05-20 20:07:26 +0200 (Sat, 20 May 2006) | 2 lines
Apply patch #1492147 from Mike Foord.
........
r46059 | andrew.kuchling | 2006-05-20 21:25:16 +0200 (Sat, 20 May 2006) | 1 line
Minor edits
........
r46061 | george.yoshida | 2006-05-21 06:22:59 +0200 (Sun, 21 May 2006) | 2 lines
Fix the TeX compile error.
........
r46062 | george.yoshida | 2006-05-21 06:40:32 +0200 (Sun, 21 May 2006) | 2 lines
Apply patch #1492255 from Mike Foord.
........
r46063 | martin.v.loewis | 2006-05-22 10:48:14 +0200 (Mon, 22 May 2006) | 1 line
Patch 1490384: New Icons for the PC build.
........
r46064 | martin.v.loewis | 2006-05-22 11:15:18 +0200 (Mon, 22 May 2006) | 1 line
Patch #1492356: Port to Windows CE (patch set 1).
........
r46065 | tim.peters | 2006-05-22 13:29:41 +0200 (Mon, 22 May 2006) | 4 lines
Define SIZEOF_{DOUBLE,FLOAT} on Windows. Else
Michael Hudson's nice gimmicks for IEEE special
values (infinities, NaNs) don't work.
........
r46070 | bob.ippolito | 2006-05-22 16:31:24 +0200 (Mon, 22 May 2006) | 2 lines
GzipFile.readline performance improvement (~30-40%), patch #1281707
........
r46071 | bob.ippolito | 2006-05-22 17:22:46 +0200 (Mon, 22 May 2006) | 1 line
Revert gzip readline performance patch #1281707 until a more generic performance improvement can be found
........
r46073 | fredrik.lundh | 2006-05-22 17:35:12 +0200 (Mon, 22 May 2006) | 4 lines
docstring tweaks: count counts non-overlapping substrings, not
total number of occurences
........
r46075 | bob.ippolito | 2006-05-22 17:59:12 +0200 (Mon, 22 May 2006) | 1 line
Apply revised patch for GzipFile.readline performance #1281707
........
r46076 | fredrik.lundh | 2006-05-22 18:29:30 +0200 (Mon, 22 May 2006) | 3 lines
needforspeed: speed up unicode repeat, unicode string copy
........
r46079 | fredrik.lundh | 2006-05-22 19:12:58 +0200 (Mon, 22 May 2006) | 4 lines
needforspeed: use memcpy for "long" strings; use a better algorithm
for long repeats.
........
r46084 | tim.peters | 2006-05-22 21:17:04 +0200 (Mon, 22 May 2006) | 7 lines
PyUnicode_Join(): Recent code changes introduced new
compiler warnings on Windows (signed vs unsigned mismatch
in comparisons). Cleaned that up by switching more locals
to Py_ssize_t. Simplified overflow checking (it can _be_
simpler because while these things are declared as
Py_ssize_t, then should in fact never be negative).
........
r46085 | tim.peters | 2006-05-23 07:47:16 +0200 (Tue, 23 May 2006) | 3 lines
unicode_repeat(): Change type of local to Py_ssize_t,
since that's what it should be.
........
r46094 | fredrik.lundh | 2006-05-23 12:10:57 +0200 (Tue, 23 May 2006) | 3 lines
needforspeed: check first *and* last character before doing a full memcmp
........
r46095 | fredrik.lundh | 2006-05-23 12:12:21 +0200 (Tue, 23 May 2006) | 4 lines
needforspeed: fixed unicode "in" operator to use same implementation
approach as find/index
........
r46096 | richard.jones | 2006-05-23 12:37:38 +0200 (Tue, 23 May 2006) | 7 lines
Merge from rjones-funccall branch.
Applied patch zombie-frames-2.diff from sf patch 876206 with updates for
Python 2.5 and also modified to retain the free_list to avoid the 67%
slow-down in pybench recursion test. 5% speed up in function call pybench.
........
r46098 | ronald.oussoren | 2006-05-23 13:04:24 +0200 (Tue, 23 May 2006) | 2 lines
Avoid creating a mess when installing a framework for the second time.
........
r46101 | georg.brandl | 2006-05-23 13:17:21 +0200 (Tue, 23 May 2006) | 3 lines
PyErr_NewException now accepts a tuple of base classes as its
"base" parameter.
........
r46103 | ronald.oussoren | 2006-05-23 13:47:16 +0200 (Tue, 23 May 2006) | 3 lines
Disable linking extensions with -lpython2.5 for darwin. This should fix bug
#1487105.
........
r46104 | ronald.oussoren | 2006-05-23 14:01:11 +0200 (Tue, 23 May 2006) | 6 lines
Patch #1488098.
This patchs makes it possible to create a universal build on OSX 10.4 and use
the result to build extensions on 10.3. It also makes it possible to override
the '-arch' and '-isysroot' compiler arguments for specific extensions.
........
r46108 | andrew.kuchling | 2006-05-23 14:44:36 +0200 (Tue, 23 May 2006) | 1 line
Add some items; mention the sprint
........
r46109 | andrew.kuchling | 2006-05-23 14:47:01 +0200 (Tue, 23 May 2006) | 1 line
Mention string improvements
........
r46110 | andrew.kuchling | 2006-05-23 14:49:35 +0200 (Tue, 23 May 2006) | 4 lines
Use 'speed' instead of 'performance', because I agree with the argument
at http://zestyping.livejournal.com/193260.html that 'erformance' really means
something more general.
........
r46113 | ronald.oussoren | 2006-05-23 17:09:57 +0200 (Tue, 23 May 2006) | 2 lines
An improved script for building the binary distribution on MacOSX.
........
r46128 | richard.jones | 2006-05-23 20:28:17 +0200 (Tue, 23 May 2006) | 3 lines
Applied patch 1337051 by Neal Norwitz, saving 4 ints on frame objects.
........
r46129 | richard.jones | 2006-05-23 20:32:11 +0200 (Tue, 23 May 2006) | 1 line
fix broken merge
........
r46130 | bob.ippolito | 2006-05-23 20:41:17 +0200 (Tue, 23 May 2006) | 1 line
Update Misc/NEWS for gzip patch #1281707
........
r46131 | bob.ippolito | 2006-05-23 20:43:47 +0200 (Tue, 23 May 2006) | 1 line
Update Misc/NEWS for gzip patch #1281707
........
r46132 | fredrik.lundh | 2006-05-23 20:44:25 +0200 (Tue, 23 May 2006) | 7 lines
needforspeed: use append+reverse for rsplit, use "bloom filters" to
speed up splitlines and strip with charsets; etc. rsplit is now as
fast as split in all our tests (reverse takes no time at all), and
splitlines() is nearly as fast as a plain split("\n") in our tests.
and we're not done yet... ;-)
........
r46133 | tim.peters | 2006-05-23 20:45:30 +0200 (Tue, 23 May 2006) | 38 lines
Bug #1334662 / patch #1335972: int(string, base) wrong answers.
In rare cases of strings specifying true values near sys.maxint,
and oddball bases (not decimal or a power of 2), int(string, base)
could deliver insane answers. This repairs all such problems, and
also speeds string->int significantly. On my box, here are %
speedups for decimal strings of various lengths:
length speedup
------ -------
1 12.4%
2 15.7%
3 20.6%
4 28.1%
5 33.2%
6 37.5%
7 41.9%
8 46.3%
9 51.2%
10 19.5%
11 19.9%
12 23.9%
13 23.7%
14 23.3%
15 24.9%
16 25.3%
17 28.3%
18 27.9%
19 35.7%
Note that the difference between 9 and 10 is the difference between
short and long Python ints on a 32-bit box. The patch doesn't
actually do anything to speed conversion to long: the speedup is
due to detecting "unsigned long" overflow more quickly.
This is a bugfix candidate, but it's a non-trivial patch and it
would be painful to separate the "bug fix" from the "speed up" parts.
........
r46134 | bob.ippolito | 2006-05-23 20:46:41 +0200 (Tue, 23 May 2006) | 1 line
Patch #1493701: performance enhancements for struct module.
........
r46136 | andrew.kuchling | 2006-05-23 21:00:45 +0200 (Tue, 23 May 2006) | 1 line
Remove duplicate item
........
r46141 | bob.ippolito | 2006-05-23 21:09:51 +0200 (Tue, 23 May 2006) | 1 line
revert #1493701
........
r46142 | bob.ippolito | 2006-05-23 21:11:34 +0200 (Tue, 23 May 2006) | 1 line
patch #1493701: performance enhancements for struct module
........
r46144 | bob.ippolito | 2006-05-23 21:12:41 +0200 (Tue, 23 May 2006) | 1 line
patch #1493701: performance enhancements for struct module
........
r46148 | bob.ippolito | 2006-05-23 21:25:52 +0200 (Tue, 23 May 2006) | 1 line
fix linking issue, warnings, in struct
........
r46149 | andrew.kuchling | 2006-05-23 21:29:38 +0200 (Tue, 23 May 2006) | 1 line
Add two items
........
r46150 | bob.ippolito | 2006-05-23 21:31:23 +0200 (Tue, 23 May 2006) | 1 line
forward declaration for PyStructType
........
r46151 | bob.ippolito | 2006-05-23 21:32:25 +0200 (Tue, 23 May 2006) | 1 line
fix typo in _struct
........
r46152 | andrew.kuchling | 2006-05-23 21:32:35 +0200 (Tue, 23 May 2006) | 1 line
Add item
........
r46153 | tim.peters | 2006-05-23 21:34:37 +0200 (Tue, 23 May 2006) | 3 lines
Get the Windows build working again (recover from
`struct` module changes).
........
r46155 | fredrik.lundh | 2006-05-23 21:47:35 +0200 (Tue, 23 May 2006) | 3 lines
return 0 on misses, not -1.
........
r46156 | tim.peters | 2006-05-23 23:51:35 +0200 (Tue, 23 May 2006) | 4 lines
test_struct grew weird behavior under regrtest.py -R,
due to a module-level cache. Clearing the cache should
make it stop showing up in refleak reports.
........
r46157 | tim.peters | 2006-05-23 23:54:23 +0200 (Tue, 23 May 2006) | 2 lines
Whitespace normalization.
........
r46158 | tim.peters | 2006-05-23 23:55:53 +0200 (Tue, 23 May 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46161 | fredrik.lundh | 2006-05-24 12:20:36 +0200 (Wed, 24 May 2006) | 3 lines
use Py_ssize_t for string indexes (thanks, neal!)
........
r46173 | fredrik.lundh | 2006-05-24 16:28:11 +0200 (Wed, 24 May 2006) | 14 lines
needforspeed: use "fastsearch" for count and findstring helpers. this
results in a 2.5x speedup on the stringbench count tests, and a 20x (!)
speedup on the stringbench search/find/contains test, compared to 2.5a2.
for more on the algorithm, see:
http://effbot.org/zone/stringlib.htm
if you get weird results, you can disable the new algoritm by undefining
USE_FAST in Objects/unicodeobject.c.
enjoy /F
........
r46182 | fredrik.lundh | 2006-05-24 17:11:01 +0200 (Wed, 24 May 2006) | 3 lines
needforspeedindeed: use fastsearch also for __contains__
........
r46184 | bob.ippolito | 2006-05-24 17:32:06 +0200 (Wed, 24 May 2006) | 1 line
refactor unpack, add unpack_from
........
r46189 | fredrik.lundh | 2006-05-24 18:35:18 +0200 (Wed, 24 May 2006) | 4 lines
needforspeed: refactored the replace code slightly; special-case
constant-length changes; use fastsearch to locate the first match.
........
r46198 | andrew.dalke | 2006-05-24 20:55:37 +0200 (Wed, 24 May 2006) | 10 lines
Added a slew of test for string replace, based various corner cases from
the Need For Speed sprint coding. Includes commented out overflow tests
which will be uncommented once the code is fixed.
This test will break the 8-bit string tests because
"".replace("", "A") == "" when it should == "A"
We have a fix for it, which should be added tomorrow.
........
r46200 | tim.peters | 2006-05-24 22:27:18 +0200 (Wed, 24 May 2006) | 2 lines
We can't leave the checked-in tests broken.
........
r46201 | tim.peters | 2006-05-24 22:29:44 +0200 (Wed, 24 May 2006) | 2 lines
Whitespace normalization.
........
r46202 | tim.peters | 2006-05-24 23:00:45 +0200 (Wed, 24 May 2006) | 4 lines
Disable the damn empty-string replace test -- it can't
be make to pass now for unicode if it passes for str, or
vice versa.
........
r46203 | tim.peters | 2006-05-24 23:10:40 +0200 (Wed, 24 May 2006) | 58 lines
Heavily fiddled variant of patch #1442927: PyLong_FromString optimization.
``long(str, base)`` is now up to 6x faster for non-power-of-2 bases. The
largest speedup is for inputs with about 1000 decimal digits. Conversion
from non-power-of-2 bases remains quadratic-time in the number of input
digits (it was and remains linear-time for bases 2, 4, 8, 16 and 32).
Speedups at various lengths for decimal inputs, comparing 2.4.3 with
current trunk. Note that it's actually a bit slower for 1-digit strings:
len speedup
---- -------
1 -4.5%
2 4.6%
3 8.3%
4 12.7%
5 16.9%
6 28.6%
7 35.5%
8 44.3%
9 46.6%
10 55.3%
11 65.7%
12 77.7%
13 73.4%
14 75.3%
15 85.2%
16 103.0%
17 95.1%
18 112.8%
19 117.9%
20 128.3%
30 174.5%
40 209.3%
50 236.3%
60 254.3%
70 262.9%
80 295.8%
90 297.3%
100 324.5%
200 374.6%
300 403.1%
400 391.1%
500 388.7%
600 440.6%
700 468.7%
800 498.0%
900 507.2%
1000 501.2%
2000 450.2%
3000 463.2%
4000 452.5%
5000 440.6%
6000 439.6%
7000 424.8%
8000 418.1%
9000 417.7%
........
r46204 | andrew.kuchling | 2006-05-25 02:23:03 +0200 (Thu, 25 May 2006) | 1 line
Minor edits; add an item
........
r46205 | fred.drake | 2006-05-25 04:42:25 +0200 (Thu, 25 May 2006) | 3 lines
fix broken links in PDF
(SF patch #1281291, contributed by Rory Yorke)
........
r46208 | walter.doerwald | 2006-05-25 10:53:28 +0200 (Thu, 25 May 2006) | 2 lines
Replace tab inside comment with space.
........
r46209 | thomas.wouters | 2006-05-25 13:25:51 +0200 (Thu, 25 May 2006) | 4 lines
Fix #1488915, Multiple dots in relative import statement raise SyntaxError.
........
r46210 | thomas.wouters | 2006-05-25 13:26:25 +0200 (Thu, 25 May 2006) | 5 lines
Update graminit.c for the fix for #1488915, Multiple dots in relative import
statement raise SyntaxError, and add testcase.
........
r46211 | andrew.kuchling | 2006-05-25 14:27:59 +0200 (Thu, 25 May 2006) | 1 line
Add entry; and fix a typo
........
r46214 | fredrik.lundh | 2006-05-25 17:22:03 +0200 (Thu, 25 May 2006) | 7 lines
needforspeed: speed up upper and lower for 8-bit string objects.
(the unicode versions of these are still 2x faster on windows,
though...)
based on work by Andrew Dalke, with tweaks by yours truly.
........
r46216 | fredrik.lundh | 2006-05-25 17:49:45 +0200 (Thu, 25 May 2006) | 5 lines
needforspeed: make new upper/lower work properly for single-character
strings too... (thanks to georg brandl for spotting the exact problem
faster than anyone else)
........
r46217 | kristjan.jonsson | 2006-05-25 17:53:30 +0200 (Thu, 25 May 2006) | 1 line
Added a new macro, Py_IS_FINITE(X). On windows there is an intrinsic for this and it is more efficient than to use !Py_IS_INFINITE(X) && !Py_IS_NAN(X). No change on other platforms
........
r46219 | fredrik.lundh | 2006-05-25 18:10:12 +0200 (Thu, 25 May 2006) | 4 lines
needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C
versions if they're not defined.
........
r46220 | andrew.kuchling | 2006-05-25 18:23:15 +0200 (Thu, 25 May 2006) | 1 line
Fix comment typos
........
r46221 | andrew.dalke | 2006-05-25 18:30:52 +0200 (Thu, 25 May 2006) | 2 lines
Added tests for implementation error we came up with in the need for speed sprint.
........
r46222 | andrew.kuchling | 2006-05-25 18:34:54 +0200 (Thu, 25 May 2006) | 1 line
Fix another typo
........
r46223 | kristjan.jonsson | 2006-05-25 18:39:27 +0200 (Thu, 25 May 2006) | 1 line
Fix incorrect documentation for the Py_IS_FINITE(X) macro.
........
r46224 | fredrik.lundh | 2006-05-25 18:46:54 +0200 (Thu, 25 May 2006) | 3 lines
needforspeed: check for overflow in replace (from Andrew Dalke)
........
r46226 | fredrik.lundh | 2006-05-25 19:08:14 +0200 (Thu, 25 May 2006) | 5 lines
needforspeed: new replace implementation by Andrew Dalke. replace is
now about 3x faster on my machine, for the replace tests from string-
bench.
........
r46227 | tim.peters | 2006-05-25 19:34:03 +0200 (Thu, 25 May 2006) | 5 lines
A new table to help string->integer conversion was added yesterday to
both mystrtoul.c and longobject.c. Share the table instead. Also
cut its size by 64 entries (they had been used for an inscrutable
trick originally, but the code no longer tries to use that trick).
........
r46229 | andrew.dalke | 2006-05-25 19:53:00 +0200 (Thu, 25 May 2006) | 11 lines
Fixed problem identified by Georg. The special-case in-place code for replace
made a copy of the string using PyString_FromStringAndSize(s, n) and modify
the copied string in-place. However, 1 (and 0) character strings are shared
from a cache. This cause "A".replace("A", "a") to change the cached version
of "A" -- used by everyone.
Now may the copy with NULL as the string and do the memcpy manually. I've
added regression tests to check if this happens in the future. Perhaps
there should be a PyString_Copy for this case?
........
r46230 | fredrik.lundh | 2006-05-25 19:55:31 +0200 (Thu, 25 May 2006) | 4 lines
needforspeed: use "fastsearch" for count. this results in a 3x speedup
for the related stringbench tests.
........
r46231 | andrew.dalke | 2006-05-25 20:03:25 +0200 (Thu, 25 May 2006) | 4 lines
Code had returned an ssize_t, upcast to long, then converted with PyInt_FromLong.
Now using PyInt_FromSsize_t.
........
r46233 | andrew.kuchling | 2006-05-25 20:11:16 +0200 (Thu, 25 May 2006) | 1 line
Comment typo
........
r46234 | andrew.dalke | 2006-05-25 20:18:39 +0200 (Thu, 25 May 2006) | 4 lines
Added overflow test for adding two (very) large strings where the
new string is over max Py_ssize_t. I have no way to test it on my
box or any box I have access to. At least it doesn't break anything.
........
r46235 | bob.ippolito | 2006-05-25 20:20:23 +0200 (Thu, 25 May 2006) | 1 line
Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm
........
r46238 | georg.brandl | 2006-05-25 20:44:09 +0200 (Thu, 25 May 2006) | 3 lines
Guard the _active.remove() call to avoid errors when there is no _active list.
........
r46239 | fredrik.lundh | 2006-05-25 20:44:29 +0200 (Thu, 25 May 2006) | 4 lines
needforspeed: use fastsearch also for find/index and contains. the
related tests are now about 10x faster.
........
r46240 | bob.ippolito | 2006-05-25 20:44:50 +0200 (Thu, 25 May 2006) | 1 line
Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change)
........
r46241 | jack.diederich | 2006-05-25 20:47:15 +0200 (Thu, 25 May 2006) | 1 line
* eliminate warning by reverting tmp_s type to 'const char*'
........
r46242 | bob.ippolito | 2006-05-25 21:03:19 +0200 (Thu, 25 May 2006) | 1 line
Fix Cygwin compiler issue
........
r46243 | bob.ippolito | 2006-05-25 21:15:27 +0200 (Thu, 25 May 2006) | 1 line
fix a struct regression where long would be returned for short unsigned integers
........
r46244 | georg.brandl | 2006-05-25 21:15:31 +0200 (Thu, 25 May 2006) | 4 lines
Replace PyObject_CallFunction calls with only object args
with PyObject_CallFunctionObjArgs, which is 30% faster.
........
r46245 | fredrik.lundh | 2006-05-25 21:19:05 +0200 (Thu, 25 May 2006) | 3 lines
needforspeed: use insert+reverse instead of append
........
r46246 | bob.ippolito | 2006-05-25 21:33:38 +0200 (Thu, 25 May 2006) | 1 line
Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX
........
r46248 | bob.ippolito | 2006-05-25 21:56:56 +0200 (Thu, 25 May 2006) | 1 line
Use faster struct pack/unpack functions for the endian table that matches the host's
........
r46249 | bob.ippolito | 2006-05-25 21:59:56 +0200 (Thu, 25 May 2006) | 1 line
enable darwin/x86 support for libffi and hence ctypes (doesn't yet support --enable-universalsdk)
........
r46252 | georg.brandl | 2006-05-25 22:28:10 +0200 (Thu, 25 May 2006) | 4 lines
Someone seems to just have copy-pasted the docs of
tp_compare to tp_richcompare ;)
........
r46253 | brett.cannon | 2006-05-25 22:44:08 +0200 (Thu, 25 May 2006) | 2 lines
Swap out bare malloc()/free() use for PyMem_MALLOC()/PyMem_FREE() .
........
r46254 | bob.ippolito | 2006-05-25 22:52:38 +0200 (Thu, 25 May 2006) | 1 line
squelch gcc4 darwin/x86 compiler warnings
........
r46255 | bob.ippolito | 2006-05-25 23:09:45 +0200 (Thu, 25 May 2006) | 1 line
fix test_float regression and 64-bit size mismatch issue
........
r46256 | georg.brandl | 2006-05-25 23:11:56 +0200 (Thu, 25 May 2006) | 3 lines
Add a x-ref to newer calling APIs.
........
r46257 | ronald.oussoren | 2006-05-25 23:30:54 +0200 (Thu, 25 May 2006) | 2 lines
Fix minor typo in prep_cif.c
........
r46259 | brett.cannon | 2006-05-25 23:33:11 +0200 (Thu, 25 May 2006) | 4 lines
Change test_values so that it compares the lowercasing of group names since getgrall() can return all lowercase names while getgrgid() returns proper casing.
Discovered on Ubuntu 5.04 (custom).
........
r46261 | tim.peters | 2006-05-25 23:50:17 +0200 (Thu, 25 May 2006) | 7 lines
Some Win64 pre-release in 2000 didn't support
QueryPerformanceCounter(), but we believe Win64 does
support it now. So use in time.clock().
It would be peachy if someone with a Win64 box tried
this ;-)
........
r46262 | tim.peters | 2006-05-25 23:52:19 +0200 (Thu, 25 May 2006) | 2 lines
Whitespace normalization.
........
r46263 | bob.ippolito | 2006-05-25 23:58:05 +0200 (Thu, 25 May 2006) | 1 line
Add missing files from x86 darwin ctypes patch
........
r46264 | brett.cannon | 2006-05-26 00:00:14 +0200 (Fri, 26 May 2006) | 2 lines
Move over to use of METH_O and METH_NOARGS.
........
r46265 | tim.peters | 2006-05-26 00:25:25 +0200 (Fri, 26 May 2006) | 3 lines
Repair idiot typo, and complete the job of trying to
use the Windows time.clock() implementation on Win64.
........
r46266 | tim.peters | 2006-05-26 00:28:46 +0200 (Fri, 26 May 2006) | 9 lines
Patch #1494387: SVN longobject.c compiler warnings
The SIGCHECK macro defined here has always been bizarre, but
it apparently causes compiler warnings on "Sun Studio 11".
I believe the warnings are bogus, but it doesn't hurt to make
the macro definition saner.
Bugfix candidate (but I'm not going to bother).
........
r46268 | fredrik.lundh | 2006-05-26 01:27:53 +0200 (Fri, 26 May 2006) | 8 lines
needforspeed: partition for 8-bit strings. for some simple tests,
this is on par with a corresponding find, and nearly twice as fast
as split(sep, 1)
full tests, a unicode version, and documentation will follow to-
morrow.
........
r46271 | andrew.kuchling | 2006-05-26 03:46:22 +0200 (Fri, 26 May 2006) | 1 line
Add Soc student
........
r46272 | ronald.oussoren | 2006-05-26 10:41:25 +0200 (Fri, 26 May 2006) | 3 lines
Without this patch OSX users couldn't add new help sources because the code
tried to update one item in a tuple.
........
r46273 | fredrik.lundh | 2006-05-26 10:54:28 +0200 (Fri, 26 May 2006) | 5 lines
needforspeed: partition implementation, part two.
feel free to improve the documentation and the docstrings.
........
r46274 | georg.brandl | 2006-05-26 11:05:54 +0200 (Fri, 26 May 2006) | 3 lines
Clarify docs for str.partition().
........
r46278 | fredrik.lundh | 2006-05-26 11:46:59 +0200 (Fri, 26 May 2006) | 5 lines
needforspeed: use METH_O for argument handling, which made partition some
~15% faster for the current tests (which is noticable faster than a corre-
sponding find call). thanks to neal-who-never-sleeps for the tip.
........
r46280 | fredrik.lundh | 2006-05-26 12:27:17 +0200 (Fri, 26 May 2006) | 5 lines
needforspeed: use Py_ssize_t for the fastsearch counter and skip
length (thanks, neal!). and yes, I've verified that this doesn't
slow things down ;-)
........
r46285 | andrew.dalke | 2006-05-26 13:11:38 +0200 (Fri, 26 May 2006) | 2 lines
Added a few more test cases for whitespace split. These strings have leading whitespace.
........
r46286 | jack.diederich | 2006-05-26 13:15:17 +0200 (Fri, 26 May 2006) | 1 line
use Py_ssize_t in places that may need it
........
r46287 | andrew.dalke | 2006-05-26 13:15:22 +0200 (Fri, 26 May 2006) | 2 lines
Added split whitespace checks for characters other than space.
........
r46288 | ronald.oussoren | 2006-05-26 13:17:55 +0200 (Fri, 26 May 2006) | 2 lines
Fix buglet in postinstall script, it would generate an invalid .cshrc file.
........
r46290 | georg.brandl | 2006-05-26 13:26:11 +0200 (Fri, 26 May 2006) | 3 lines
Add "partition" to UserString.
........
r46291 | fredrik.lundh | 2006-05-26 13:29:39 +0200 (Fri, 26 May 2006) | 5 lines
needforspeed: added Py_LOCAL macro, based on the LOCAL macro used
for SRE and others. applied Py_LOCAL to relevant portion of ceval,
which gives a 1-2% speedup on my machine. ymmv.
........
r46292 | jack.diederich | 2006-05-26 13:37:20 +0200 (Fri, 26 May 2006) | 1 line
when generating python code prefer to generate valid python code
........
r46293 | fredrik.lundh | 2006-05-26 13:38:15 +0200 (Fri, 26 May 2006) | 3 lines
use Py_LOCAL also for string and unicode objects
........
r46294 | ronald.oussoren | 2006-05-26 13:38:39 +0200 (Fri, 26 May 2006) | 12 lines
- Search the sqlite specific search directories
after the normal include directories when looking
for the version of sqlite to use.
- On OSX:
* Extract additional include and link directories
from the CFLAGS and LDFLAGS, if the user has
bothered to specify them we might as wel use them.
* Add '-Wl,-search_paths_first' to the extra_link_args
for readline and sqlite. This makes it possible to
use a static library to override the system provided
dynamic library.
........
r46295 | ronald.oussoren | 2006-05-26 13:43:26 +0200 (Fri, 26 May 2006) | 6 lines
Integrate installing a framework in the 'make install'
target. Until now users had to use 'make frameworkinstall'
to install python when it is configured with '--enable-framework'.
This tends to confuse users that don't hunt for readme files
hidden in platform specific directories :-)
........
r46297 | fredrik.lundh | 2006-05-26 13:54:04 +0200 (Fri, 26 May 2006) | 4 lines
needforspeed: added PY_LOCAL_AGGRESSIVE macro to enable "aggressive"
LOCAL inlining; also added some missing whitespace
........
r46298 | andrew.kuchling | 2006-05-26 14:01:44 +0200 (Fri, 26 May 2006) | 1 line
Typo fixes
........
r46299 | fredrik.lundh | 2006-05-26 14:01:49 +0200 (Fri, 26 May 2006) | 4 lines
Py_LOCAL shouldn't be used for data; it works for some .NET 2003 compilers,
but Trent's copy thinks that it's an anachronism...
........
r46300 | martin.blais | 2006-05-26 14:03:27 +0200 (Fri, 26 May 2006) | 12 lines
Support for buffer protocol for socket and struct.
* Added socket.recv_buf() and socket.recvfrom_buf() methods, that use the buffer
protocol (send and sendto already did).
* Added struct.pack_to(), that is the corresponding buffer compatible method to
unpack_from().
* Fixed minor typos in arraymodule.
........
r46302 | ronald.oussoren | 2006-05-26 14:23:20 +0200 (Fri, 26 May 2006) | 6 lines
- Remove previous version of the binary distribution script for OSX
- Some small bugfixes for the IDLE.app wrapper
- Tweaks to build-installer to ensure that python gets build in the right way,
including sqlite3.
- Updated readme files
........
r46305 | tim.peters | 2006-05-26 14:26:21 +0200 (Fri, 26 May 2006) | 2 lines
Whitespace normalization.
........
r46307 | andrew.dalke | 2006-05-26 14:28:15 +0200 (Fri, 26 May 2006) | 7 lines
I like tests.
The new split functions use a preallocated list. Added tests which exceed
the preallocation size, to exercise list appends/resizes.
Also added more edge case tests.
........
r46308 | andrew.dalke | 2006-05-26 14:31:00 +0200 (Fri, 26 May 2006) | 2 lines
Test cases for off-by-one errors in string split with multicharacter pattern.
........
r46309 | tim.peters | 2006-05-26 14:31:20 +0200 (Fri, 26 May 2006) | 2 lines
Whitespace normalization.
........
r46313 | andrew.kuchling | 2006-05-26 14:39:48 +0200 (Fri, 26 May 2006) | 1 line
Add str.partition()
........
r46314 | bob.ippolito | 2006-05-26 14:52:53 +0200 (Fri, 26 May 2006) | 1 line
quick hack to fix busted binhex test
........
r46316 | andrew.dalke | 2006-05-26 15:05:55 +0200 (Fri, 26 May 2006) | 2 lines
Added more rstrip tests, including for prealloc'ed arrays
........
r46320 | bob.ippolito | 2006-05-26 15:15:44 +0200 (Fri, 26 May 2006) | 1 line
fix #1229380 No struct.pack exception for some out of range integers
........
r46325 | tim.peters | 2006-05-26 15:39:17 +0200 (Fri, 26 May 2006) | 2 lines
Use open() to open files (was using file()).
........
r46327 | andrew.dalke | 2006-05-26 16:00:45 +0200 (Fri, 26 May 2006) | 37 lines
Changes to string.split/rsplit on whitespace to preallocate space in the
results list.
Originally it allocated 0 items and used the list growth during append. Now
it preallocates 12 items so the first few appends don't need list reallocs.
("Here are some words ."*2).split(None, 1) is 7% faster
("Here are some words ."*2).split() is is 15% faster
(Your milage may vary, see dealership for details.)
File parsing like this
for line in f:
count += len(line.split())
is also about 15% faster. There is a slowdown of about 3% for large
strings because of the additional overhead of checking if the append is
to a preallocated region of the list or not. This will be the rare case.
It could be improved with special case code but we decided it was not
useful enough.
There is a cost of 12*sizeof(PyObject *) bytes per list. For the normal
case of file parsing this is not a problem because of the lists have
a short lifetime. We have not come up with cases where this is a problem
in real life.
I chose 12 because human text averages about 11 words per line in books,
one of my data sets averages 6.2 words with a final peak at 11 words per
line, and I work with a tab delimited data set with 8 tabs per line (or
9 words per line). 12 encompasses all of these.
Also changed the last rstrip code to append then reverse, rather than
doing insert(0). The strip() and rstrip() times are now comparable.
........
r46328 | tim.peters | 2006-05-26 16:02:05 +0200 (Fri, 26 May 2006) | 5 lines
Explicitly close files. I'm trying to stop the frequent spurious test_tarfile
failures on Windows buildbots, but it's hard to know how since the regrtest
failure output is useless here, and it never fails when a buildbot slave runs
test_tarfile the second time in verbose mode.
........
r46329 | andrew.kuchling | 2006-05-26 16:03:41 +0200 (Fri, 26 May 2006) | 1 line
Add buffer support for struct, socket
........
r46330 | andrew.kuchling | 2006-05-26 16:04:19 +0200 (Fri, 26 May 2006) | 1 line
Typo fix
........
r46331 | bob.ippolito | 2006-05-26 16:07:23 +0200 (Fri, 26 May 2006) | 1 line
Fix distutils so that libffi will cross-compile between darwin/x86 and darwin/ppc
........
r46333 | bob.ippolito | 2006-05-26 16:23:21 +0200 (Fri, 26 May 2006) | 1 line
Fix _struct typo that broke some 64-bit platforms
........
r46335 | bob.ippolito | 2006-05-26 16:29:35 +0200 (Fri, 26 May 2006) | 1 line
Enable PY_USE_INT_WHEN_POSSIBLE in struct
........
r46343 | andrew.dalke | 2006-05-26 17:21:01 +0200 (Fri, 26 May 2006) | 2 lines
Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm.
........
r46352 | andrew.dalke | 2006-05-26 18:22:52 +0200 (Fri, 26 May 2006) | 3 lines
Test for more edge strip cases; leading and trailing separator gets removed
even with strip(..., 0)
........
r46354 | bob.ippolito | 2006-05-26 18:23:28 +0200 (Fri, 26 May 2006) | 1 line
fix signed/unsigned mismatch in struct
........
r46355 | steve.holden | 2006-05-26 18:27:59 +0200 (Fri, 26 May 2006) | 5 lines
Add -t option to allow easy test selection.
Action verbose option correctly.
Tweak operation counts. Add empty and new instances tests.
Enable comparisons across different warp factors. Change version.
........
r46356 | fredrik.lundh | 2006-05-26 18:32:42 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: use Py_LOCAL on a few more locals in stringobject.c
........
r46357 | thomas.heller | 2006-05-26 18:42:44 +0200 (Fri, 26 May 2006) | 4 lines
For now, I gave up with automatic conversion of reST to Python-latex,
so I'm writing this in latex now.
Skeleton for the ctypes reference.
........
r46358 | tim.peters | 2006-05-26 18:49:28 +0200 (Fri, 26 May 2006) | 3 lines
Repair Windows compiler warnings about mixing
signed and unsigned integral types in comparisons.
........
r46359 | tim.peters | 2006-05-26 18:52:04 +0200 (Fri, 26 May 2006) | 2 lines
Whitespace normalization.
........
r46360 | tim.peters | 2006-05-26 18:53:04 +0200 (Fri, 26 May 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46362 | fredrik.lundh | 2006-05-26 19:04:58 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: stringlib refactoring (in progress)
........
r46363 | thomas.heller | 2006-05-26 19:18:33 +0200 (Fri, 26 May 2006) | 1 line
Write some docs.
........
r46364 | fredrik.lundh | 2006-05-26 19:22:38 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: stringlib refactoring (in progress)
........
r46366 | fredrik.lundh | 2006-05-26 19:26:39 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: cleanup
........
r46367 | fredrik.lundh | 2006-05-26 19:31:41 +0200 (Fri, 26 May 2006) | 4 lines
needforspeed: remove remaining USE_FAST macros; if fastsearch was
broken, someone would have noticed by now ;-)
........
r46368 | steve.holden | 2006-05-26 19:41:32 +0200 (Fri, 26 May 2006) | 5 lines
Use minimum calibration time rather than avergae to avoid
the illusion of negative run times. Halt with an error if
run times go below 10 ms, indicating that results will be
unreliable.
........
r46370 | thomas.heller | 2006-05-26 19:47:40 +0200 (Fri, 26 May 2006) | 2 lines
Reordered, and wrote more docs.
........
r46372 | georg.brandl | 2006-05-26 20:03:31 +0200 (Fri, 26 May 2006) | 9 lines
Need for speed: Patch #921466 : sys.path_importer_cache is now used to cache valid and
invalid file paths for the built-in import machinery which leads to
fewer open calls on startup.
Also fix issue with PEP 302 style import hooks which lead to more open()
calls than necessary.
........
r46373 | fredrik.lundh | 2006-05-26 20:05:34 +0200 (Fri, 26 May 2006) | 3 lines
removed unnecessary include
........
r46377 | fredrik.lundh | 2006-05-26 20:15:38 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: added rpartition implementation
........
r46380 | fredrik.lundh | 2006-05-26 20:24:15 +0200 (Fri, 26 May 2006) | 5 lines
needspeed: rpartition documentation, tests, and a bug fixes.
feel free to add more tests and improve the documentation.
........
r46381 | steve.holden | 2006-05-26 20:26:21 +0200 (Fri, 26 May 2006) | 4 lines
Revert tests to MAL's original round sizes to retiain comparability
from long ago and far away. Stop calling this pybench 1.4 because it
isn't. Remove the empty test, which was a bad idea.
........
r46387 | andrew.kuchling | 2006-05-26 20:41:18 +0200 (Fri, 26 May 2006) | 1 line
Add rpartition() and path caching
........
r46388 | andrew.dalke | 2006-05-26 21:02:09 +0200 (Fri, 26 May 2006) | 10 lines
substring split now uses /F's fast string matching algorithm.
(If compiled without FAST search support, changed the pre-memcmp test
to check the last character as well as the first. This gave a 25%
speedup for my test case.)
Rewrote the split algorithms so they stop when maxsplit gets to 0.
Previously they did a string match first then checked if the maxsplit
was reached. The new way prevents a needless string search.
........
r46391 | brett.cannon | 2006-05-26 21:04:47 +0200 (Fri, 26 May 2006) | 2 lines
Change C spacing to 4 spaces by default to match PEP 7 for new C files.
........
r46392 | georg.brandl | 2006-05-26 21:04:47 +0200 (Fri, 26 May 2006) | 3 lines
Exception isn't the root of all exception classes anymore.
........
r46397 | fredrik.lundh | 2006-05-26 21:23:21 +0200 (Fri, 26 May 2006) | 3 lines
added rpartition method to UserString class
........
r46398 | fredrik.lundh | 2006-05-26 21:24:53 +0200 (Fri, 26 May 2006) | 4 lines
needforspeed: stringlib refactoring, continued. added count and
find helpers; updated unicodeobject to use stringlib_count
........
r46400 | fredrik.lundh | 2006-05-26 21:29:05 +0200 (Fri, 26 May 2006) | 4 lines
needforspeed: stringlib refactoring: use stringlib/find for unicode
find
........
r46403 | fredrik.lundh | 2006-05-26 21:33:03 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: use a macro to fix slice indexes
........
r46404 | thomas.heller | 2006-05-26 21:43:45 +0200 (Fri, 26 May 2006) | 1 line
Write more docs.
........
r46406 | fredrik.lundh | 2006-05-26 21:48:07 +0200 (Fri, 26 May 2006) | 3 lines
needforspeed: stringlib refactoring: use stringlib/find for string find
........
r46407 | andrew.kuchling | 2006-05-26 21:51:10 +0200 (Fri, 26 May 2006) | 1 line
Comment typo
........
r46409 | georg.brandl | 2006-05-26 22:04:44 +0200 (Fri, 26 May 2006) | 3 lines
Replace Py_BuildValue("OO") by PyTuple_Pack.
........
r46411 | georg.brandl | 2006-05-26 22:14:47 +0200 (Fri, 26 May 2006) | 2 lines
Patch #1492218: document None being a constant.
........
r46415 | georg.brandl | 2006-05-26 22:22:50 +0200 (Fri, 26 May 2006) | 3 lines
Simplify calling.
........
r46416 | andrew.dalke | 2006-05-26 22:25:22 +0200 (Fri, 26 May 2006) | 4 lines
Added limits to the replace code so it does not count all of the matching
patterns in a string, only the number needed by the max limit.
........
r46417 | bob.ippolito | 2006-05-26 22:25:23 +0200 (Fri, 26 May 2006) | 1 line
enable all of the struct tests, use ssize_t, fix some whitespace
........
r46418 | tim.peters | 2006-05-26 22:56:56 +0200 (Fri, 26 May 2006) | 2 lines
Record Iceland sprint attendees.
........
r46421 | tim.peters | 2006-05-26 23:51:13 +0200 (Fri, 26 May 2006) | 2 lines
Whitespace normalization.
........
r46422 | steve.holden | 2006-05-27 00:17:54 +0200 (Sat, 27 May 2006) | 2 lines
Add Richard Tew to developers
........
r46423 | steve.holden | 2006-05-27 00:33:20 +0200 (Sat, 27 May 2006) | 2 lines
Update help text and documentaition.
........
r46424 | steve.holden | 2006-05-27 00:39:27 +0200 (Sat, 27 May 2006) | 2 lines
Blasted typos ...
........
r46425 | andrew.dalke | 2006-05-27 00:49:03 +0200 (Sat, 27 May 2006) | 2 lines
Added description of why splitlines doesn't use the prealloc strategy
........
r46426 | tim.peters | 2006-05-27 01:14:37 +0200 (Sat, 27 May 2006) | 19 lines
Patch 1145039.
set_exc_info(), reset_exc_info(): By exploiting the
likely (who knows?) invariant that when an exception's
`type` is NULL, its `value` and `traceback` are also NULL,
save some cycles in heavily-executed code.
This is a "a kronar saved is a kronar earned" patch: the
speedup isn't reliably measurable, but it obviously does
reduce the operation count in the normal (no exception
raised) path through PyEval_EvalFrameEx().
The tim-exc_sanity branch tries to push this harder, but
is still blowing up (at least in part due to pre-existing
subtle bugs that appear to have no other visible
consequences!).
Not a bugfix candidate.
........
r46429 | steve.holden | 2006-05-27 02:51:52 +0200 (Sat, 27 May 2006) | 2 lines
Reinstate new-style object tests.
........
r46430 | neal.norwitz | 2006-05-27 07:18:57 +0200 (Sat, 27 May 2006) | 1 line
Fix compiler warning (and whitespace) on Mac OS 10.4. (A lot of this code looked duplicated, I wonder if a utility function could help reduce the duplication here.)
........
r46431 | neal.norwitz | 2006-05-27 07:21:30 +0200 (Sat, 27 May 2006) | 4 lines
Fix Coverity warnings.
- Check the correct variable (str_obj, not str) for NULL
- sep_len was already verified it wasn't 0
........
r46432 | martin.v.loewis | 2006-05-27 10:36:52 +0200 (Sat, 27 May 2006) | 2 lines
Patch 1494554: Update numeric properties to Unicode 4.1.
........
r46433 | martin.v.loewis | 2006-05-27 10:54:29 +0200 (Sat, 27 May 2006) | 2 lines
Explain why 'consumed' is initialized.
........
r46436 | fredrik.lundh | 2006-05-27 12:05:10 +0200 (Sat, 27 May 2006) | 3 lines
needforspeed: more stringlib refactoring
........
r46438 | fredrik.lundh | 2006-05-27 12:39:48 +0200 (Sat, 27 May 2006) | 5 lines
needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in-
lining killed performance on certain Intel boxes, and the "aggressive"
macro itself gives most of the benefits on others.
........
r46439 | andrew.dalke | 2006-05-27 13:04:36 +0200 (Sat, 27 May 2006) | 2 lines
fixed typo
........
r46440 | martin.v.loewis | 2006-05-27 13:07:49 +0200 (Sat, 27 May 2006) | 2 lines
Revert bogus change committed in 46432 to this file.
........
r46444 | andrew.kuchling | 2006-05-27 13:26:33 +0200 (Sat, 27 May 2006) | 1 line
Add Py_LOCAL macros
........
r46450 | bob.ippolito | 2006-05-27 13:47:12 +0200 (Sat, 27 May 2006) | 1 line
Remove the range checking and int usage #defines from _struct and strip out the now-dead code
........
r46454 | bob.ippolito | 2006-05-27 14:11:36 +0200 (Sat, 27 May 2006) | 1 line
Fix up struct docstrings, add struct.pack_to function for symmetry
........
r46456 | richard.jones | 2006-05-27 14:29:24 +0200 (Sat, 27 May 2006) | 2 lines
Conversion of exceptions over from faked-up classes to new-style C types.
........
r46457 | georg.brandl | 2006-05-27 14:30:25 +0200 (Sat, 27 May 2006) | 3 lines
Add news item for new-style exception class branch merge.
........
r46458 | tim.peters | 2006-05-27 14:36:53 +0200 (Sat, 27 May 2006) | 3 lines
More random thrashing trying to understand spurious
Windows failures. Who's keeping a bz2 file open?
........
r46460 | andrew.kuchling | 2006-05-27 15:44:37 +0200 (Sat, 27 May 2006) | 1 line
Mention new-style exceptions
........
r46461 | richard.jones | 2006-05-27 15:50:42 +0200 (Sat, 27 May 2006) | 1 line
credit where credit is due
........
r46462 | georg.brandl | 2006-05-27 16:02:03 +0200 (Sat, 27 May 2006) | 3 lines
Always close BZ2Proxy object. Remove unnecessary struct usage.
........
r46463 | tim.peters | 2006-05-27 16:13:13 +0200 (Sat, 27 May 2006) | 2 lines
The cheery optimism of old age.
........
r46464 | andrew.dalke | 2006-05-27 16:16:40 +0200 (Sat, 27 May 2006) | 2 lines
cleanup - removed trailing whitespace
........
r46465 | georg.brandl | 2006-05-27 16:41:55 +0200 (Sat, 27 May 2006) | 3 lines
Remove spurious semicolons after macro invocations.
........
r46468 | fredrik.lundh | 2006-05-27 16:58:20 +0200 (Sat, 27 May 2006) | 4 lines
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
where appropriate
........
r46469 | fredrik.lundh | 2006-05-27 17:20:22 +0200 (Sat, 27 May 2006) | 4 lines
needforspeed: stringlib refactoring: changed find_obj to find_slice,
to enable use from stringobject
........
r46470 | fredrik.lundh | 2006-05-27 17:26:19 +0200 (Sat, 27 May 2006) | 3 lines
needforspeed: stringlib refactoring: use find_slice for stringobject
........
r46472 | kristjan.jonsson | 2006-05-27 17:41:31 +0200 (Sat, 27 May 2006) | 1 line
Add a PCBuild8 build directory for building with Visual Studio .NET 2005. Contains a special project to perform profile guided optimizations on the pythoncore.dll, by instrumenting and running pybench.py
........
r46473 | jack.diederich | 2006-05-27 17:44:34 +0200 (Sat, 27 May 2006) | 3 lines
needforspeed: use PyObject_MALLOC instead of system malloc for small
allocations. Use PyMem_MALLOC for larger (1k+) chunks. 1%-2% speedup.
........
r46474 | bob.ippolito | 2006-05-27 17:53:49 +0200 (Sat, 27 May 2006) | 1 line
fix struct regression on 64-bit platforms
........
r46475 | richard.jones | 2006-05-27 18:07:28 +0200 (Sat, 27 May 2006) | 1 line
doc string additions and tweaks
........
r46477 | richard.jones | 2006-05-27 18:15:11 +0200 (Sat, 27 May 2006) | 1 line
move semicolons
........
r46478 | george.yoshida | 2006-05-27 18:32:44 +0200 (Sat, 27 May 2006) | 2 lines
minor markup nits
........
r46488 | george.yoshida | 2006-05-27 18:51:43 +0200 (Sat, 27 May 2006) | 3 lines
End of Ch.3 is now about "with statement".
Avoid obsolescence by directly referring to the section.
........
r46489 | george.yoshida | 2006-05-27 19:09:17 +0200 (Sat, 27 May 2006) | 2 lines
fix typo
........
2006-05-27 16:21:47 -03:00
|
|
|
def test_microsecond_rounding(self):
|
|
|
|
# Test whether fromtimestamp "rounds up" floats that are less
|
|
|
|
# than one microsecond smaller than an integer.
|
|
|
|
self.assertEquals(self.theclass.fromtimestamp(0.9999999),
|
|
|
|
self.theclass.fromtimestamp(1))
|
|
|
|
|
2004-06-19 23:50:16 -03:00
|
|
|
def test_insane_fromtimestamp(self):
|
|
|
|
# It's possible that some platform maps time_t to double,
|
|
|
|
# and that this test will fail there. This test should
|
|
|
|
# exempt such platforms (provided they return reasonable
|
|
|
|
# results!).
|
|
|
|
for insane in -1e200, 1e200:
|
|
|
|
self.assertRaises(ValueError, self.theclass.fromtimestamp,
|
|
|
|
insane)
|
|
|
|
|
|
|
|
def test_insane_utcfromtimestamp(self):
|
|
|
|
# It's possible that some platform maps time_t to double,
|
|
|
|
# and that this test will fail there. This test should
|
|
|
|
# exempt such platforms (provided they return reasonable
|
|
|
|
# results!).
|
|
|
|
for insane in -1e200, 1e200:
|
|
|
|
self.assertRaises(ValueError, self.theclass.utcfromtimestamp,
|
|
|
|
insane)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_utcnow(self):
|
|
|
|
import time
|
|
|
|
|
|
|
|
# Call it a success if utcnow() and utcfromtimestamp() are within
|
|
|
|
# a second of each other.
|
|
|
|
tolerance = timedelta(seconds=1)
|
|
|
|
for dummy in range(3):
|
|
|
|
from_now = self.theclass.utcnow()
|
|
|
|
from_timestamp = self.theclass.utcfromtimestamp(time.time())
|
|
|
|
if abs(from_timestamp - from_now) <= tolerance:
|
|
|
|
break
|
|
|
|
# Else try again a few times.
|
|
|
|
self.failUnless(abs(from_timestamp - from_now) <= tolerance)
|
|
|
|
|
2005-01-13 00:12:31 -04:00
|
|
|
def test_strptime(self):
|
|
|
|
import time
|
|
|
|
|
|
|
|
string = '2004-12-01 13:02:47'
|
|
|
|
format = '%Y-%m-%d %H:%M:%S'
|
|
|
|
expected = self.theclass(*(time.strptime(string, format)[0:6]))
|
|
|
|
got = self.theclass.strptime(string, format)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_more_timetuple(self):
|
|
|
|
# This tests fields beyond those tested by the TestDate.test_timetuple.
|
|
|
|
t = self.theclass(2004, 12, 31, 6, 22, 33)
|
|
|
|
self.assertEqual(t.timetuple(), (2004, 12, 31, 6, 22, 33, 4, 366, -1))
|
|
|
|
self.assertEqual(t.timetuple(),
|
|
|
|
(t.year, t.month, t.day,
|
|
|
|
t.hour, t.minute, t.second,
|
|
|
|
t.weekday(),
|
|
|
|
t.toordinal() - date(t.year, 1, 1).toordinal() + 1,
|
|
|
|
-1))
|
|
|
|
tt = t.timetuple()
|
|
|
|
self.assertEqual(tt.tm_year, t.year)
|
|
|
|
self.assertEqual(tt.tm_mon, t.month)
|
|
|
|
self.assertEqual(tt.tm_mday, t.day)
|
|
|
|
self.assertEqual(tt.tm_hour, t.hour)
|
|
|
|
self.assertEqual(tt.tm_min, t.minute)
|
|
|
|
self.assertEqual(tt.tm_sec, t.second)
|
|
|
|
self.assertEqual(tt.tm_wday, t.weekday())
|
|
|
|
self.assertEqual(tt.tm_yday, t.toordinal() -
|
|
|
|
date(t.year, 1, 1).toordinal() + 1)
|
|
|
|
self.assertEqual(tt.tm_isdst, -1)
|
|
|
|
|
|
|
|
def test_more_strftime(self):
|
|
|
|
# This tests fields beyond those tested by the TestDate.test_strftime.
|
|
|
|
t = self.theclass(2004, 12, 31, 6, 22, 33)
|
|
|
|
self.assertEqual(t.strftime("%m %d %y %S %M %H %j"),
|
|
|
|
"12 31 04 33 22 06 366")
|
|
|
|
|
|
|
|
def test_extract(self):
|
|
|
|
dt = self.theclass(2002, 3, 4, 18, 45, 3, 1234)
|
|
|
|
self.assertEqual(dt.date(), date(2002, 3, 4))
|
|
|
|
self.assertEqual(dt.time(), time(18, 45, 3, 1234))
|
|
|
|
|
|
|
|
def test_combine(self):
|
|
|
|
d = date(2002, 3, 4)
|
|
|
|
t = time(18, 45, 3, 1234)
|
|
|
|
expected = self.theclass(2002, 3, 4, 18, 45, 3, 1234)
|
|
|
|
combine = self.theclass.combine
|
|
|
|
dt = combine(d, t)
|
|
|
|
self.assertEqual(dt, expected)
|
|
|
|
|
|
|
|
dt = combine(time=t, date=d)
|
|
|
|
self.assertEqual(dt, expected)
|
|
|
|
|
|
|
|
self.assertEqual(d, dt.date())
|
|
|
|
self.assertEqual(t, dt.time())
|
|
|
|
self.assertEqual(dt, combine(dt.date(), dt.time()))
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, combine) # need an arg
|
|
|
|
self.assertRaises(TypeError, combine, d) # need two args
|
|
|
|
self.assertRaises(TypeError, combine, t, d) # args reversed
|
|
|
|
self.assertRaises(TypeError, combine, d, t, 1) # too many args
|
|
|
|
self.assertRaises(TypeError, combine, "date", "time") # wrong types
|
|
|
|
|
2002-12-24 01:41:27 -04:00
|
|
|
def test_replace(self):
|
|
|
|
cls = self.theclass
|
|
|
|
args = [1, 2, 3, 4, 5, 6, 7]
|
|
|
|
base = cls(*args)
|
|
|
|
self.assertEqual(base, base.replace())
|
|
|
|
|
|
|
|
i = 0
|
|
|
|
for name, newval in (("year", 2),
|
|
|
|
("month", 3),
|
|
|
|
("day", 4),
|
|
|
|
("hour", 5),
|
|
|
|
("minute", 6),
|
|
|
|
("second", 7),
|
|
|
|
("microsecond", 8)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = newval
|
|
|
|
expected = cls(*newargs)
|
|
|
|
got = base.replace(**{name: newval})
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
i += 1
|
|
|
|
|
|
|
|
# Out of bounds.
|
|
|
|
base = cls(2000, 2, 29)
|
|
|
|
self.assertRaises(ValueError, base.replace, year=2001)
|
|
|
|
|
2002-12-25 03:40:55 -04:00
|
|
|
def test_astimezone(self):
|
2003-01-23 12:36:11 -04:00
|
|
|
# Pretty boring! The TZ test is more interesting here. astimezone()
|
|
|
|
# simply can't be applied to a naive object.
|
2002-12-25 03:40:55 -04:00
|
|
|
dt = self.theclass.now()
|
|
|
|
f = FixedOffset(44, "")
|
|
|
|
self.assertRaises(TypeError, dt.astimezone) # not enough args
|
|
|
|
self.assertRaises(TypeError, dt.astimezone, f, f) # too many args
|
|
|
|
self.assertRaises(TypeError, dt.astimezone, dt) # arg wrong type
|
2003-01-23 12:36:11 -04:00
|
|
|
self.assertRaises(ValueError, dt.astimezone, f) # naive
|
|
|
|
self.assertRaises(ValueError, dt.astimezone, tz=f) # naive
|
|
|
|
|
|
|
|
class Bogus(tzinfo):
|
|
|
|
def utcoffset(self, dt): return None
|
|
|
|
def dst(self, dt): return timedelta(0)
|
|
|
|
bog = Bogus()
|
|
|
|
self.assertRaises(ValueError, dt.astimezone, bog) # naive
|
2002-12-25 03:40:55 -04:00
|
|
|
|
2003-01-23 12:36:11 -04:00
|
|
|
class AlsoBogus(tzinfo):
|
|
|
|
def utcoffset(self, dt): return timedelta(0)
|
|
|
|
def dst(self, dt): return None
|
|
|
|
alsobog = AlsoBogus()
|
|
|
|
self.assertRaises(ValueError, dt.astimezone, alsobog) # also naive
|
2002-12-24 01:41:27 -04:00
|
|
|
|
2003-05-17 02:55:19 -03:00
|
|
|
def test_subclass_datetime(self):
|
|
|
|
|
|
|
|
class C(self.theclass):
|
|
|
|
theAnswer = 42
|
|
|
|
|
|
|
|
def __new__(cls, *args, **kws):
|
|
|
|
temp = kws.copy()
|
|
|
|
extra = temp.pop('extra')
|
|
|
|
result = self.theclass.__new__(cls, *args, **temp)
|
|
|
|
result.extra = extra
|
|
|
|
return result
|
|
|
|
|
|
|
|
def newmeth(self, start):
|
|
|
|
return start + self.year + self.month + self.second
|
|
|
|
|
|
|
|
args = 2003, 4, 14, 12, 13, 41
|
|
|
|
|
|
|
|
dt1 = self.theclass(*args)
|
|
|
|
dt2 = C(*args, **{'extra': 7})
|
|
|
|
|
|
|
|
self.assertEqual(dt2.__class__, C)
|
|
|
|
self.assertEqual(dt2.theAnswer, 42)
|
|
|
|
self.assertEqual(dt2.extra, 7)
|
|
|
|
self.assertEqual(dt1.toordinal(), dt2.toordinal())
|
|
|
|
self.assertEqual(dt2.newmeth(-7), dt1.year + dt1.month +
|
|
|
|
dt1.second - 7)
|
|
|
|
|
2004-06-07 20:04:33 -03:00
|
|
|
class SubclassTime(time):
|
|
|
|
sub_var = 1
|
|
|
|
|
2003-02-07 18:50:28 -04:00
|
|
|
class TestTime(HarmlessMixedComparison):
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
theclass = time
|
|
|
|
|
|
|
|
def test_basic_attributes(self):
|
|
|
|
t = self.theclass(12, 0)
|
|
|
|
self.assertEqual(t.hour, 12)
|
|
|
|
self.assertEqual(t.minute, 0)
|
|
|
|
self.assertEqual(t.second, 0)
|
|
|
|
self.assertEqual(t.microsecond, 0)
|
|
|
|
|
|
|
|
def test_basic_attributes_nonzero(self):
|
|
|
|
# Make sure all attributes are non-zero so bugs in
|
|
|
|
# bit-shifting access show up.
|
|
|
|
t = self.theclass(12, 59, 59, 8000)
|
|
|
|
self.assertEqual(t.hour, 12)
|
|
|
|
self.assertEqual(t.minute, 59)
|
|
|
|
self.assertEqual(t.second, 59)
|
|
|
|
self.assertEqual(t.microsecond, 8000)
|
|
|
|
|
|
|
|
def test_roundtrip(self):
|
|
|
|
t = self.theclass(1, 2, 3, 4)
|
|
|
|
|
|
|
|
# Verify t -> string -> time identity.
|
|
|
|
s = repr(t)
|
|
|
|
self.failUnless(s.startswith('datetime.'))
|
|
|
|
s = s[9:]
|
|
|
|
t2 = eval(s)
|
|
|
|
self.assertEqual(t, t2)
|
|
|
|
|
|
|
|
# Verify identity via reconstructing from pieces.
|
|
|
|
t2 = self.theclass(t.hour, t.minute, t.second,
|
|
|
|
t.microsecond)
|
|
|
|
self.assertEqual(t, t2)
|
|
|
|
|
|
|
|
def test_comparing(self):
|
|
|
|
args = [1, 2, 3, 4]
|
|
|
|
t1 = self.theclass(*args)
|
|
|
|
t2 = self.theclass(*args)
|
|
|
|
self.failUnless(t1 == t2)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t1 >= t2)
|
|
|
|
self.failUnless(not t1 != t2)
|
|
|
|
self.failUnless(not t1 < t2)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.assertEqual(cmp(t1, t2), 0)
|
|
|
|
self.assertEqual(cmp(t2, t1), 0)
|
|
|
|
|
|
|
|
for i in range(len(args)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = args[i] + 1
|
|
|
|
t2 = self.theclass(*newargs) # this is larger than t1
|
|
|
|
self.failUnless(t1 < t2)
|
|
|
|
self.failUnless(t2 > t1)
|
|
|
|
self.failUnless(t1 <= t2)
|
|
|
|
self.failUnless(t2 >= t1)
|
|
|
|
self.failUnless(t1 != t2)
|
|
|
|
self.failUnless(t2 != t1)
|
|
|
|
self.failUnless(not t1 == t2)
|
|
|
|
self.failUnless(not t2 == t1)
|
|
|
|
self.failUnless(not t1 > t2)
|
|
|
|
self.failUnless(not t2 < t1)
|
|
|
|
self.failUnless(not t1 >= t2)
|
|
|
|
self.failUnless(not t2 <= t1)
|
|
|
|
self.assertEqual(cmp(t1, t2), -1)
|
|
|
|
self.assertEqual(cmp(t2, t1), 1)
|
|
|
|
|
2003-02-07 23:46:31 -04:00
|
|
|
for badarg in OTHERSTUFF:
|
2003-02-07 18:50:28 -04:00
|
|
|
self.assertEqual(t1 == badarg, False)
|
|
|
|
self.assertEqual(t1 != badarg, True)
|
|
|
|
self.assertEqual(badarg == t1, False)
|
|
|
|
self.assertEqual(badarg != t1, True)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertRaises(TypeError, lambda: t1 <= badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 < badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 > badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: t1 >= badarg)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg <= t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg < t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg > t1)
|
|
|
|
self.assertRaises(TypeError, lambda: badarg >= t1)
|
|
|
|
|
|
|
|
def test_bad_constructor_arguments(self):
|
|
|
|
# bad hours
|
|
|
|
self.theclass(0, 0) # no exception
|
|
|
|
self.theclass(23, 0) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, -1, 0)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 24, 0)
|
|
|
|
# bad minutes
|
|
|
|
self.theclass(23, 0) # no exception
|
|
|
|
self.theclass(23, 59) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 23, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 23, 60)
|
|
|
|
# bad seconds
|
|
|
|
self.theclass(23, 59, 0) # no exception
|
|
|
|
self.theclass(23, 59, 59) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 23, 59, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 23, 59, 60)
|
|
|
|
# bad microseconds
|
|
|
|
self.theclass(23, 59, 59, 0) # no exception
|
|
|
|
self.theclass(23, 59, 59, 999999) # no exception
|
|
|
|
self.assertRaises(ValueError, self.theclass, 23, 59, 59, -1)
|
|
|
|
self.assertRaises(ValueError, self.theclass, 23, 59, 59, 1000000)
|
|
|
|
|
|
|
|
def test_hash_equality(self):
|
|
|
|
d = self.theclass(23, 30, 17)
|
|
|
|
e = self.theclass(23, 30, 17)
|
|
|
|
self.assertEqual(d, e)
|
|
|
|
self.assertEqual(hash(d), hash(e))
|
|
|
|
|
|
|
|
dic = {d: 1}
|
|
|
|
dic[e] = 2
|
|
|
|
self.assertEqual(len(dic), 1)
|
|
|
|
self.assertEqual(dic[d], 2)
|
|
|
|
self.assertEqual(dic[e], 2)
|
|
|
|
|
|
|
|
d = self.theclass(0, 5, 17)
|
|
|
|
e = self.theclass(0, 5, 17)
|
|
|
|
self.assertEqual(d, e)
|
|
|
|
self.assertEqual(hash(d), hash(e))
|
|
|
|
|
|
|
|
dic = {d: 1}
|
|
|
|
dic[e] = 2
|
|
|
|
self.assertEqual(len(dic), 1)
|
|
|
|
self.assertEqual(dic[d], 2)
|
|
|
|
self.assertEqual(dic[e], 2)
|
|
|
|
|
|
|
|
def test_isoformat(self):
|
|
|
|
t = self.theclass(4, 5, 1, 123)
|
|
|
|
self.assertEqual(t.isoformat(), "04:05:01.000123")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass()
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass(microsecond=1)
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00.000001")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass(microsecond=10)
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00.000010")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass(microsecond=100)
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00.000100")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass(microsecond=1000)
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00.001000")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass(microsecond=10000)
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00.010000")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
t = self.theclass(microsecond=100000)
|
|
|
|
self.assertEqual(t.isoformat(), "00:00:00.100000")
|
|
|
|
self.assertEqual(t.isoformat(), str(t))
|
|
|
|
|
|
|
|
def test_strftime(self):
|
|
|
|
t = self.theclass(1, 2, 3, 4)
|
|
|
|
self.assertEqual(t.strftime('%H %M %S'), "01 02 03")
|
|
|
|
# A naive object replaces %z and %Z with empty strings.
|
|
|
|
self.assertEqual(t.strftime("'%z' '%Z'"), "'' ''")
|
|
|
|
|
|
|
|
def test_str(self):
|
|
|
|
self.assertEqual(str(self.theclass(1, 2, 3, 4)), "01:02:03.000004")
|
|
|
|
self.assertEqual(str(self.theclass(10, 2, 3, 4000)), "10:02:03.004000")
|
|
|
|
self.assertEqual(str(self.theclass(0, 2, 3, 400000)), "00:02:03.400000")
|
|
|
|
self.assertEqual(str(self.theclass(12, 2, 3, 0)), "12:02:03")
|
|
|
|
self.assertEqual(str(self.theclass(23, 15, 0, 0)), "23:15:00")
|
|
|
|
|
|
|
|
def test_repr(self):
|
|
|
|
name = 'datetime.' + self.theclass.__name__
|
|
|
|
self.assertEqual(repr(self.theclass(1, 2, 3, 4)),
|
|
|
|
"%s(1, 2, 3, 4)" % name)
|
|
|
|
self.assertEqual(repr(self.theclass(10, 2, 3, 4000)),
|
|
|
|
"%s(10, 2, 3, 4000)" % name)
|
|
|
|
self.assertEqual(repr(self.theclass(0, 2, 3, 400000)),
|
|
|
|
"%s(0, 2, 3, 400000)" % name)
|
|
|
|
self.assertEqual(repr(self.theclass(12, 2, 3, 0)),
|
|
|
|
"%s(12, 2, 3)" % name)
|
|
|
|
self.assertEqual(repr(self.theclass(23, 15, 0, 0)),
|
|
|
|
"%s(23, 15)" % name)
|
|
|
|
|
|
|
|
def test_resolution_info(self):
|
|
|
|
self.assert_(isinstance(self.theclass.min, self.theclass))
|
|
|
|
self.assert_(isinstance(self.theclass.max, self.theclass))
|
|
|
|
self.assert_(isinstance(self.theclass.resolution, timedelta))
|
|
|
|
self.assert_(self.theclass.max > self.theclass.min)
|
|
|
|
|
|
|
|
def test_pickling(self):
|
|
|
|
args = 20, 59, 16, 64**2
|
|
|
|
orig = self.theclass(*args)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2004-06-07 20:04:33 -03:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
|
|
|
|
|
|
|
def test_pickling_subclass_time(self):
|
|
|
|
args = 20, 59, 16, 64**2
|
|
|
|
orig = SubclassTime(*args)
|
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_bool(self):
|
|
|
|
cls = self.theclass
|
|
|
|
self.failUnless(cls(1))
|
|
|
|
self.failUnless(cls(0, 1))
|
|
|
|
self.failUnless(cls(0, 0, 1))
|
|
|
|
self.failUnless(cls(0, 0, 0, 1))
|
|
|
|
self.failUnless(not cls(0))
|
|
|
|
self.failUnless(not cls())
|
|
|
|
|
2002-12-24 01:41:27 -04:00
|
|
|
def test_replace(self):
|
|
|
|
cls = self.theclass
|
|
|
|
args = [1, 2, 3, 4]
|
|
|
|
base = cls(*args)
|
|
|
|
self.assertEqual(base, base.replace())
|
|
|
|
|
|
|
|
i = 0
|
|
|
|
for name, newval in (("hour", 5),
|
|
|
|
("minute", 6),
|
|
|
|
("second", 7),
|
|
|
|
("microsecond", 8)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = newval
|
|
|
|
expected = cls(*newargs)
|
|
|
|
got = base.replace(**{name: newval})
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
i += 1
|
|
|
|
|
|
|
|
# Out of bounds.
|
|
|
|
base = cls(1)
|
|
|
|
self.assertRaises(ValueError, base.replace, hour=24)
|
|
|
|
self.assertRaises(ValueError, base.replace, minute=-1)
|
|
|
|
self.assertRaises(ValueError, base.replace, second=100)
|
|
|
|
self.assertRaises(ValueError, base.replace, microsecond=1000000)
|
|
|
|
|
2003-05-17 02:55:19 -03:00
|
|
|
def test_subclass_time(self):
|
|
|
|
|
|
|
|
class C(self.theclass):
|
|
|
|
theAnswer = 42
|
|
|
|
|
|
|
|
def __new__(cls, *args, **kws):
|
|
|
|
temp = kws.copy()
|
|
|
|
extra = temp.pop('extra')
|
|
|
|
result = self.theclass.__new__(cls, *args, **temp)
|
|
|
|
result.extra = extra
|
|
|
|
return result
|
|
|
|
|
|
|
|
def newmeth(self, start):
|
|
|
|
return start + self.hour + self.second
|
|
|
|
|
|
|
|
args = 4, 5, 6
|
|
|
|
|
|
|
|
dt1 = self.theclass(*args)
|
|
|
|
dt2 = C(*args, **{'extra': 7})
|
|
|
|
|
|
|
|
self.assertEqual(dt2.__class__, C)
|
|
|
|
self.assertEqual(dt2.theAnswer, 42)
|
|
|
|
self.assertEqual(dt2.extra, 7)
|
|
|
|
self.assertEqual(dt1.isoformat(), dt2.isoformat())
|
|
|
|
self.assertEqual(dt2.newmeth(-7), dt1.hour + dt1.second - 7)
|
|
|
|
|
2005-11-07 03:15:48 -04:00
|
|
|
def test_backdoor_resistance(self):
|
|
|
|
# see TestDate.test_backdoor_resistance().
|
|
|
|
base = '2:59.0'
|
|
|
|
for hour_byte in ' ', '9', chr(24), '\xff':
|
|
|
|
self.assertRaises(TypeError, self.theclass,
|
|
|
|
hour_byte + base[1:])
|
|
|
|
|
2002-12-21 23:43:39 -04:00
|
|
|
# A mixin for classes with a tzinfo= argument. Subclasses must define
|
|
|
|
# theclass as a class atribute, and theclass(1, 1, 1, tzinfo=whatever)
|
2003-01-08 16:40:01 -04:00
|
|
|
# must be legit (which is true for time and datetime).
|
2002-12-21 23:43:39 -04:00
|
|
|
class TZInfoBase(unittest.TestCase):
|
2002-12-16 16:18:38 -04:00
|
|
|
|
2002-12-30 16:52:32 -04:00
|
|
|
def test_argument_passing(self):
|
|
|
|
cls = self.theclass
|
2003-01-08 16:40:01 -04:00
|
|
|
# A datetime passes itself on, a time passes None.
|
2002-12-30 16:52:32 -04:00
|
|
|
class introspective(tzinfo):
|
|
|
|
def tzname(self, dt): return dt and "real" or "none"
|
2003-01-02 17:28:08 -04:00
|
|
|
def utcoffset(self, dt):
|
|
|
|
return timedelta(minutes = dt and 42 or -42)
|
2002-12-30 16:52:32 -04:00
|
|
|
dst = utcoffset
|
|
|
|
|
|
|
|
obj = cls(1, 2, 3, tzinfo=introspective())
|
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
expected = cls is time and "none" or "real"
|
2002-12-30 16:52:32 -04:00
|
|
|
self.assertEqual(obj.tzname(), expected)
|
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
expected = timedelta(minutes=(cls is time and -42 or 42))
|
2002-12-30 16:52:32 -04:00
|
|
|
self.assertEqual(obj.utcoffset(), expected)
|
|
|
|
self.assertEqual(obj.dst(), expected)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_bad_tzinfo_classes(self):
|
2002-12-21 23:43:39 -04:00
|
|
|
cls = self.theclass
|
|
|
|
self.assertRaises(TypeError, cls, 1, 1, 1, tzinfo=12)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
class NiceTry(object):
|
|
|
|
def __init__(self): pass
|
|
|
|
def utcoffset(self, dt): pass
|
2002-12-21 23:43:39 -04:00
|
|
|
self.assertRaises(TypeError, cls, 1, 1, 1, tzinfo=NiceTry)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
class BetterTry(tzinfo):
|
|
|
|
def __init__(self): pass
|
|
|
|
def utcoffset(self, dt): pass
|
|
|
|
b = BetterTry()
|
2002-12-21 23:43:39 -04:00
|
|
|
t = cls(1, 1, 1, tzinfo=b)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(t.tzinfo is b)
|
|
|
|
|
2002-12-21 23:43:39 -04:00
|
|
|
def test_utc_offset_out_of_bounds(self):
|
|
|
|
class Edgy(tzinfo):
|
|
|
|
def __init__(self, offset):
|
2003-01-02 17:28:08 -04:00
|
|
|
self.offset = timedelta(minutes=offset)
|
2002-12-21 23:43:39 -04:00
|
|
|
def utcoffset(self, dt):
|
|
|
|
return self.offset
|
|
|
|
|
|
|
|
cls = self.theclass
|
|
|
|
for offset, legit in ((-1440, False),
|
|
|
|
(-1439, True),
|
|
|
|
(1439, True),
|
|
|
|
(1440, False)):
|
2003-01-08 16:40:01 -04:00
|
|
|
if cls is time:
|
2002-12-21 23:43:39 -04:00
|
|
|
t = cls(1, 2, 3, tzinfo=Edgy(offset))
|
2003-01-08 16:40:01 -04:00
|
|
|
elif cls is datetime:
|
2002-12-21 23:43:39 -04:00
|
|
|
t = cls(6, 6, 6, 1, 2, 3, tzinfo=Edgy(offset))
|
2003-01-08 16:40:01 -04:00
|
|
|
else:
|
|
|
|
assert 0, "impossible"
|
2002-12-21 23:43:39 -04:00
|
|
|
if legit:
|
|
|
|
aofs = abs(offset)
|
|
|
|
h, m = divmod(aofs, 60)
|
|
|
|
tag = "%c%02d:%02d" % (offset < 0 and '-' or '+', h, m)
|
2003-01-08 16:40:01 -04:00
|
|
|
if isinstance(t, datetime):
|
2002-12-21 23:43:39 -04:00
|
|
|
t = t.timetz()
|
|
|
|
self.assertEqual(str(t), "01:02:03" + tag)
|
|
|
|
else:
|
|
|
|
self.assertRaises(ValueError, str, t)
|
|
|
|
|
|
|
|
def test_tzinfo_classes(self):
|
|
|
|
cls = self.theclass
|
|
|
|
class C1(tzinfo):
|
|
|
|
def utcoffset(self, dt): return None
|
|
|
|
def dst(self, dt): return None
|
|
|
|
def tzname(self, dt): return None
|
|
|
|
for t in (cls(1, 1, 1),
|
|
|
|
cls(1, 1, 1, tzinfo=None),
|
|
|
|
cls(1, 1, 1, tzinfo=C1())):
|
|
|
|
self.failUnless(t.utcoffset() is None)
|
|
|
|
self.failUnless(t.dst() is None)
|
|
|
|
self.failUnless(t.tzname() is None)
|
|
|
|
|
|
|
|
class C3(tzinfo):
|
|
|
|
def utcoffset(self, dt): return timedelta(minutes=-1439)
|
|
|
|
def dst(self, dt): return timedelta(minutes=1439)
|
|
|
|
def tzname(self, dt): return "aname"
|
2003-01-02 17:28:08 -04:00
|
|
|
t = cls(1, 1, 1, tzinfo=C3())
|
|
|
|
self.assertEqual(t.utcoffset(), timedelta(minutes=-1439))
|
|
|
|
self.assertEqual(t.dst(), timedelta(minutes=1439))
|
|
|
|
self.assertEqual(t.tzname(), "aname")
|
2002-12-21 23:43:39 -04:00
|
|
|
|
|
|
|
# Wrong types.
|
|
|
|
class C4(tzinfo):
|
|
|
|
def utcoffset(self, dt): return "aname"
|
2003-01-02 17:28:08 -04:00
|
|
|
def dst(self, dt): return 7
|
2002-12-21 23:43:39 -04:00
|
|
|
def tzname(self, dt): return 0
|
|
|
|
t = cls(1, 1, 1, tzinfo=C4())
|
|
|
|
self.assertRaises(TypeError, t.utcoffset)
|
|
|
|
self.assertRaises(TypeError, t.dst)
|
|
|
|
self.assertRaises(TypeError, t.tzname)
|
|
|
|
|
|
|
|
# Offset out of range.
|
|
|
|
class C6(tzinfo):
|
|
|
|
def utcoffset(self, dt): return timedelta(hours=-24)
|
|
|
|
def dst(self, dt): return timedelta(hours=24)
|
2003-01-02 17:28:08 -04:00
|
|
|
t = cls(1, 1, 1, tzinfo=C6())
|
|
|
|
self.assertRaises(ValueError, t.utcoffset)
|
|
|
|
self.assertRaises(ValueError, t.dst)
|
2002-12-21 23:43:39 -04:00
|
|
|
|
|
|
|
# Not a whole number of minutes.
|
|
|
|
class C7(tzinfo):
|
|
|
|
def utcoffset(self, dt): return timedelta(seconds=61)
|
|
|
|
def dst(self, dt): return timedelta(microseconds=-81)
|
|
|
|
t = cls(1, 1, 1, tzinfo=C7())
|
|
|
|
self.assertRaises(ValueError, t.utcoffset)
|
|
|
|
self.assertRaises(ValueError, t.dst)
|
|
|
|
|
2002-12-26 01:01:19 -04:00
|
|
|
def test_aware_compare(self):
|
|
|
|
cls = self.theclass
|
|
|
|
|
2002-12-26 20:41:11 -04:00
|
|
|
# Ensure that utcoffset() gets ignored if the comparands have
|
|
|
|
# the same tzinfo member.
|
2002-12-26 01:01:19 -04:00
|
|
|
class OperandDependentOffset(tzinfo):
|
|
|
|
def utcoffset(self, t):
|
|
|
|
if t.minute < 10:
|
2003-01-02 17:28:08 -04:00
|
|
|
# d0 and d1 equal after adjustment
|
|
|
|
return timedelta(minutes=t.minute)
|
2002-12-26 01:01:19 -04:00
|
|
|
else:
|
2003-01-02 17:28:08 -04:00
|
|
|
# d2 off in the weeds
|
|
|
|
return timedelta(minutes=59)
|
2002-12-26 01:01:19 -04:00
|
|
|
|
|
|
|
base = cls(8, 9, 10, tzinfo=OperandDependentOffset())
|
|
|
|
d0 = base.replace(minute=3)
|
|
|
|
d1 = base.replace(minute=9)
|
|
|
|
d2 = base.replace(minute=11)
|
2002-12-26 20:41:11 -04:00
|
|
|
for x in d0, d1, d2:
|
|
|
|
for y in d0, d1, d2:
|
|
|
|
got = cmp(x, y)
|
|
|
|
expected = cmp(x.minute, y.minute)
|
|
|
|
self.assertEqual(got, expected)
|
|
|
|
|
|
|
|
# However, if they're different members, uctoffset is not ignored.
|
2003-01-08 16:40:01 -04:00
|
|
|
# Note that a time can't actually have an operand-depedent offset,
|
|
|
|
# though (and time.utcoffset() passes None to tzinfo.utcoffset()),
|
|
|
|
# so skip this test for time.
|
|
|
|
if cls is not time:
|
2002-12-30 16:52:32 -04:00
|
|
|
d0 = base.replace(minute=3, tzinfo=OperandDependentOffset())
|
|
|
|
d1 = base.replace(minute=9, tzinfo=OperandDependentOffset())
|
|
|
|
d2 = base.replace(minute=11, tzinfo=OperandDependentOffset())
|
|
|
|
for x in d0, d1, d2:
|
|
|
|
for y in d0, d1, d2:
|
|
|
|
got = cmp(x, y)
|
|
|
|
if (x is d0 or x is d1) and (y is d0 or y is d1):
|
|
|
|
expected = 0
|
|
|
|
elif x is y is d2:
|
|
|
|
expected = 0
|
|
|
|
elif x is d2:
|
|
|
|
expected = -1
|
|
|
|
else:
|
|
|
|
assert y is d2
|
|
|
|
expected = 1
|
|
|
|
self.assertEqual(got, expected)
|
2002-12-26 01:01:19 -04:00
|
|
|
|
2002-12-21 23:43:39 -04:00
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
# Testing time objects with a non-None tzinfo.
|
2002-12-21 23:43:39 -04:00
|
|
|
class TestTimeTZ(TestTime, TZInfoBase):
|
2003-01-08 16:40:01 -04:00
|
|
|
theclass = time
|
2002-12-21 23:43:39 -04:00
|
|
|
|
|
|
|
def test_empty(self):
|
|
|
|
t = self.theclass()
|
|
|
|
self.assertEqual(t.hour, 0)
|
|
|
|
self.assertEqual(t.minute, 0)
|
|
|
|
self.assertEqual(t.second, 0)
|
|
|
|
self.assertEqual(t.microsecond, 0)
|
|
|
|
self.failUnless(t.tzinfo is None)
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_zones(self):
|
|
|
|
est = FixedOffset(-300, "EST", 1)
|
|
|
|
utc = FixedOffset(0, "UTC", -2)
|
|
|
|
met = FixedOffset(60, "MET", 3)
|
2003-01-08 16:40:01 -04:00
|
|
|
t1 = time( 7, 47, tzinfo=est)
|
|
|
|
t2 = time(12, 47, tzinfo=utc)
|
|
|
|
t3 = time(13, 47, tzinfo=met)
|
|
|
|
t4 = time(microsecond=40)
|
|
|
|
t5 = time(microsecond=40, tzinfo=utc)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
self.assertEqual(t1.tzinfo, est)
|
|
|
|
self.assertEqual(t2.tzinfo, utc)
|
|
|
|
self.assertEqual(t3.tzinfo, met)
|
|
|
|
self.failUnless(t4.tzinfo is None)
|
|
|
|
self.assertEqual(t5.tzinfo, utc)
|
|
|
|
|
2002-12-21 23:43:39 -04:00
|
|
|
self.assertEqual(t1.utcoffset(), timedelta(minutes=-300))
|
|
|
|
self.assertEqual(t2.utcoffset(), timedelta(minutes=0))
|
|
|
|
self.assertEqual(t3.utcoffset(), timedelta(minutes=60))
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(t4.utcoffset() is None)
|
|
|
|
self.assertRaises(TypeError, t1.utcoffset, "no args")
|
|
|
|
|
|
|
|
self.assertEqual(t1.tzname(), "EST")
|
|
|
|
self.assertEqual(t2.tzname(), "UTC")
|
|
|
|
self.assertEqual(t3.tzname(), "MET")
|
|
|
|
self.failUnless(t4.tzname() is None)
|
|
|
|
self.assertRaises(TypeError, t1.tzname, "no args")
|
|
|
|
|
2002-12-21 23:43:39 -04:00
|
|
|
self.assertEqual(t1.dst(), timedelta(minutes=1))
|
|
|
|
self.assertEqual(t2.dst(), timedelta(minutes=-2))
|
|
|
|
self.assertEqual(t3.dst(), timedelta(minutes=3))
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(t4.dst() is None)
|
|
|
|
self.assertRaises(TypeError, t1.dst, "no args")
|
|
|
|
|
|
|
|
self.assertEqual(hash(t1), hash(t2))
|
|
|
|
self.assertEqual(hash(t1), hash(t3))
|
|
|
|
self.assertEqual(hash(t2), hash(t3))
|
|
|
|
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
self.assertEqual(t1, t3)
|
|
|
|
self.assertEqual(t2, t3)
|
|
|
|
self.assertRaises(TypeError, lambda: t4 == t5) # mixed tz-aware & naive
|
|
|
|
self.assertRaises(TypeError, lambda: t4 < t5) # mixed tz-aware & naive
|
|
|
|
self.assertRaises(TypeError, lambda: t5 < t4) # mixed tz-aware & naive
|
|
|
|
|
|
|
|
self.assertEqual(str(t1), "07:47:00-05:00")
|
|
|
|
self.assertEqual(str(t2), "12:47:00+00:00")
|
|
|
|
self.assertEqual(str(t3), "13:47:00+01:00")
|
|
|
|
self.assertEqual(str(t4), "00:00:00.000040")
|
|
|
|
self.assertEqual(str(t5), "00:00:00.000040+00:00")
|
|
|
|
|
|
|
|
self.assertEqual(t1.isoformat(), "07:47:00-05:00")
|
|
|
|
self.assertEqual(t2.isoformat(), "12:47:00+00:00")
|
|
|
|
self.assertEqual(t3.isoformat(), "13:47:00+01:00")
|
|
|
|
self.assertEqual(t4.isoformat(), "00:00:00.000040")
|
|
|
|
self.assertEqual(t5.isoformat(), "00:00:00.000040+00:00")
|
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
d = 'datetime.time'
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(repr(t1), d + "(7, 47, tzinfo=est)")
|
|
|
|
self.assertEqual(repr(t2), d + "(12, 47, tzinfo=utc)")
|
|
|
|
self.assertEqual(repr(t3), d + "(13, 47, tzinfo=met)")
|
|
|
|
self.assertEqual(repr(t4), d + "(0, 0, 0, 40)")
|
|
|
|
self.assertEqual(repr(t5), d + "(0, 0, 0, 40, tzinfo=utc)")
|
|
|
|
|
|
|
|
self.assertEqual(t1.strftime("%H:%M:%S %%Z=%Z %%z=%z"),
|
|
|
|
"07:47:00 %Z=EST %z=-0500")
|
|
|
|
self.assertEqual(t2.strftime("%H:%M:%S %Z %z"), "12:47:00 UTC +0000")
|
|
|
|
self.assertEqual(t3.strftime("%H:%M:%S %Z %z"), "13:47:00 MET +0100")
|
|
|
|
|
|
|
|
yuck = FixedOffset(-1439, "%z %Z %%z%%Z")
|
2003-01-08 16:40:01 -04:00
|
|
|
t1 = time(23, 59, tzinfo=yuck)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(t1.strftime("%H:%M %%Z='%Z' %%z='%z'"),
|
|
|
|
"23:59 %Z='%z %Z %%z%%Z' %z='-2359'")
|
|
|
|
|
2002-12-21 13:44:07 -04:00
|
|
|
# Check that an invalid tzname result raises an exception.
|
|
|
|
class Badtzname(tzinfo):
|
|
|
|
def tzname(self, dt): return 42
|
2003-01-08 16:40:01 -04:00
|
|
|
t = time(2, 3, 4, tzinfo=Badtzname())
|
2002-12-21 13:44:07 -04:00
|
|
|
self.assertEqual(t.strftime("%H:%M:%S"), "02:03:04")
|
|
|
|
self.assertRaises(TypeError, t.strftime, "%Z")
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_hash_edge_cases(self):
|
|
|
|
# Offsets that overflow a basic time.
|
|
|
|
t1 = self.theclass(0, 1, 2, 3, tzinfo=FixedOffset(1439, ""))
|
|
|
|
t2 = self.theclass(0, 0, 2, 3, tzinfo=FixedOffset(1438, ""))
|
|
|
|
self.assertEqual(hash(t1), hash(t2))
|
|
|
|
|
|
|
|
t1 = self.theclass(23, 58, 6, 100, tzinfo=FixedOffset(-1000, ""))
|
|
|
|
t2 = self.theclass(23, 48, 6, 100, tzinfo=FixedOffset(-1010, ""))
|
|
|
|
self.assertEqual(hash(t1), hash(t2))
|
|
|
|
|
|
|
|
def test_pickling(self):
|
|
|
|
# Try one without a tzinfo.
|
|
|
|
args = 20, 59, 16, 64**2
|
|
|
|
orig = self.theclass(*args)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
# Try one with a tzinfo.
|
2002-12-21 01:04:42 -04:00
|
|
|
tinfo = PicklableFixedOffset(-300, 'cookie')
|
2002-12-16 16:18:38 -04:00
|
|
|
orig = self.theclass(5, 6, 7, tzinfo=tinfo)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
|
|
|
self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset))
|
|
|
|
self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
|
|
|
|
self.assertEqual(derived.tzname(), 'cookie')
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_more_bool(self):
|
|
|
|
# Test cases with non-None tzinfo.
|
|
|
|
cls = self.theclass
|
|
|
|
|
|
|
|
t = cls(0, tzinfo=FixedOffset(-300, ""))
|
|
|
|
self.failUnless(t)
|
|
|
|
|
|
|
|
t = cls(5, tzinfo=FixedOffset(-300, ""))
|
|
|
|
self.failUnless(t)
|
|
|
|
|
|
|
|
t = cls(5, tzinfo=FixedOffset(300, ""))
|
|
|
|
self.failUnless(not t)
|
|
|
|
|
|
|
|
t = cls(23, 59, tzinfo=FixedOffset(23*60 + 59, ""))
|
|
|
|
self.failUnless(not t)
|
|
|
|
|
|
|
|
# Mostly ensuring this doesn't overflow internally.
|
|
|
|
t = cls(0, tzinfo=FixedOffset(23*60 + 59, ""))
|
|
|
|
self.failUnless(t)
|
|
|
|
|
|
|
|
# But this should yield a value error -- the utcoffset is bogus.
|
|
|
|
t = cls(0, tzinfo=FixedOffset(24*60, ""))
|
|
|
|
self.assertRaises(ValueError, lambda: bool(t))
|
|
|
|
|
|
|
|
# Likewise.
|
|
|
|
t = cls(0, tzinfo=FixedOffset(-24*60, ""))
|
|
|
|
self.assertRaises(ValueError, lambda: bool(t))
|
|
|
|
|
2002-12-24 01:41:27 -04:00
|
|
|
def test_replace(self):
|
|
|
|
cls = self.theclass
|
|
|
|
z100 = FixedOffset(100, "+100")
|
|
|
|
zm200 = FixedOffset(timedelta(minutes=-200), "-200")
|
|
|
|
args = [1, 2, 3, 4, z100]
|
|
|
|
base = cls(*args)
|
|
|
|
self.assertEqual(base, base.replace())
|
|
|
|
|
|
|
|
i = 0
|
|
|
|
for name, newval in (("hour", 5),
|
|
|
|
("minute", 6),
|
|
|
|
("second", 7),
|
|
|
|
("microsecond", 8),
|
|
|
|
("tzinfo", zm200)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = newval
|
|
|
|
expected = cls(*newargs)
|
|
|
|
got = base.replace(**{name: newval})
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
i += 1
|
|
|
|
|
|
|
|
# Ensure we can get rid of a tzinfo.
|
|
|
|
self.assertEqual(base.tzname(), "+100")
|
|
|
|
base2 = base.replace(tzinfo=None)
|
|
|
|
self.failUnless(base2.tzinfo is None)
|
|
|
|
self.failUnless(base2.tzname() is None)
|
|
|
|
|
|
|
|
# Ensure we can add one.
|
|
|
|
base3 = base2.replace(tzinfo=z100)
|
|
|
|
self.assertEqual(base, base3)
|
|
|
|
self.failUnless(base.tzinfo is base3.tzinfo)
|
|
|
|
|
|
|
|
# Out of bounds.
|
|
|
|
base = cls(1)
|
|
|
|
self.assertRaises(ValueError, base.replace, hour=24)
|
|
|
|
self.assertRaises(ValueError, base.replace, minute=-1)
|
|
|
|
self.assertRaises(ValueError, base.replace, second=100)
|
|
|
|
self.assertRaises(ValueError, base.replace, microsecond=1000000)
|
|
|
|
|
2002-12-26 20:41:11 -04:00
|
|
|
def test_mixed_compare(self):
|
|
|
|
t1 = time(1, 2, 3)
|
2003-01-08 16:40:01 -04:00
|
|
|
t2 = time(1, 2, 3)
|
2002-12-26 20:41:11 -04:00
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
t2 = t2.replace(tzinfo=None)
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
t2 = t2.replace(tzinfo=FixedOffset(None, ""))
|
|
|
|
self.assertEqual(t1, t2)
|
2003-02-07 23:46:31 -04:00
|
|
|
t2 = t2.replace(tzinfo=FixedOffset(0, ""))
|
|
|
|
self.assertRaises(TypeError, lambda: t1 == t2)
|
2002-12-26 20:41:11 -04:00
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
# In time w/ identical tzinfo objects, utcoffset is ignored.
|
2002-12-26 20:41:11 -04:00
|
|
|
class Varies(tzinfo):
|
|
|
|
def __init__(self):
|
2003-01-02 17:28:08 -04:00
|
|
|
self.offset = timedelta(minutes=22)
|
2002-12-26 20:41:11 -04:00
|
|
|
def utcoffset(self, t):
|
2003-01-02 17:28:08 -04:00
|
|
|
self.offset += timedelta(minutes=1)
|
2002-12-26 20:41:11 -04:00
|
|
|
return self.offset
|
|
|
|
|
|
|
|
v = Varies()
|
|
|
|
t1 = t2.replace(tzinfo=v)
|
|
|
|
t2 = t2.replace(tzinfo=v)
|
|
|
|
self.assertEqual(t1.utcoffset(), timedelta(minutes=23))
|
|
|
|
self.assertEqual(t2.utcoffset(), timedelta(minutes=24))
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
|
|
|
|
# But if they're not identical, it isn't ignored.
|
|
|
|
t2 = t2.replace(tzinfo=Varies())
|
|
|
|
self.failUnless(t1 < t2) # t1's offset counter still going up
|
|
|
|
|
2003-05-17 02:55:19 -03:00
|
|
|
def test_subclass_timetz(self):
|
|
|
|
|
|
|
|
class C(self.theclass):
|
|
|
|
theAnswer = 42
|
|
|
|
|
|
|
|
def __new__(cls, *args, **kws):
|
|
|
|
temp = kws.copy()
|
|
|
|
extra = temp.pop('extra')
|
|
|
|
result = self.theclass.__new__(cls, *args, **temp)
|
|
|
|
result.extra = extra
|
|
|
|
return result
|
|
|
|
|
|
|
|
def newmeth(self, start):
|
|
|
|
return start + self.hour + self.second
|
|
|
|
|
|
|
|
args = 4, 5, 6, 500, FixedOffset(-300, "EST", 1)
|
|
|
|
|
|
|
|
dt1 = self.theclass(*args)
|
|
|
|
dt2 = C(*args, **{'extra': 7})
|
|
|
|
|
|
|
|
self.assertEqual(dt2.__class__, C)
|
|
|
|
self.assertEqual(dt2.theAnswer, 42)
|
|
|
|
self.assertEqual(dt2.extra, 7)
|
|
|
|
self.assertEqual(dt1.utcoffset(), dt2.utcoffset())
|
|
|
|
self.assertEqual(dt2.newmeth(-7), dt1.hour + dt1.second - 7)
|
|
|
|
|
2002-12-26 01:01:19 -04:00
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
# Testing datetime objects with a non-None tzinfo.
|
|
|
|
|
2002-12-21 23:43:39 -04:00
|
|
|
class TestDateTimeTZ(TestDateTime, TZInfoBase):
|
2003-01-08 16:40:01 -04:00
|
|
|
theclass = datetime
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_trivial(self):
|
|
|
|
dt = self.theclass(1, 2, 3, 4, 5, 6, 7)
|
|
|
|
self.assertEqual(dt.year, 1)
|
|
|
|
self.assertEqual(dt.month, 2)
|
|
|
|
self.assertEqual(dt.day, 3)
|
|
|
|
self.assertEqual(dt.hour, 4)
|
|
|
|
self.assertEqual(dt.minute, 5)
|
|
|
|
self.assertEqual(dt.second, 6)
|
|
|
|
self.assertEqual(dt.microsecond, 7)
|
|
|
|
self.assertEqual(dt.tzinfo, None)
|
|
|
|
|
|
|
|
def test_even_more_compare(self):
|
|
|
|
# The test_compare() and test_more_compare() inherited from TestDate
|
|
|
|
# and TestDateTime covered non-tzinfo cases.
|
|
|
|
|
|
|
|
# Smallest possible after UTC adjustment.
|
|
|
|
t1 = self.theclass(1, 1, 1, tzinfo=FixedOffset(1439, ""))
|
|
|
|
# Largest possible after UTC adjustment.
|
|
|
|
t2 = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999999,
|
|
|
|
tzinfo=FixedOffset(-1439, ""))
|
|
|
|
|
|
|
|
# Make sure those compare correctly, and w/o overflow.
|
|
|
|
self.failUnless(t1 < t2)
|
|
|
|
self.failUnless(t1 != t2)
|
|
|
|
self.failUnless(t2 > t1)
|
|
|
|
|
|
|
|
self.failUnless(t1 == t1)
|
|
|
|
self.failUnless(t2 == t2)
|
|
|
|
|
|
|
|
# Equal afer adjustment.
|
|
|
|
t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""))
|
|
|
|
t2 = self.theclass(2, 1, 1, 3, 13, tzinfo=FixedOffset(3*60+13+2, ""))
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
|
|
|
|
# Change t1 not to subtract a minute, and t1 should be larger.
|
|
|
|
t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(0, ""))
|
|
|
|
self.failUnless(t1 > t2)
|
|
|
|
|
|
|
|
# Change t1 to subtract 2 minutes, and t1 should be smaller.
|
|
|
|
t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(2, ""))
|
|
|
|
self.failUnless(t1 < t2)
|
|
|
|
|
|
|
|
# Back to the original t1, but make seconds resolve it.
|
|
|
|
t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""),
|
|
|
|
second=1)
|
|
|
|
self.failUnless(t1 > t2)
|
|
|
|
|
|
|
|
# Likewise, but make microseconds resolve it.
|
|
|
|
t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""),
|
|
|
|
microsecond=1)
|
|
|
|
self.failUnless(t1 > t2)
|
|
|
|
|
|
|
|
# Make t2 naive and it should fail.
|
|
|
|
t2 = self.theclass.min
|
|
|
|
self.assertRaises(TypeError, lambda: t1 == t2)
|
|
|
|
self.assertEqual(t2, t2)
|
|
|
|
|
|
|
|
# It's also naive if it has tzinfo but tzinfo.utcoffset() is None.
|
|
|
|
class Naive(tzinfo):
|
|
|
|
def utcoffset(self, dt): return None
|
|
|
|
t2 = self.theclass(5, 6, 7, tzinfo=Naive())
|
|
|
|
self.assertRaises(TypeError, lambda: t1 == t2)
|
|
|
|
self.assertEqual(t2, t2)
|
|
|
|
|
|
|
|
# OTOH, it's OK to compare two of these mixing the two ways of being
|
|
|
|
# naive.
|
|
|
|
t1 = self.theclass(5, 6, 7)
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
|
|
|
|
# Try a bogus uctoffset.
|
|
|
|
class Bogus(tzinfo):
|
2003-01-02 17:28:08 -04:00
|
|
|
def utcoffset(self, dt):
|
|
|
|
return timedelta(minutes=1440) # out of bounds
|
2002-12-16 16:18:38 -04:00
|
|
|
t1 = self.theclass(2, 2, 2, tzinfo=Bogus())
|
|
|
|
t2 = self.theclass(2, 2, 2, tzinfo=FixedOffset(0, ""))
|
2002-12-26 20:41:11 -04:00
|
|
|
self.assertRaises(ValueError, lambda: t1 == t2)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_pickling(self):
|
|
|
|
# Try one without a tzinfo.
|
|
|
|
args = 6, 7, 23, 20, 59, 1, 64**2
|
|
|
|
orig = self.theclass(*args)
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
# Try one with a tzinfo.
|
2002-12-21 01:04:42 -04:00
|
|
|
tinfo = PicklableFixedOffset(-300, 'cookie')
|
2002-12-16 16:18:38 -04:00
|
|
|
orig = self.theclass(*args, **{'tzinfo': tinfo})
|
2003-01-10 23:39:11 -04:00
|
|
|
derived = self.theclass(1, 1, 1, tzinfo=FixedOffset(0, "", 0))
|
2003-01-30 18:06:23 -04:00
|
|
|
for pickler, unpickler, proto in pickle_choices:
|
2003-01-31 17:55:33 -04:00
|
|
|
green = pickler.dumps(orig, proto)
|
|
|
|
derived = unpickler.loads(green)
|
|
|
|
self.assertEqual(orig, derived)
|
|
|
|
self.failUnless(isinstance(derived.tzinfo,
|
|
|
|
PicklableFixedOffset))
|
|
|
|
self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
|
|
|
|
self.assertEqual(derived.tzname(), 'cookie')
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_extreme_hashes(self):
|
|
|
|
# If an attempt is made to hash these via subtracting the offset
|
|
|
|
# then hashing a datetime object, OverflowError results. The
|
|
|
|
# Python implementation used to blow up here.
|
|
|
|
t = self.theclass(1, 1, 1, tzinfo=FixedOffset(1439, ""))
|
|
|
|
hash(t)
|
|
|
|
t = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999999,
|
|
|
|
tzinfo=FixedOffset(-1439, ""))
|
|
|
|
hash(t)
|
|
|
|
|
|
|
|
# OTOH, an OOB offset should blow up.
|
|
|
|
t = self.theclass(5, 5, 5, tzinfo=FixedOffset(-1440, ""))
|
|
|
|
self.assertRaises(ValueError, hash, t)
|
|
|
|
|
|
|
|
def test_zones(self):
|
|
|
|
est = FixedOffset(-300, "EST")
|
|
|
|
utc = FixedOffset(0, "UTC")
|
|
|
|
met = FixedOffset(60, "MET")
|
2003-01-08 16:40:01 -04:00
|
|
|
t1 = datetime(2002, 3, 19, 7, 47, tzinfo=est)
|
|
|
|
t2 = datetime(2002, 3, 19, 12, 47, tzinfo=utc)
|
|
|
|
t3 = datetime(2002, 3, 19, 13, 47, tzinfo=met)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(t1.tzinfo, est)
|
|
|
|
self.assertEqual(t2.tzinfo, utc)
|
|
|
|
self.assertEqual(t3.tzinfo, met)
|
2002-12-21 23:43:39 -04:00
|
|
|
self.assertEqual(t1.utcoffset(), timedelta(minutes=-300))
|
|
|
|
self.assertEqual(t2.utcoffset(), timedelta(minutes=0))
|
|
|
|
self.assertEqual(t3.utcoffset(), timedelta(minutes=60))
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(t1.tzname(), "EST")
|
|
|
|
self.assertEqual(t2.tzname(), "UTC")
|
|
|
|
self.assertEqual(t3.tzname(), "MET")
|
|
|
|
self.assertEqual(hash(t1), hash(t2))
|
|
|
|
self.assertEqual(hash(t1), hash(t3))
|
|
|
|
self.assertEqual(hash(t2), hash(t3))
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
self.assertEqual(t1, t3)
|
|
|
|
self.assertEqual(t2, t3)
|
|
|
|
self.assertEqual(str(t1), "2002-03-19 07:47:00-05:00")
|
|
|
|
self.assertEqual(str(t2), "2002-03-19 12:47:00+00:00")
|
|
|
|
self.assertEqual(str(t3), "2002-03-19 13:47:00+01:00")
|
2003-01-08 16:40:01 -04:00
|
|
|
d = 'datetime.datetime(2002, 3, 19, '
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(repr(t1), d + "7, 47, tzinfo=est)")
|
|
|
|
self.assertEqual(repr(t2), d + "12, 47, tzinfo=utc)")
|
|
|
|
self.assertEqual(repr(t3), d + "13, 47, tzinfo=met)")
|
|
|
|
|
|
|
|
def test_combine(self):
|
|
|
|
met = FixedOffset(60, "MET")
|
|
|
|
d = date(2002, 3, 4)
|
2003-01-08 16:40:01 -04:00
|
|
|
tz = time(18, 45, 3, 1234, tzinfo=met)
|
|
|
|
dt = datetime.combine(d, tz)
|
|
|
|
self.assertEqual(dt, datetime(2002, 3, 4, 18, 45, 3, 1234,
|
2002-12-16 16:18:38 -04:00
|
|
|
tzinfo=met))
|
|
|
|
|
|
|
|
def test_extract(self):
|
|
|
|
met = FixedOffset(60, "MET")
|
|
|
|
dt = self.theclass(2002, 3, 4, 18, 45, 3, 1234, tzinfo=met)
|
|
|
|
self.assertEqual(dt.date(), date(2002, 3, 4))
|
|
|
|
self.assertEqual(dt.time(), time(18, 45, 3, 1234))
|
2003-01-08 16:40:01 -04:00
|
|
|
self.assertEqual(dt.timetz(), time(18, 45, 3, 1234, tzinfo=met))
|
2002-12-16 16:18:38 -04:00
|
|
|
|
|
|
|
def test_tz_aware_arithmetic(self):
|
|
|
|
import random
|
|
|
|
|
|
|
|
now = self.theclass.now()
|
|
|
|
tz55 = FixedOffset(-330, "west 5:30")
|
2003-01-08 16:40:01 -04:00
|
|
|
timeaware = now.time().replace(tzinfo=tz55)
|
2002-12-16 16:18:38 -04:00
|
|
|
nowaware = self.theclass.combine(now.date(), timeaware)
|
|
|
|
self.failUnless(nowaware.tzinfo is tz55)
|
|
|
|
self.assertEqual(nowaware.timetz(), timeaware)
|
|
|
|
|
|
|
|
# Can't mix aware and non-aware.
|
|
|
|
self.assertRaises(TypeError, lambda: now - nowaware)
|
|
|
|
self.assertRaises(TypeError, lambda: nowaware - now)
|
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
# And adding datetime's doesn't make sense, aware or not.
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertRaises(TypeError, lambda: now + nowaware)
|
|
|
|
self.assertRaises(TypeError, lambda: nowaware + now)
|
|
|
|
self.assertRaises(TypeError, lambda: nowaware + nowaware)
|
|
|
|
|
|
|
|
# Subtracting should yield 0.
|
|
|
|
self.assertEqual(now - now, timedelta(0))
|
|
|
|
self.assertEqual(nowaware - nowaware, timedelta(0))
|
|
|
|
|
|
|
|
# Adding a delta should preserve tzinfo.
|
|
|
|
delta = timedelta(weeks=1, minutes=12, microseconds=5678)
|
|
|
|
nowawareplus = nowaware + delta
|
|
|
|
self.failUnless(nowaware.tzinfo is tz55)
|
|
|
|
nowawareplus2 = delta + nowaware
|
|
|
|
self.failUnless(nowawareplus2.tzinfo is tz55)
|
|
|
|
self.assertEqual(nowawareplus, nowawareplus2)
|
|
|
|
|
|
|
|
# that - delta should be what we started with, and that - what we
|
|
|
|
# started with should be delta.
|
|
|
|
diff = nowawareplus - delta
|
|
|
|
self.failUnless(diff.tzinfo is tz55)
|
|
|
|
self.assertEqual(nowaware, diff)
|
|
|
|
self.assertRaises(TypeError, lambda: delta - nowawareplus)
|
|
|
|
self.assertEqual(nowawareplus - nowaware, delta)
|
|
|
|
|
|
|
|
# Make up a random timezone.
|
|
|
|
tzr = FixedOffset(random.randrange(-1439, 1440), "randomtimezone")
|
2002-12-26 01:01:19 -04:00
|
|
|
# Attach it to nowawareplus.
|
|
|
|
nowawareplus = nowawareplus.replace(tzinfo=tzr)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(nowawareplus.tzinfo is tzr)
|
|
|
|
# Make sure the difference takes the timezone adjustments into account.
|
|
|
|
got = nowaware - nowawareplus
|
|
|
|
# Expected: (nowaware base - nowaware offset) -
|
|
|
|
# (nowawareplus base - nowawareplus offset) =
|
|
|
|
# (nowaware base - nowawareplus base) +
|
|
|
|
# (nowawareplus offset - nowaware offset) =
|
|
|
|
# -delta + nowawareplus offset - nowaware offset
|
2002-12-21 23:43:39 -04:00
|
|
|
expected = nowawareplus.utcoffset() - nowaware.utcoffset() - delta
|
2002-12-16 16:18:38 -04:00
|
|
|
self.assertEqual(got, expected)
|
|
|
|
|
|
|
|
# Try max possible difference.
|
|
|
|
min = self.theclass(1, 1, 1, tzinfo=FixedOffset(1439, "min"))
|
|
|
|
max = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999999,
|
|
|
|
tzinfo=FixedOffset(-1439, "max"))
|
|
|
|
maxdiff = max - min
|
|
|
|
self.assertEqual(maxdiff, self.theclass.max - self.theclass.min +
|
|
|
|
timedelta(minutes=2*1439))
|
|
|
|
|
|
|
|
def test_tzinfo_now(self):
|
|
|
|
meth = self.theclass.now
|
|
|
|
# Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
|
|
|
|
base = meth()
|
|
|
|
# Try with and without naming the keyword.
|
|
|
|
off42 = FixedOffset(42, "42")
|
|
|
|
another = meth(off42)
|
2003-01-23 15:58:02 -04:00
|
|
|
again = meth(tz=off42)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(another.tzinfo is again.tzinfo)
|
2002-12-21 23:43:39 -04:00
|
|
|
self.assertEqual(another.utcoffset(), timedelta(minutes=42))
|
2002-12-16 16:18:38 -04:00
|
|
|
# Bad argument with and w/o naming the keyword.
|
|
|
|
self.assertRaises(TypeError, meth, 16)
|
|
|
|
self.assertRaises(TypeError, meth, tzinfo=16)
|
|
|
|
# Bad keyword name.
|
|
|
|
self.assertRaises(TypeError, meth, tinfo=off42)
|
|
|
|
# Too many args.
|
|
|
|
self.assertRaises(TypeError, meth, off42, off42)
|
|
|
|
|
2003-01-23 15:58:02 -04:00
|
|
|
# We don't know which time zone we're in, and don't have a tzinfo
|
|
|
|
# class to represent it, so seeing whether a tz argument actually
|
|
|
|
# does a conversion is tricky.
|
|
|
|
weirdtz = FixedOffset(timedelta(hours=15, minutes=58), "weirdtz", 0)
|
|
|
|
utc = FixedOffset(0, "utc", 0)
|
|
|
|
for dummy in range(3):
|
|
|
|
now = datetime.now(weirdtz)
|
|
|
|
self.failUnless(now.tzinfo is weirdtz)
|
|
|
|
utcnow = datetime.utcnow().replace(tzinfo=utc)
|
|
|
|
now2 = utcnow.astimezone(weirdtz)
|
|
|
|
if abs(now - now2) < timedelta(seconds=30):
|
|
|
|
break
|
|
|
|
# Else the code is broken, or more than 30 seconds passed between
|
|
|
|
# calls; assuming the latter, just try again.
|
|
|
|
else:
|
|
|
|
# Three strikes and we're out.
|
|
|
|
self.fail("utcnow(), now(tz), or astimezone() may be broken")
|
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_tzinfo_fromtimestamp(self):
|
|
|
|
import time
|
|
|
|
meth = self.theclass.fromtimestamp
|
|
|
|
ts = time.time()
|
|
|
|
# Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
|
|
|
|
base = meth(ts)
|
|
|
|
# Try with and without naming the keyword.
|
|
|
|
off42 = FixedOffset(42, "42")
|
|
|
|
another = meth(ts, off42)
|
2003-01-23 16:53:10 -04:00
|
|
|
again = meth(ts, tz=off42)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.failUnless(another.tzinfo is again.tzinfo)
|
2002-12-21 23:43:39 -04:00
|
|
|
self.assertEqual(another.utcoffset(), timedelta(minutes=42))
|
2002-12-16 16:18:38 -04:00
|
|
|
# Bad argument with and w/o naming the keyword.
|
|
|
|
self.assertRaises(TypeError, meth, ts, 16)
|
|
|
|
self.assertRaises(TypeError, meth, ts, tzinfo=16)
|
|
|
|
# Bad keyword name.
|
|
|
|
self.assertRaises(TypeError, meth, ts, tinfo=off42)
|
|
|
|
# Too many args.
|
|
|
|
self.assertRaises(TypeError, meth, ts, off42, off42)
|
|
|
|
# Too few args.
|
|
|
|
self.assertRaises(TypeError, meth)
|
|
|
|
|
2003-01-23 16:53:10 -04:00
|
|
|
# Try to make sure tz= actually does some conversion.
|
2003-02-06 12:42:14 -04:00
|
|
|
timestamp = 1000000000
|
|
|
|
utcdatetime = datetime.utcfromtimestamp(timestamp)
|
|
|
|
# In POSIX (epoch 1970), that's 2001-09-09 01:46:40 UTC, give or take.
|
|
|
|
# But on some flavor of Mac, it's nowhere near that. So we can't have
|
|
|
|
# any idea here what time that actually is, we can only test that
|
|
|
|
# relative changes match.
|
|
|
|
utcoffset = timedelta(hours=-15, minutes=39) # arbitrary, but not zero
|
|
|
|
tz = FixedOffset(utcoffset, "tz", 0)
|
|
|
|
expected = utcdatetime + utcoffset
|
|
|
|
got = datetime.fromtimestamp(timestamp, tz)
|
|
|
|
self.assertEqual(expected, got.replace(tzinfo=None))
|
2003-01-23 16:53:10 -04:00
|
|
|
|
2002-12-16 16:18:38 -04:00
|
|
|
def test_tzinfo_utcnow(self):
|
|
|
|
meth = self.theclass.utcnow
|
|
|
|
# Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
|
|
|
|
base = meth()
|
|
|
|
# Try with and without naming the keyword; for whatever reason,
|
|
|
|
# utcnow() doesn't accept a tzinfo argument.
|
|
|
|
off42 = FixedOffset(42, "42")
|
|
|
|
self.assertRaises(TypeError, meth, off42)
|
|
|
|
self.assertRaises(TypeError, meth, tzinfo=off42)
|
|
|
|
|
|
|
|
def test_tzinfo_utcfromtimestamp(self):
|
|
|
|
import time
|
|
|
|
meth = self.theclass.utcfromtimestamp
|
|
|
|
ts = time.time()
|
|
|
|
# Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
|
|
|
|
base = meth(ts)
|
|
|
|
# Try with and without naming the keyword; for whatever reason,
|
|
|
|
# utcfromtimestamp() doesn't accept a tzinfo argument.
|
|
|
|
off42 = FixedOffset(42, "42")
|
|
|
|
self.assertRaises(TypeError, meth, ts, off42)
|
|
|
|
self.assertRaises(TypeError, meth, ts, tzinfo=off42)
|
|
|
|
|
|
|
|
def test_tzinfo_timetuple(self):
|
2003-01-08 16:40:01 -04:00
|
|
|
# TestDateTime tested most of this. datetime adds a twist to the
|
2002-12-16 16:18:38 -04:00
|
|
|
# DST flag.
|
|
|
|
class DST(tzinfo):
|
|
|
|
def __init__(self, dstvalue):
|
2003-01-02 17:28:08 -04:00
|
|
|
if isinstance(dstvalue, int):
|
|
|
|
dstvalue = timedelta(minutes=dstvalue)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.dstvalue = dstvalue
|
|
|
|
def dst(self, dt):
|
|
|
|
return self.dstvalue
|
|
|
|
|
|
|
|
cls = self.theclass
|
|
|
|
for dstvalue, flag in (-33, 1), (33, 1), (0, 0), (None, -1):
|
|
|
|
d = cls(1, 1, 1, 10, 20, 30, 40, tzinfo=DST(dstvalue))
|
|
|
|
t = d.timetuple()
|
|
|
|
self.assertEqual(1, t.tm_year)
|
|
|
|
self.assertEqual(1, t.tm_mon)
|
|
|
|
self.assertEqual(1, t.tm_mday)
|
|
|
|
self.assertEqual(10, t.tm_hour)
|
|
|
|
self.assertEqual(20, t.tm_min)
|
|
|
|
self.assertEqual(30, t.tm_sec)
|
|
|
|
self.assertEqual(0, t.tm_wday)
|
|
|
|
self.assertEqual(1, t.tm_yday)
|
|
|
|
self.assertEqual(flag, t.tm_isdst)
|
|
|
|
|
|
|
|
# dst() returns wrong type.
|
|
|
|
self.assertRaises(TypeError, cls(1, 1, 1, tzinfo=DST("x")).timetuple)
|
|
|
|
|
|
|
|
# dst() at the edge.
|
|
|
|
self.assertEqual(cls(1,1,1, tzinfo=DST(1439)).timetuple().tm_isdst, 1)
|
|
|
|
self.assertEqual(cls(1,1,1, tzinfo=DST(-1439)).timetuple().tm_isdst, 1)
|
|
|
|
|
|
|
|
# dst() out of range.
|
|
|
|
self.assertRaises(ValueError, cls(1,1,1, tzinfo=DST(1440)).timetuple)
|
|
|
|
self.assertRaises(ValueError, cls(1,1,1, tzinfo=DST(-1440)).timetuple)
|
|
|
|
|
|
|
|
def test_utctimetuple(self):
|
|
|
|
class DST(tzinfo):
|
|
|
|
def __init__(self, dstvalue):
|
2003-01-02 17:28:08 -04:00
|
|
|
if isinstance(dstvalue, int):
|
|
|
|
dstvalue = timedelta(minutes=dstvalue)
|
2002-12-16 16:18:38 -04:00
|
|
|
self.dstvalue = dstvalue
|
|
|
|
def dst(self, dt):
|
|
|
|
return self.dstvalue
|
|
|
|
|
|
|
|
cls = self.theclass
|
|
|
|
# This can't work: DST didn't implement utcoffset.
|
|
|
|
self.assertRaises(NotImplementedError,
|
|
|
|
cls(1, 1, 1, tzinfo=DST(0)).utcoffset)
|
|
|
|
|
|
|
|
class UOFS(DST):
|
|
|
|
def __init__(self, uofs, dofs=None):
|
|
|
|
DST.__init__(self, dofs)
|
2003-01-02 17:28:08 -04:00
|
|
|
self.uofs = timedelta(minutes=uofs)
|
2002-12-16 16:18:38 -04:00
|
|
|
def utcoffset(self, dt):
|
|
|
|
return self.uofs
|
|
|
|
|
|
|
|
# Ensure tm_isdst is 0 regardless of what dst() says: DST is never
|
|
|
|
# in effect for a UTC time.
|
|
|
|
for dstvalue in -33, 33, 0, None:
|
|
|
|
d = cls(1, 2, 3, 10, 20, 30, 40, tzinfo=UOFS(-53, dstvalue))
|
|
|
|
t = d.utctimetuple()
|
|
|
|
self.assertEqual(d.year, t.tm_year)
|
|
|
|
self.assertEqual(d.month, t.tm_mon)
|
|
|
|
self.assertEqual(d.day, t.tm_mday)
|
|
|
|
self.assertEqual(11, t.tm_hour) # 20mm + 53mm = 1hn + 13mm
|
|
|
|
self.assertEqual(13, t.tm_min)
|
|
|
|
self.assertEqual(d.second, t.tm_sec)
|
|
|
|
self.assertEqual(d.weekday(), t.tm_wday)
|
|
|
|
self.assertEqual(d.toordinal() - date(1, 1, 1).toordinal() + 1,
|
|
|
|
t.tm_yday)
|
|
|
|
self.assertEqual(0, t.tm_isdst)
|
|
|
|
|
|
|
|
# At the edges, UTC adjustment can normalize into years out-of-range
|
|
|
|
# for a datetime object. Ensure that a correct timetuple is
|
|
|
|
# created anyway.
|
|
|
|
tiny = cls(MINYEAR, 1, 1, 0, 0, 37, tzinfo=UOFS(1439))
|
|
|
|
# That goes back 1 minute less than a full day.
|
|
|
|
t = tiny.utctimetuple()
|
|
|
|
self.assertEqual(t.tm_year, MINYEAR-1)
|
|
|
|
self.assertEqual(t.tm_mon, 12)
|
|
|
|
self.assertEqual(t.tm_mday, 31)
|
|
|
|
self.assertEqual(t.tm_hour, 0)
|
|
|
|
self.assertEqual(t.tm_min, 1)
|
|
|
|
self.assertEqual(t.tm_sec, 37)
|
|
|
|
self.assertEqual(t.tm_yday, 366) # "year 0" is a leap year
|
|
|
|
self.assertEqual(t.tm_isdst, 0)
|
|
|
|
|
|
|
|
huge = cls(MAXYEAR, 12, 31, 23, 59, 37, 999999, tzinfo=UOFS(-1439))
|
|
|
|
# That goes forward 1 minute less than a full day.
|
|
|
|
t = huge.utctimetuple()
|
|
|
|
self.assertEqual(t.tm_year, MAXYEAR+1)
|
|
|
|
self.assertEqual(t.tm_mon, 1)
|
|
|
|
self.assertEqual(t.tm_mday, 1)
|
|
|
|
self.assertEqual(t.tm_hour, 23)
|
|
|
|
self.assertEqual(t.tm_min, 58)
|
|
|
|
self.assertEqual(t.tm_sec, 37)
|
|
|
|
self.assertEqual(t.tm_yday, 1)
|
|
|
|
self.assertEqual(t.tm_isdst, 0)
|
|
|
|
|
|
|
|
def test_tzinfo_isoformat(self):
|
|
|
|
zero = FixedOffset(0, "+00:00")
|
|
|
|
plus = FixedOffset(220, "+03:40")
|
|
|
|
minus = FixedOffset(-231, "-03:51")
|
|
|
|
unknown = FixedOffset(None, "")
|
|
|
|
|
|
|
|
cls = self.theclass
|
|
|
|
datestr = '0001-02-03'
|
|
|
|
for ofs in None, zero, plus, minus, unknown:
|
2002-12-24 14:31:27 -04:00
|
|
|
for us in 0, 987001:
|
2002-12-16 16:18:38 -04:00
|
|
|
d = cls(1, 2, 3, 4, 5, 59, us, tzinfo=ofs)
|
|
|
|
timestr = '04:05:59' + (us and '.987001' or '')
|
|
|
|
ofsstr = ofs is not None and d.tzname() or ''
|
|
|
|
tailstr = timestr + ofsstr
|
|
|
|
iso = d.isoformat()
|
|
|
|
self.assertEqual(iso, datestr + 'T' + tailstr)
|
|
|
|
self.assertEqual(iso, d.isoformat('T'))
|
|
|
|
self.assertEqual(d.isoformat('k'), datestr + 'k' + tailstr)
|
|
|
|
self.assertEqual(str(d), datestr + ' ' + tailstr)
|
|
|
|
|
2002-12-24 01:41:27 -04:00
|
|
|
def test_replace(self):
|
|
|
|
cls = self.theclass
|
|
|
|
z100 = FixedOffset(100, "+100")
|
|
|
|
zm200 = FixedOffset(timedelta(minutes=-200), "-200")
|
|
|
|
args = [1, 2, 3, 4, 5, 6, 7, z100]
|
|
|
|
base = cls(*args)
|
|
|
|
self.assertEqual(base, base.replace())
|
|
|
|
|
|
|
|
i = 0
|
|
|
|
for name, newval in (("year", 2),
|
|
|
|
("month", 3),
|
|
|
|
("day", 4),
|
|
|
|
("hour", 5),
|
|
|
|
("minute", 6),
|
|
|
|
("second", 7),
|
|
|
|
("microsecond", 8),
|
|
|
|
("tzinfo", zm200)):
|
|
|
|
newargs = args[:]
|
|
|
|
newargs[i] = newval
|
|
|
|
expected = cls(*newargs)
|
|
|
|
got = base.replace(**{name: newval})
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
i += 1
|
|
|
|
|
|
|
|
# Ensure we can get rid of a tzinfo.
|
|
|
|
self.assertEqual(base.tzname(), "+100")
|
|
|
|
base2 = base.replace(tzinfo=None)
|
|
|
|
self.failUnless(base2.tzinfo is None)
|
|
|
|
self.failUnless(base2.tzname() is None)
|
|
|
|
|
|
|
|
# Ensure we can add one.
|
|
|
|
base3 = base2.replace(tzinfo=z100)
|
|
|
|
self.assertEqual(base, base3)
|
|
|
|
self.failUnless(base.tzinfo is base3.tzinfo)
|
|
|
|
|
|
|
|
# Out of bounds.
|
|
|
|
base = cls(2000, 2, 29)
|
|
|
|
self.assertRaises(ValueError, base.replace, year=2001)
|
2002-12-16 16:18:38 -04:00
|
|
|
|
2002-12-25 03:40:55 -04:00
|
|
|
def test_more_astimezone(self):
|
|
|
|
# The inherited test_astimezone covered some trivial and error cases.
|
|
|
|
fnone = FixedOffset(None, "None")
|
|
|
|
f44m = FixedOffset(44, "44")
|
|
|
|
fm5h = FixedOffset(-timedelta(hours=5), "m300")
|
|
|
|
|
2003-01-23 15:58:02 -04:00
|
|
|
dt = self.theclass.now(tz=f44m)
|
2002-12-25 03:40:55 -04:00
|
|
|
self.failUnless(dt.tzinfo is f44m)
|
2003-01-23 12:36:11 -04:00
|
|
|
# Replacing with degenerate tzinfo raises an exception.
|
|
|
|
self.assertRaises(ValueError, dt.astimezone, fnone)
|
|
|
|
# Ditto with None tz.
|
|
|
|
self.assertRaises(TypeError, dt.astimezone, None)
|
|
|
|
# Replacing with same tzinfo makes no change.
|
2002-12-25 03:40:55 -04:00
|
|
|
x = dt.astimezone(dt.tzinfo)
|
|
|
|
self.failUnless(x.tzinfo is f44m)
|
|
|
|
self.assertEqual(x.date(), dt.date())
|
|
|
|
self.assertEqual(x.time(), dt.time())
|
|
|
|
|
|
|
|
# Replacing with different tzinfo does adjust.
|
|
|
|
got = dt.astimezone(fm5h)
|
|
|
|
self.failUnless(got.tzinfo is fm5h)
|
|
|
|
self.assertEqual(got.utcoffset(), timedelta(hours=-5))
|
|
|
|
expected = dt - dt.utcoffset() # in effect, convert to UTC
|
|
|
|
expected += fm5h.utcoffset(dt) # and from there to local time
|
|
|
|
expected = expected.replace(tzinfo=fm5h) # and attach new tzinfo
|
|
|
|
self.assertEqual(got.date(), expected.date())
|
|
|
|
self.assertEqual(got.time(), expected.time())
|
|
|
|
self.assertEqual(got.timetz(), expected.timetz())
|
|
|
|
self.failUnless(got.tzinfo is expected.tzinfo)
|
|
|
|
self.assertEqual(got, expected)
|
|
|
|
|
2002-12-26 01:01:19 -04:00
|
|
|
def test_aware_subtract(self):
|
|
|
|
cls = self.theclass
|
|
|
|
|
2002-12-26 20:41:11 -04:00
|
|
|
# Ensure that utcoffset() is ignored when the operands have the
|
|
|
|
# same tzinfo member.
|
2002-12-26 01:01:19 -04:00
|
|
|
class OperandDependentOffset(tzinfo):
|
|
|
|
def utcoffset(self, t):
|
|
|
|
if t.minute < 10:
|
2003-01-02 17:28:08 -04:00
|
|
|
# d0 and d1 equal after adjustment
|
|
|
|
return timedelta(minutes=t.minute)
|
2002-12-26 01:01:19 -04:00
|
|
|
else:
|
2003-01-02 17:28:08 -04:00
|
|
|
# d2 off in the weeds
|
|
|
|
return timedelta(minutes=59)
|
2002-12-26 01:01:19 -04:00
|
|
|
|
|
|
|
base = cls(8, 9, 10, 11, 12, 13, 14, tzinfo=OperandDependentOffset())
|
|
|
|
d0 = base.replace(minute=3)
|
|
|
|
d1 = base.replace(minute=9)
|
|
|
|
d2 = base.replace(minute=11)
|
2002-12-26 20:41:11 -04:00
|
|
|
for x in d0, d1, d2:
|
|
|
|
for y in d0, d1, d2:
|
|
|
|
got = x - y
|
|
|
|
expected = timedelta(minutes=x.minute - y.minute)
|
|
|
|
self.assertEqual(got, expected)
|
|
|
|
|
|
|
|
# OTOH, if the tzinfo members are distinct, utcoffsets aren't
|
|
|
|
# ignored.
|
|
|
|
base = cls(8, 9, 10, 11, 12, 13, 14)
|
|
|
|
d0 = base.replace(minute=3, tzinfo=OperandDependentOffset())
|
|
|
|
d1 = base.replace(minute=9, tzinfo=OperandDependentOffset())
|
|
|
|
d2 = base.replace(minute=11, tzinfo=OperandDependentOffset())
|
2002-12-26 01:01:19 -04:00
|
|
|
for x in d0, d1, d2:
|
|
|
|
for y in d0, d1, d2:
|
|
|
|
got = x - y
|
|
|
|
if (x is d0 or x is d1) and (y is d0 or y is d1):
|
|
|
|
expected = timedelta(0)
|
|
|
|
elif x is y is d2:
|
|
|
|
expected = timedelta(0)
|
|
|
|
elif x is d2:
|
|
|
|
expected = timedelta(minutes=(11-59)-0)
|
|
|
|
else:
|
|
|
|
assert y is d2
|
|
|
|
expected = timedelta(minutes=0-(11-59))
|
|
|
|
self.assertEqual(got, expected)
|
|
|
|
|
2002-12-26 20:41:11 -04:00
|
|
|
def test_mixed_compare(self):
|
|
|
|
t1 = datetime(1, 2, 3, 4, 5, 6, 7)
|
2003-01-08 16:40:01 -04:00
|
|
|
t2 = datetime(1, 2, 3, 4, 5, 6, 7)
|
2002-12-26 20:41:11 -04:00
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
t2 = t2.replace(tzinfo=None)
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
t2 = t2.replace(tzinfo=FixedOffset(None, ""))
|
|
|
|
self.assertEqual(t1, t2)
|
2003-02-07 23:46:31 -04:00
|
|
|
t2 = t2.replace(tzinfo=FixedOffset(0, ""))
|
|
|
|
self.assertRaises(TypeError, lambda: t1 == t2)
|
2002-12-26 20:41:11 -04:00
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
# In datetime w/ identical tzinfo objects, utcoffset is ignored.
|
2002-12-26 20:41:11 -04:00
|
|
|
class Varies(tzinfo):
|
|
|
|
def __init__(self):
|
2003-01-02 17:28:08 -04:00
|
|
|
self.offset = timedelta(minutes=22)
|
2002-12-26 20:41:11 -04:00
|
|
|
def utcoffset(self, t):
|
2003-01-02 17:28:08 -04:00
|
|
|
self.offset += timedelta(minutes=1)
|
2002-12-26 20:41:11 -04:00
|
|
|
return self.offset
|
|
|
|
|
|
|
|
v = Varies()
|
|
|
|
t1 = t2.replace(tzinfo=v)
|
|
|
|
t2 = t2.replace(tzinfo=v)
|
|
|
|
self.assertEqual(t1.utcoffset(), timedelta(minutes=23))
|
|
|
|
self.assertEqual(t2.utcoffset(), timedelta(minutes=24))
|
|
|
|
self.assertEqual(t1, t2)
|
|
|
|
|
|
|
|
# But if they're not identical, it isn't ignored.
|
|
|
|
t2 = t2.replace(tzinfo=Varies())
|
|
|
|
self.failUnless(t1 < t2) # t1's offset counter still going up
|
2002-12-25 03:40:55 -04:00
|
|
|
|
2003-05-17 02:55:19 -03:00
|
|
|
def test_subclass_datetimetz(self):
|
|
|
|
|
|
|
|
class C(self.theclass):
|
|
|
|
theAnswer = 42
|
|
|
|
|
|
|
|
def __new__(cls, *args, **kws):
|
|
|
|
temp = kws.copy()
|
|
|
|
extra = temp.pop('extra')
|
|
|
|
result = self.theclass.__new__(cls, *args, **temp)
|
|
|
|
result.extra = extra
|
|
|
|
return result
|
|
|
|
|
|
|
|
def newmeth(self, start):
|
|
|
|
return start + self.hour + self.year
|
|
|
|
|
|
|
|
args = 2002, 12, 31, 4, 5, 6, 500, FixedOffset(-300, "EST", 1)
|
|
|
|
|
|
|
|
dt1 = self.theclass(*args)
|
|
|
|
dt2 = C(*args, **{'extra': 7})
|
|
|
|
|
|
|
|
self.assertEqual(dt2.__class__, C)
|
|
|
|
self.assertEqual(dt2.theAnswer, 42)
|
|
|
|
self.assertEqual(dt2.extra, 7)
|
|
|
|
self.assertEqual(dt1.utcoffset(), dt2.utcoffset())
|
|
|
|
self.assertEqual(dt2.newmeth(-7), dt1.hour + dt1.year - 7)
|
|
|
|
|
2002-12-29 19:44:49 -04:00
|
|
|
# Pain to set up DST-aware tzinfo classes.
|
|
|
|
|
|
|
|
def first_sunday_on_or_after(dt):
|
|
|
|
days_to_go = 6 - dt.weekday()
|
|
|
|
if days_to_go:
|
|
|
|
dt += timedelta(days_to_go)
|
|
|
|
return dt
|
|
|
|
|
|
|
|
ZERO = timedelta(0)
|
|
|
|
HOUR = timedelta(hours=1)
|
|
|
|
DAY = timedelta(days=1)
|
|
|
|
# In the US, DST starts at 2am (standard time) on the first Sunday in April.
|
|
|
|
DSTSTART = datetime(1, 4, 1, 2)
|
|
|
|
# and ends at 2am (DST time; 1am standard time) on the last Sunday of Oct,
|
2003-01-20 18:54:38 -04:00
|
|
|
# which is the first Sunday on or after Oct 25. Because we view 1:MM as
|
|
|
|
# being standard time on that day, there is no spelling in local time of
|
|
|
|
# the last hour of DST (that's 1:MM DST, but 1:MM is taken as standard time).
|
|
|
|
DSTEND = datetime(1, 10, 25, 1)
|
2002-12-29 19:44:49 -04:00
|
|
|
|
|
|
|
class USTimeZone(tzinfo):
|
|
|
|
|
|
|
|
def __init__(self, hours, reprname, stdname, dstname):
|
|
|
|
self.stdoffset = timedelta(hours=hours)
|
|
|
|
self.reprname = reprname
|
|
|
|
self.stdname = stdname
|
|
|
|
self.dstname = dstname
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return self.reprname
|
|
|
|
|
|
|
|
def tzname(self, dt):
|
|
|
|
if self.dst(dt):
|
|
|
|
return self.dstname
|
|
|
|
else:
|
|
|
|
return self.stdname
|
|
|
|
|
|
|
|
def utcoffset(self, dt):
|
|
|
|
return self.stdoffset + self.dst(dt)
|
|
|
|
|
|
|
|
def dst(self, dt):
|
2002-12-30 16:52:32 -04:00
|
|
|
if dt is None or dt.tzinfo is None:
|
2002-12-29 19:44:49 -04:00
|
|
|
# An exception instead may be sensible here, in one or more of
|
|
|
|
# the cases.
|
|
|
|
return ZERO
|
2002-12-31 13:36:56 -04:00
|
|
|
assert dt.tzinfo is self
|
2002-12-29 19:44:49 -04:00
|
|
|
|
|
|
|
# Find first Sunday in April.
|
|
|
|
start = first_sunday_on_or_after(DSTSTART.replace(year=dt.year))
|
|
|
|
assert start.weekday() == 6 and start.month == 4 and start.day <= 7
|
|
|
|
|
|
|
|
# Find last Sunday in October.
|
|
|
|
end = first_sunday_on_or_after(DSTEND.replace(year=dt.year))
|
|
|
|
assert end.weekday() == 6 and end.month == 10 and end.day >= 25
|
|
|
|
|
|
|
|
# Can't compare naive to aware objects, so strip the timezone from
|
|
|
|
# dt first.
|
2003-01-23 12:36:11 -04:00
|
|
|
if start <= dt.replace(tzinfo=None) < end:
|
2002-12-29 19:44:49 -04:00
|
|
|
return HOUR
|
|
|
|
else:
|
|
|
|
return ZERO
|
|
|
|
|
2002-12-31 13:36:56 -04:00
|
|
|
Eastern = USTimeZone(-5, "Eastern", "EST", "EDT")
|
|
|
|
Central = USTimeZone(-6, "Central", "CST", "CDT")
|
|
|
|
Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
|
|
|
|
Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
|
2002-12-30 13:09:40 -04:00
|
|
|
utc_real = FixedOffset(0, "UTC", 0)
|
|
|
|
# For better test coverage, we want another flavor of UTC that's west of
|
|
|
|
# the Eastern and Pacific timezones.
|
2003-01-04 02:03:15 -04:00
|
|
|
utc_fake = FixedOffset(-12*60, "UTCfake", 0)
|
2002-12-29 19:44:49 -04:00
|
|
|
|
|
|
|
class TestTimezoneConversions(unittest.TestCase):
|
2003-01-20 18:54:38 -04:00
|
|
|
# The DST switch times for 2002, in std time.
|
2003-01-08 16:40:01 -04:00
|
|
|
dston = datetime(2002, 4, 7, 2)
|
2003-01-20 18:54:38 -04:00
|
|
|
dstoff = datetime(2002, 10, 27, 1)
|
2002-12-29 19:44:49 -04:00
|
|
|
|
2003-01-08 16:40:01 -04:00
|
|
|
theclass = datetime
|
2003-01-02 15:35:54 -04:00
|
|
|
|
2002-12-31 13:36:56 -04:00
|
|
|
# Check a time that's inside DST.
|
|
|
|
def checkinside(self, dt, tz, utc, dston, dstoff):
|
|
|
|
self.assertEqual(dt.dst(), HOUR)
|
|
|
|
|
|
|
|
# Conversion to our own timezone is always an identity.
|
|
|
|
self.assertEqual(dt.astimezone(tz), dt)
|
|
|
|
|
|
|
|
asutc = dt.astimezone(utc)
|
|
|
|
there_and_back = asutc.astimezone(tz)
|
|
|
|
|
|
|
|
# Conversion to UTC and back isn't always an identity here,
|
|
|
|
# because there are redundant spellings (in local time) of
|
|
|
|
# UTC time when DST begins: the clock jumps from 1:59:59
|
|
|
|
# to 3:00:00, and a local time of 2:MM:SS doesn't really
|
|
|
|
# make sense then. The classes above treat 2:MM:SS as
|
|
|
|
# daylight time then (it's "after 2am"), really an alias
|
|
|
|
# for 1:MM:SS standard time. The latter form is what
|
|
|
|
# conversion back from UTC produces.
|
|
|
|
if dt.date() == dston.date() and dt.hour == 2:
|
|
|
|
# We're in the redundant hour, and coming back from
|
|
|
|
# UTC gives the 1:MM:SS standard-time spelling.
|
|
|
|
self.assertEqual(there_and_back + HOUR, dt)
|
|
|
|
# Although during was considered to be in daylight
|
|
|
|
# time, there_and_back is not.
|
|
|
|
self.assertEqual(there_and_back.dst(), ZERO)
|
|
|
|
# They're the same times in UTC.
|
|
|
|
self.assertEqual(there_and_back.astimezone(utc),
|
|
|
|
dt.astimezone(utc))
|
|
|
|
else:
|
|
|
|
# We're not in the redundant hour.
|
|
|
|
self.assertEqual(dt, there_and_back)
|
|
|
|
|
2003-01-20 18:54:38 -04:00
|
|
|
# Because we have a redundant spelling when DST begins, there is
|
|
|
|
# (unforunately) an hour when DST ends that can't be spelled at all in
|
|
|
|
# local time. When DST ends, the clock jumps from 1:59 back to 1:00
|
|
|
|
# again. The hour 1:MM DST has no spelling then: 1:MM is taken to be
|
|
|
|
# standard time. 1:MM DST == 0:MM EST, but 0:MM is taken to be
|
|
|
|
# daylight time. The hour 1:MM daylight == 0:MM standard can't be
|
|
|
|
# expressed in local time. Nevertheless, we want conversion back
|
|
|
|
# from UTC to mimic the local clock's "repeat an hour" behavior.
|
2002-12-31 13:36:56 -04:00
|
|
|
nexthour_utc = asutc + HOUR
|
2003-01-04 02:03:15 -04:00
|
|
|
nexthour_tz = nexthour_utc.astimezone(tz)
|
2003-01-20 18:54:38 -04:00
|
|
|
if dt.date() == dstoff.date() and dt.hour == 0:
|
|
|
|
# We're in the hour before the last DST hour. The last DST hour
|
2003-01-04 02:03:15 -04:00
|
|
|
# is ineffable. We want the conversion back to repeat 1:MM.
|
2003-01-20 18:54:38 -04:00
|
|
|
self.assertEqual(nexthour_tz, dt.replace(hour=1))
|
|
|
|
nexthour_utc += HOUR
|
|
|
|
nexthour_tz = nexthour_utc.astimezone(tz)
|
|
|
|
self.assertEqual(nexthour_tz, dt.replace(hour=1))
|
2002-12-31 13:36:56 -04:00
|
|
|
else:
|
2003-01-20 18:54:38 -04:00
|
|
|
self.assertEqual(nexthour_tz - dt, HOUR)
|
2002-12-31 13:36:56 -04:00
|
|
|
|
|
|
|
# Check a time that's outside DST.
|
|
|
|
def checkoutside(self, dt, tz, utc):
|
|
|
|
self.assertEqual(dt.dst(), ZERO)
|
|
|
|
|
|
|
|
# Conversion to our own timezone is always an identity.
|
|
|
|
self.assertEqual(dt.astimezone(tz), dt)
|
2003-01-23 12:36:11 -04:00
|
|
|
|
|
|
|
# Converting to UTC and back is an identity too.
|
|
|
|
asutc = dt.astimezone(utc)
|
|
|
|
there_and_back = asutc.astimezone(tz)
|
|
|
|
self.assertEqual(dt, there_and_back)
|
2002-12-31 13:36:56 -04:00
|
|
|
|
2002-12-30 13:09:40 -04:00
|
|
|
def convert_between_tz_and_utc(self, tz, utc):
|
|
|
|
dston = self.dston.replace(tzinfo=tz)
|
2003-01-20 18:54:38 -04:00
|
|
|
# Because 1:MM on the day DST ends is taken as being standard time,
|
|
|
|
# there is no spelling in tz for the last hour of daylight time.
|
|
|
|
# For purposes of the test, the last hour of DST is 0:MM, which is
|
|
|
|
# taken as being daylight time (and 1:MM is taken as being standard
|
|
|
|
# time).
|
2002-12-30 13:09:40 -04:00
|
|
|
dstoff = self.dstoff.replace(tzinfo=tz)
|
|
|
|
for delta in (timedelta(weeks=13),
|
|
|
|
DAY,
|
|
|
|
HOUR,
|
|
|
|
timedelta(minutes=1),
|
|
|
|
timedelta(microseconds=1)):
|
|
|
|
|
2002-12-31 13:36:56 -04:00
|
|
|
self.checkinside(dston, tz, utc, dston, dstoff)
|
|
|
|
for during in dston + delta, dstoff - delta:
|
|
|
|
self.checkinside(during, tz, utc, dston, dstoff)
|
2002-12-30 13:09:40 -04:00
|
|
|
|
2002-12-31 13:36:56 -04:00
|
|
|
self.checkoutside(dstoff, tz, utc)
|
|
|
|
for outside in dston - delta, dstoff + delta:
|
|
|
|
self.checkoutside(outside, tz, utc)
|
2002-12-30 13:37:30 -04:00
|
|
|
|
2002-12-29 19:44:49 -04:00
|
|
|
def test_easy(self):
|
|
|
|
# Despite the name of this test, the endcases are excruciating.
|
2002-12-30 13:09:40 -04:00
|
|
|
self.convert_between_tz_and_utc(Eastern, utc_real)
|
|
|
|
self.convert_between_tz_and_utc(Pacific, utc_real)
|
|
|
|
self.convert_between_tz_and_utc(Eastern, utc_fake)
|
|
|
|
self.convert_between_tz_and_utc(Pacific, utc_fake)
|
|
|
|
# The next is really dancing near the edge. It works because
|
|
|
|
# Pacific and Eastern are far enough apart that their "problem
|
|
|
|
# hours" don't overlap.
|
|
|
|
self.convert_between_tz_and_utc(Eastern, Pacific)
|
|
|
|
self.convert_between_tz_and_utc(Pacific, Eastern)
|
2003-01-01 00:18:51 -04:00
|
|
|
# OTOH, these fail! Don't enable them. The difficulty is that
|
|
|
|
# the edge case tests assume that every hour is representable in
|
|
|
|
# the "utc" class. This is always true for a fixed-offset tzinfo
|
|
|
|
# class (lke utc_real and utc_fake), but not for Eastern or Central.
|
|
|
|
# For these adjacent DST-aware time zones, the range of time offsets
|
|
|
|
# tested ends up creating hours in the one that aren't representable
|
|
|
|
# in the other. For the same reason, we would see failures in the
|
|
|
|
# Eastern vs Pacific tests too if we added 3*HOUR to the list of
|
|
|
|
# offset deltas in convert_between_tz_and_utc().
|
|
|
|
#
|
|
|
|
# self.convert_between_tz_and_utc(Eastern, Central) # can't work
|
|
|
|
# self.convert_between_tz_and_utc(Central, Eastern) # can't work
|
2002-12-29 19:44:49 -04:00
|
|
|
|
2003-01-01 17:51:37 -04:00
|
|
|
def test_tricky(self):
|
|
|
|
# 22:00 on day before daylight starts.
|
|
|
|
fourback = self.dston - timedelta(hours=4)
|
|
|
|
ninewest = FixedOffset(-9*60, "-0900", 0)
|
2003-01-23 12:36:11 -04:00
|
|
|
fourback = fourback.replace(tzinfo=ninewest)
|
2003-01-01 17:51:37 -04:00
|
|
|
# 22:00-0900 is 7:00 UTC == 2:00 EST == 3:00 DST. Since it's "after
|
|
|
|
# 2", we should get the 3 spelling.
|
|
|
|
# If we plug 22:00 the day before into Eastern, it "looks like std
|
|
|
|
# time", so its offset is returned as -5, and -5 - -9 = 4. Adding 4
|
|
|
|
# to 22:00 lands on 2:00, which makes no sense in local time (the
|
|
|
|
# local clock jumps from 1 to 3). The point here is to make sure we
|
|
|
|
# get the 3 spelling.
|
|
|
|
expected = self.dston.replace(hour=3)
|
2003-01-23 12:36:11 -04:00
|
|
|
got = fourback.astimezone(Eastern).replace(tzinfo=None)
|
2003-01-01 17:51:37 -04:00
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
# Similar, but map to 6:00 UTC == 1:00 EST == 2:00 DST. In that
|
|
|
|
# case we want the 1:00 spelling.
|
2003-01-23 12:36:11 -04:00
|
|
|
sixutc = self.dston.replace(hour=6, tzinfo=utc_real)
|
2003-01-01 17:51:37 -04:00
|
|
|
# Now 6:00 "looks like daylight", so the offset wrt Eastern is -4,
|
|
|
|
# and adding -4-0 == -4 gives the 2:00 spelling. We want the 1:00 EST
|
|
|
|
# spelling.
|
|
|
|
expected = self.dston.replace(hour=1)
|
2003-01-23 12:36:11 -04:00
|
|
|
got = sixutc.astimezone(Eastern).replace(tzinfo=None)
|
2003-01-01 17:51:37 -04:00
|
|
|
self.assertEqual(expected, got)
|
2002-12-29 19:44:49 -04:00
|
|
|
|
2003-01-04 02:03:15 -04:00
|
|
|
# Now on the day DST ends, we want "repeat an hour" behavior.
|
|
|
|
# UTC 4:MM 5:MM 6:MM 7:MM checking these
|
|
|
|
# EST 23:MM 0:MM 1:MM 2:MM
|
|
|
|
# EDT 0:MM 1:MM 2:MM 3:MM
|
|
|
|
# wall 0:MM 1:MM 1:MM 2:MM against these
|
|
|
|
for utc in utc_real, utc_fake:
|
|
|
|
for tz in Eastern, Pacific:
|
2003-01-20 18:54:38 -04:00
|
|
|
first_std_hour = self.dstoff - timedelta(hours=2) # 23:MM
|
2003-01-04 02:03:15 -04:00
|
|
|
# Convert that to UTC.
|
|
|
|
first_std_hour -= tz.utcoffset(None)
|
|
|
|
# Adjust for possibly fake UTC.
|
|
|
|
asutc = first_std_hour + utc.utcoffset(None)
|
|
|
|
# First UTC hour to convert; this is 4:00 when utc=utc_real &
|
|
|
|
# tz=Eastern.
|
|
|
|
asutcbase = asutc.replace(tzinfo=utc)
|
|
|
|
for tzhour in (0, 1, 1, 2):
|
|
|
|
expectedbase = self.dstoff.replace(hour=tzhour)
|
|
|
|
for minute in 0, 30, 59:
|
|
|
|
expected = expectedbase.replace(minute=minute)
|
|
|
|
asutc = asutcbase.replace(minute=minute)
|
|
|
|
astz = asutc.astimezone(tz)
|
|
|
|
self.assertEqual(astz.replace(tzinfo=None), expected)
|
|
|
|
asutcbase += HOUR
|
|
|
|
|
|
|
|
|
2003-01-02 15:35:54 -04:00
|
|
|
def test_bogus_dst(self):
|
|
|
|
class ok(tzinfo):
|
|
|
|
def utcoffset(self, dt): return HOUR
|
|
|
|
def dst(self, dt): return HOUR
|
|
|
|
|
|
|
|
now = self.theclass.now().replace(tzinfo=utc_real)
|
|
|
|
# Doesn't blow up.
|
|
|
|
now.astimezone(ok())
|
|
|
|
|
|
|
|
# Does blow up.
|
|
|
|
class notok(ok):
|
|
|
|
def dst(self, dt): return None
|
|
|
|
self.assertRaises(ValueError, now.astimezone, notok())
|
|
|
|
|
2003-01-23 12:36:11 -04:00
|
|
|
def test_fromutc(self):
|
|
|
|
self.assertRaises(TypeError, Eastern.fromutc) # not enough args
|
|
|
|
now = datetime.utcnow().replace(tzinfo=utc_real)
|
|
|
|
self.assertRaises(ValueError, Eastern.fromutc, now) # wrong tzinfo
|
|
|
|
now = now.replace(tzinfo=Eastern) # insert correct tzinfo
|
|
|
|
enow = Eastern.fromutc(now) # doesn't blow up
|
|
|
|
self.assertEqual(enow.tzinfo, Eastern) # has right tzinfo member
|
|
|
|
self.assertRaises(TypeError, Eastern.fromutc, now, now) # too many args
|
|
|
|
self.assertRaises(TypeError, Eastern.fromutc, date.today()) # wrong type
|
|
|
|
|
|
|
|
# Always converts UTC to standard time.
|
|
|
|
class FauxUSTimeZone(USTimeZone):
|
|
|
|
def fromutc(self, dt):
|
|
|
|
return dt + self.stdoffset
|
|
|
|
FEastern = FauxUSTimeZone(-5, "FEastern", "FEST", "FEDT")
|
|
|
|
|
|
|
|
# UTC 4:MM 5:MM 6:MM 7:MM 8:MM 9:MM
|
|
|
|
# EST 23:MM 0:MM 1:MM 2:MM 3:MM 4:MM
|
|
|
|
# EDT 0:MM 1:MM 2:MM 3:MM 4:MM 5:MM
|
|
|
|
|
|
|
|
# Check around DST start.
|
|
|
|
start = self.dston.replace(hour=4, tzinfo=Eastern)
|
|
|
|
fstart = start.replace(tzinfo=FEastern)
|
|
|
|
for wall in 23, 0, 1, 3, 4, 5:
|
|
|
|
expected = start.replace(hour=wall)
|
|
|
|
if wall == 23:
|
|
|
|
expected -= timedelta(days=1)
|
|
|
|
got = Eastern.fromutc(start)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
expected = fstart + FEastern.stdoffset
|
|
|
|
got = FEastern.fromutc(fstart)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
# Ensure astimezone() calls fromutc() too.
|
|
|
|
got = fstart.replace(tzinfo=utc_real).astimezone(FEastern)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
start += HOUR
|
|
|
|
fstart += HOUR
|
|
|
|
|
|
|
|
# Check around DST end.
|
|
|
|
start = self.dstoff.replace(hour=4, tzinfo=Eastern)
|
|
|
|
fstart = start.replace(tzinfo=FEastern)
|
|
|
|
for wall in 0, 1, 1, 2, 3, 4:
|
|
|
|
expected = start.replace(hour=wall)
|
|
|
|
got = Eastern.fromutc(start)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
expected = fstart + FEastern.stdoffset
|
|
|
|
got = FEastern.fromutc(fstart)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
# Ensure astimezone() calls fromutc() too.
|
|
|
|
got = fstart.replace(tzinfo=utc_real).astimezone(FEastern)
|
|
|
|
self.assertEqual(expected, got)
|
|
|
|
|
|
|
|
start += HOUR
|
|
|
|
fstart += HOUR
|
|
|
|
|
2003-01-02 15:35:54 -04:00
|
|
|
|
2004-09-15 22:30:50 -03:00
|
|
|
#############################################################################
|
|
|
|
# oddballs
|
|
|
|
|
|
|
|
class Oddballs(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_bug_1028306(self):
|
|
|
|
# Trying to compare a date to a datetime should act like a mixed-
|
|
|
|
# type comparison, despite that datetime is a subclass of date.
|
|
|
|
as_date = date.today()
|
|
|
|
as_datetime = datetime.combine(as_date, time())
|
|
|
|
self.assert_(as_date != as_datetime)
|
|
|
|
self.assert_(as_datetime != as_date)
|
|
|
|
self.assert_(not as_date == as_datetime)
|
|
|
|
self.assert_(not as_datetime == as_date)
|
|
|
|
self.assertRaises(TypeError, lambda: as_date < as_datetime)
|
|
|
|
self.assertRaises(TypeError, lambda: as_datetime < as_date)
|
|
|
|
self.assertRaises(TypeError, lambda: as_date <= as_datetime)
|
|
|
|
self.assertRaises(TypeError, lambda: as_datetime <= as_date)
|
|
|
|
self.assertRaises(TypeError, lambda: as_date > as_datetime)
|
|
|
|
self.assertRaises(TypeError, lambda: as_datetime > as_date)
|
|
|
|
self.assertRaises(TypeError, lambda: as_date >= as_datetime)
|
|
|
|
self.assertRaises(TypeError, lambda: as_datetime >= as_date)
|
|
|
|
|
|
|
|
# Neverthelss, comparison should work with the base-class (date)
|
|
|
|
# projection if use of a date method is forced.
|
|
|
|
self.assert_(as_date.__eq__(as_datetime))
|
|
|
|
different_day = (as_date.day + 1) % 20 + 1
|
|
|
|
self.assert_(not as_date.__eq__(as_datetime.replace(day=
|
|
|
|
different_day)))
|
|
|
|
|
|
|
|
# And date should compare with other subclasses of date. If a
|
|
|
|
# subclass wants to stop this, it's up to the subclass to do so.
|
|
|
|
date_sc = SubclassDate(as_date.year, as_date.month, as_date.day)
|
|
|
|
self.assertEqual(as_date, date_sc)
|
|
|
|
self.assertEqual(date_sc, as_date)
|
|
|
|
|
|
|
|
# Ditto for datetimes.
|
|
|
|
datetime_sc = SubclassDatetime(as_datetime.year, as_datetime.month,
|
|
|
|
as_date.day, 0, 0, 0)
|
|
|
|
self.assertEqual(as_datetime, datetime_sc)
|
|
|
|
self.assertEqual(datetime_sc, as_datetime)
|
|
|
|
|
2002-12-16 17:12:37 -04:00
|
|
|
def test_suite():
|
2002-12-16 16:18:38 -04:00
|
|
|
allsuites = [unittest.makeSuite(klass, 'test')
|
|
|
|
for klass in (TestModule,
|
|
|
|
TestTZInfo,
|
|
|
|
TestTimeDelta,
|
|
|
|
TestDateOnly,
|
|
|
|
TestDate,
|
|
|
|
TestDateTime,
|
|
|
|
TestTime,
|
|
|
|
TestTimeTZ,
|
|
|
|
TestDateTimeTZ,
|
2002-12-29 19:44:49 -04:00
|
|
|
TestTimezoneConversions,
|
2004-09-15 22:30:50 -03:00
|
|
|
Oddballs,
|
2002-12-16 16:18:38 -04:00
|
|
|
)
|
|
|
|
]
|
|
|
|
return unittest.TestSuite(allsuites)
|
|
|
|
|
|
|
|
def test_main():
|
|
|
|
import gc
|
|
|
|
import sys
|
|
|
|
|
2002-12-16 17:12:37 -04:00
|
|
|
thesuite = test_suite()
|
2002-12-16 16:18:38 -04:00
|
|
|
lastrc = None
|
|
|
|
while True:
|
|
|
|
test_support.run_suite(thesuite)
|
|
|
|
if 1: # change to 0, under a debug build, for some leak detection
|
|
|
|
break
|
|
|
|
gc.collect()
|
|
|
|
if gc.garbage:
|
|
|
|
raise SystemError("gc.garbage not empty after test run: %r" %
|
|
|
|
gc.garbage)
|
|
|
|
if hasattr(sys, 'gettotalrefcount'):
|
|
|
|
thisrc = sys.gettotalrefcount()
|
|
|
|
print >> sys.stderr, '*' * 10, 'total refs:', thisrc,
|
|
|
|
if lastrc:
|
|
|
|
print >> sys.stderr, 'delta:', thisrc - lastrc
|
|
|
|
else:
|
|
|
|
print >> sys.stderr
|
|
|
|
lastrc = thisrc
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test_main()
|