Allow date/datetime to convert to DateTime.

Part of #306.
IronLanguages · Apr 26, 2015 · 31f5c88 · 31f5c88
1 parent 7beadc2
commit 31f5c88
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/Languages/IronPython/IronPython.Modules/datetime.cs b/Languages/IronPython/IronPython.Modules/datetime.cs
@@ -433,6 +433,10 @@ public class date : ICodeFormattable {
                 set { _dateTime = value; }
             }
 
+            public static implicit operator DateTime(date self) {
+                return self._dateTime;
+            }
+
             // supported operations
             public static date operator +([NotNull]date self, [NotNull]timedelta other) {
                 try {

diff --git a/Languages/IronPython/Tests/test_datetime.py b/Languages/IronPython/Tests/test_datetime.py
@@ -14,11 +14,15 @@
 #
 #####################################################################################
 
+import clr
+
 import unittest
 import datetime
 import time
 from test import test_support
 
+from System import DateTime, TimeSpan
+
 class TestDatetime(unittest.TestCase):
 
     def test_strptime_1(self):
@@ -136,6 +140,22 @@ def test_fromtimestamp(self):
         ts = 5399410716.777882
         self.assertEqual(datetime.datetime.fromtimestamp(ts).microsecond, 777882)
 
+    def test_System_DateTime_conversion(self):
+        example = datetime.datetime(2015, 4, 25, 8, 39, 54)
+        result = clr.Convert(example, DateTime)
+        self.assertIsInstance(result, DateTime)
+
+        expected = DateTime(2015, 4, 25, 8, 39, 54)
+        self.assertEqual(expected, result)
+
+    def test_System_DateTime_binding(self):
+        pydt = datetime.datetime(2015, 4, 25, 8, 39, 54)
+        netdt = DateTime(2015, 4, 25, 9, 39, 54)
+
+        result = netdt.Subtract(pydt)
+        expected = TimeSpan(1, 0, 0)
+
+        self.assertEqual(expected, result)
 
 def test_main():
     from unittest import main

diff --git a/Test/IronPython.tests b/Test/IronPython.tests
@@ -108,6 +108,17 @@
           <NotParallelSafe>false</NotParallelSafe>
           <WorkingDirectory>%DLR_ROOT%\Languages\IronPython\Tests</WorkingDirectory>
         </Test>
+        <Test>
+          <Name>test_datetime_20</Name>
+          <Filename>%DLR_ROOT%\Languages\IronPython\Internal\ipy.bat</Filename>
+          <Arguments>test_datetime.py</Arguments>
+          <MaxDuration>600000</MaxDuration>
+          <LongRunning>false</LongRunning>
+          <Disabled>false</Disabled>
+          <RequiresAdmin>false</RequiresAdmin>
+          <NotParallelSafe>false</NotParallelSafe>
+          <WorkingDirectory>%DLR_ROOT%\Languages\IronPython\Tests</WorkingDirectory>
+        </Test>
         <Test>
           <Name>test_dict_20</Name>
           <Filename>%DLR_ROOT%\Languages\IronPython\Internal\ipy.bat</Filename>