summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgl@clarisys.fr <>2011-11-02 15:04:15 +0100
committergl@clarisys.fr <>2011-11-02 15:04:15 +0100
commitb7c23a115aa4bea0e9b7a0099cbf0f5aedf6eb14 (patch)
tree2c5f591148951676acab578d95d13be757efa460
parent30af0028a6633dc415a6c41bf2f2a67bda9bb68a (diff)
downloaddateutil-b7c23a115aa4bea0e9b7a0099cbf0f5aedf6eb14.tar.gz
FIX #884317 : correct use of microsecond when talking about microseconds
-rw-r--r--dateutil/relativedelta.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/dateutil/relativedelta.py b/dateutil/relativedelta.py
index 0c72a81..e8884f6 100644
--- a/dateutil/relativedelta.py
+++ b/dateutil/relativedelta.py
@@ -306,7 +306,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):
@@ -326,7 +326,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,