From 731cba4181f53cb7743ea0af60fd88dcac27c586 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Oct 2015 08:13:27 -0400
Subject: [PATCH] TW-1620: Dateformat wrongly interpreted

- Thanks to Dirk Deimeke.
---
 ChangeLog      |  1 +
 test/tw-1620.t | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100755 test/tw-1620.t

diff --git a/ChangeLog b/ChangeLog
index b5d99ae3d..9824da5e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,7 @@
 - TW-1617 Can't search for multi-word project (thanks to Audrey Easterday).
 - TW-1619 fish completion contain backspaces in fish master version (thanks to
           Johannes Wienke₎.
+- TW-1620 Dateformat wrongly interpreted (thanks to Dirk Deimeke).
 - TW-1621 Recurrent parent tasks shouldn't be counted in history (thanks to
           Denis Kasak).
 - TW-1622 Duration UDA can't take an algebraic expression (thanks to Jeremy John
diff --git a/test/tw-1620.t b/test/tw-1620.t
new file mode 100755
index 000000000..b04d9fc41
--- /dev/null
+++ b/test/tw-1620.t
@@ -0,0 +1,59 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+import sys
+import os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+
+class TestBug1620(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+        self.t.config('dateformat', 'YMD-HN')
+
+    def test_dateformat_overrides_iso(self):
+        """Verify that a defined dateformat overrides the ISO interpretation"""
+        code, out, err = self.t ('add pro:vorhaben due:20150601-1415 tatusmeeting vorbereiten')
+
+        code, out, err = self.t ('_get 1.due')
+        self.assertEqual(out, "2015-06-01T14:15:00\n")
+
+        code, out, err = self.t ('long')
+        self.assertIn("20150601-1415", out)
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4 ft=python