Attachment #357882 for bug #482034

View | Details | Raw Unified | Return to bug 482034 | Differences between

and this patch

Lines 523-528 Link Here

(-)trac/util/tests/datefmt.py (+4 lines)
523	self.assertEqual(datefmt.to_datetime(23L, tz), expected)	523	self.assertEqual(datefmt.to_datetime(23L, tz), expected)
524	self.assertEqual(datefmt.to_datetime(23.0, tz), expected)	524	self.assertEqual(datefmt.to_datetime(23.0, tz), expected)
525		525
		526	def test_to_datetime_typeerror(self):
		527	self.assertRaises(TypeError, datefmt.to_datetime, 'blah')
		528	self.assertRaises(TypeError, datefmt.to_datetime, u'bl\xe1h')
		529
526	def test_format_datetime_utc(self):	530	def test_format_datetime_utc(self):
527	t = datetime.datetime(1970, 1, 1, 1, 0, 23, 0, datefmt.utc)	531	t = datetime.datetime(1970, 1, 1, 1, 0, 23, 0, datefmt.utc)
528	expected = '1970-01-01T01:00:23Z'	532	expected = '1970-01-01T01:00:23Z'

Lines 94-99 Link Here

(-)trac/util/datefmt.py (+2 lines)
94	timedelta(seconds=frac + 1)	94	timedelta(seconds=frac + 1)
95	else:	95	else:
96	dt = datetime.fromtimestamp(t, tz)	96	dt = datetime.fromtimestamp(t, tz)
		97	else:
		98	dt = None
97	if dt:	99	if dt:
98	return tz.normalize(dt)	100	return tz.normalize(dt)
99	raise TypeError('expecting datetime, int, long, float, or None; got %s' %	101	raise TypeError('expecting datetime, int, long, float, or None; got %s' %

Return to bug 482034