Author: Brian Kearns <[email protected]>
Branch:
Changeset: r80912:e1e1695047f4
Date: 2015-11-24 15:53 -0500
http://bitbucket.org/pypy/pypy/changeset/e1e1695047f4/
Log: timedelta total_seconds use helper fn
diff --git a/lib_pypy/datetime.py b/lib_pypy/datetime.py
--- a/lib_pypy/datetime.py
+++ b/lib_pypy/datetime.py
@@ -534,8 +534,7 @@
def total_seconds(self):
"""Total seconds in the duration."""
- return ((self.days * 86400 + self.seconds) * 10**6 +
- self.microseconds) / 10**6
+ return self._to_microseconds() / 10**6
# Read-only field accessors
@property
diff --git a/pypy/module/test_lib_pypy/test_datetime.py
b/pypy/module/test_lib_pypy/test_datetime.py
--- a/pypy/module/test_lib_pypy/test_datetime.py
+++ b/pypy/module/test_lib_pypy/test_datetime.py
@@ -309,6 +309,10 @@
assert td_div_int_newint == td_div_newint_newint
assert td_div_newint_int == td_div_newint_newint
+ def test_return_types(self):
+ td = datetime.timedelta(5)
+ assert type(td.total_seconds()) is float
+
class TestDatetimeHost(BaseTestDatetime):
def setup_class(cls):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
