summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Kepler <dev@arthurk.com>2017-08-07 11:33:25 -0700
committerMatt Davis <nitzmahone@users.noreply.github.com>2017-08-07 11:33:25 -0700
commitd828449611ddd44fef5bc1a2e69ae8a1cac431f2 (patch)
tree490e9ed946a10886acc4c203c12274b47aa51807
parent3f85aa3abd7ffa7e6533af1dd3e070a1f776701f (diff)
downloadansible-d828449611ddd44fef5bc1a2e69ae8a1cac431f2.tar.gz
Corrects default arg format used by datetime filter (#27612)
This ensures the default datetime format matches that of datetime.datetime. Docs updated to match as well.
-rw-r--r--docs/docsite/rst/playbooks_filters.rst4
-rw-r--r--lib/ansible/plugins/filter/core.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/docsite/rst/playbooks_filters.rst b/docs/docsite/rst/playbooks_filters.rst
index 98a2f2b68b..e76a399399 100644
--- a/docs/docsite/rst/playbooks_filters.rst
+++ b/docs/docsite/rst/playbooks_filters.rst
@@ -654,8 +654,8 @@ To make use of one attribute from each item in a list of complex variables, use
To get date object from string use the `to_datetime` filter, (new in version in 2.2)::
- # get amount of seconds between two dates, default date format is %Y-%d-%m %H:%M:%S but you can pass your own one
- {{ (("2016-08-04 20:00:12"|to_datetime) - ("2015-10-06"|to_datetime('%Y-%d-%m'))).seconds }}
+ # get amount of seconds between two dates, default date format is %Y-%m-%d %H:%M:%S but you can pass your own one
+ {{ (("2016-08-14 20:00:12"|to_datetime) - ("2015-12-25"|to_datetime('%Y-%m-%d'))).seconds }}
Combination Filters
diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py
index 4d7b2b25db..e3e01c9d67 100644
--- a/lib/ansible/plugins/filter/core.py
+++ b/lib/ansible/plugins/filter/core.py
@@ -125,7 +125,7 @@ def to_bool(a):
return False
-def to_datetime(string, format="%Y-%d-%m %H:%M:%S"):
+def to_datetime(string, format="%Y-%m-%d %H:%M:%S"):
return datetime.strptime(string, format)