diff options
author | Tomi Pieviläinen <tomi.pievilainen+launchpad@iki.fi> | 2012-02-18 22:45:14 +0200 |
---|---|---|
committer | Tomi Pieviläinen <tomi.pievilainen+launchpad@iki.fi> | 2012-02-18 22:45:14 +0200 |
commit | 628cb9e642dc7b188c7f1a21879a29429b2cb9c2 (patch) | |
tree | 1dc6529531e988d7039dcd9893f936b12932c8e1 /dateutil/relativedelta.py | |
parent | 52093c973d3c91661ab1a64197b8694b25ca531c (diff) | |
parent | fe750f2af0f1e04137f46f398506f6500fa6b054 (diff) | |
download | dateutil-628cb9e642dc7b188c7f1a21879a29429b2cb9c2.tar.gz |
Merge new style classes branch, works now on 2.6-3.2
Diffstat (limited to 'dateutil/relativedelta.py')
-rw-r--r-- | dateutil/relativedelta.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dateutil/relativedelta.py b/dateutil/relativedelta.py index 1f07d82..d0b599a 100644 --- a/dateutil/relativedelta.py +++ b/dateutil/relativedelta.py @@ -42,7 +42,7 @@ class weekday(object): MO, TU, WE, TH, FR, SA, SU = weekdays = tuple([weekday(x) for x in range(7)]) -class relativedelta: +class relativedelta(object): """ The relativedelta type is based on the specification of the excelent work done by M.-A. Lemburg in his mx.DateTime extension. However, @@ -305,7 +305,7 @@ Here is the behavior of operations with relativedelta: hour=other.hour or self.hour, minute=other.minute or self.minute, second=other.second or self.second, - microsecond=other.second or self.microsecond) + microsecond=other.microsecond or self.microsecond) def __sub__(self, other): if not isinstance(other, relativedelta): @@ -325,7 +325,7 @@ Here is the behavior of operations with relativedelta: hour=other.hour or self.hour, minute=other.minute or self.minute, second=other.second or self.second, - microsecond=other.second or self.microsecond) + microsecond=other.microsecond or self.microsecond) def __neg__(self): return relativedelta(years=-self.years, |