[Checkins] SVN: DateTime/trunk/ LP #1045233: Respect date format setting for parsing dates like `11-01-2001`.

[Hano Schlichting]

Log message for revision 128111:
  LP #1045233: Respect date format setting for parsing dates like `11-01-2001`.
  

Changed:
  U   DateTime/trunk/CHANGES.txt
  U   DateTime/trunk/src/DateTime/DateTime.py
  U   DateTime/trunk/src/DateTime/tests/testDateTime.py

-=-
Modified: DateTime/trunk/CHANGES.txt
===================================================================
--- DateTime/trunk/CHANGES.txt	2012-10-21 17:45:17 UTC (rev 128110)
+++ DateTime/trunk/CHANGES.txt	2012-10-21 19:36:59 UTC (rev 128111)
@@ -4,6 +4,7 @@
 3.0.2 (unreleased)
 ------------------
 
+- LP #1045233: Respect date format setting for parsing dates like `11-01-2001`.
 
 3.0.1 (2012-09-23)
 ------------------

Modified: DateTime/trunk/src/DateTime/DateTime.py
===================================================================
--- DateTime/trunk/src/DateTime/DateTime.py	2012-10-21 17:45:17 UTC (rev 128110)
+++ DateTime/trunk/src/DateTime/DateTime.py	2012-10-21 19:36:59 UTC (rev 128111)
@@ -996,8 +996,12 @@
                 day = ints[0]
                 del ints[:1]
             else:
-                month = ints[0]
-                day = ints[1]
+                if datefmt == "us":
+                    month = ints[0]
+                    day = ints[1]
+                else:
+                    month = ints[1]
+                    day = ints[0]
                 del ints[:2]
         elif month:
             if len(ints) > 1:

Modified: DateTime/trunk/src/DateTime/tests/testDateTime.py
===================================================================
--- DateTime/trunk/src/DateTime/tests/testDateTime.py	2012-10-21 17:45:17 UTC (rev 128110)
+++ DateTime/trunk/src/DateTime/tests/testDateTime.py	2012-10-21 19:36:59 UTC (rev 128111)
@@ -510,6 +510,15 @@
                                      datefmt="international")
                     self.assertEqual(d_us, d_int)
 
+    def test_intl_format_hyphen(self):
+        d_jan = DateTime('2011-01-11 GMT')
+        d_nov = DateTime('2011-11-01 GMT')
+        d_us = DateTime('11-01-2011 GMT')
+        d_int = DateTime('11-01-2011 GMT', datefmt="international")
+        self.assertNotEqual(d_us, d_int)
+        self.assertEqual(d_us, d_nov)
+        self.assertEqual(d_int, d_jan)
+
     def test_calcTimezoneName(self):
         from DateTime.interfaces import TimeError
         timezone_dependent_epoch = 2177452800L