Skip to content

Commit c470bc6

Browse files
author
Richard Jones
committed
merge from HEAD
1 parent c0bc4fd commit c470bc6

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Fixed:
77
- rdbms backends not filtering correctly on link=None
88
- fix anydbm journal import (sf bug 983166)
99
- handle postgresql bug in SQL generation (sf bug 984591)
10+
- fix dates-from-Dates (sf bug 984604)
1011

1112

1213
2004-06-24 0.7.5

roundup/date.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: date.py,v 1.68.2.1 2004-06-08 05:39:37 richard Exp $
18+
# $Id: date.py,v 1.68.2.2 2004-07-04 09:08:55 richard Exp $
1919

2020
"""Date, time and time interval handling.
2121
"""
@@ -123,6 +123,8 @@ def __init__(self, spec='.', offset=0, add_granularity=0):
123123
return
124124
elif hasattr(spec, 'tuple'):
125125
spec = spec.tuple()
126+
elif isinstance(spec, Date):
127+
spec = spec.get_tuple()
126128
try:
127129
y,m,d,H,M,S,x,x,x = spec
128130
frac = S - int(S)

0 commit comments

Comments
 (0)