Add clocks (#1737)

* Add clocks

* Disable test

Author: slozier

Src/IronPython.Modules/time.cs

@@ -17,6 +17,7 @@
 using System.Threading;
 
 using IronPython.Runtime;
+using IronPython.Runtime.Exceptions;
 using IronPython.Runtime.Operations;
 using IronPython.Runtime.Types;
 
@@ -106,18 +107,31 @@ public static double clock() {
 
         public static double perf_counter() => clock();
 
+        public static double process_time() => Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds;
+
         public static string ctime(CodeContext/*!*/ context)
             => asctime(context, localtime());
 
         public static string ctime(CodeContext/*!*/ context, object? seconds)
             => asctime(context, localtime(seconds));
 
-        public static object get_clock_info([NotNone] string name) {
+        public static object get_clock_info(CodeContext/*!*/ context, [NotNone] string name) {
             // TODO: Fill with correct values
-            if (name == "monotonic")
-                return new SimpleNamespace(new Dictionary<string, object?> { { "adjustable", false }, { "implementation", "Stopwatch.GetTimestamp" }, { "monotonic", true }, { "resolution", 0.015625 } });
-
-            throw new NotImplementedException();
+            switch (name) {
+                case "monotonic":
+                    return new SimpleNamespace(new Dictionary<string, object?> { { "adjustable", false }, { "implementation", "Stopwatch.GetTimestamp" }, { "monotonic", true }, { "resolution", 0.015625 } });
+                case "perf_counter":
+                    return new SimpleNamespace(new Dictionary<string, object?> { { "adjustable", false }, { "implementation", "Stopwatch.ElapsedTicks" }, { "monotonic", true }, { "resolution", 1e-7 } });
+                case "process_time":
+                    return new SimpleNamespace(new Dictionary<string, object?> { { "adjustable", false }, { "implementation", "Process.TotalProcessorTime" }, { "monotonic", true }, { "resolution", 1e-7 } });
+                case "clock":
+                    PythonOps.Warn(context, PythonExceptions.DeprecationWarning, "time.clock has been deprecated in Python 3.3 and will be removed from Python 3.8: use time.perf_counter or time.process_time instead");
+                    return new SimpleNamespace(new Dictionary<string, object?> { { "adjustable", false }, { "implementation", "Stopwatch.ElapsedTicks" }, { "monotonic", true }, { "resolution", 1e-7 } });
+                case "time":
+                    return new SimpleNamespace(new Dictionary<string, object?> { { "adjustable", true }, { "implementation", "DateTime.Now" }, { "monotonic", false }, { "resolution", 0.015625 } });
+                default:
+                    throw PythonOps.ValueError("unknown clock");
+            }
         }
 
         public static void sleep(double tm) {

Tests/test_time_stdlib.py

@@ -6,30 +6,30 @@
 ## Run selected tests from test_time from StdLib
 ##
 
-from iptest import is_ironpython, generate_suite, run_test
+from iptest import is_ironpython, is_osx, is_netcoreapp21, generate_suite, run_test
 
 import test.test_time
 
 def load_tests(loader, standard_tests, pattern):
     tests = loader.loadTestsFromModule(test.test_time)
 
     if is_ironpython:
-
         failing_tests = [
             test.test_time.TestAsctime4dyear('test_large_year'), # ValueError: year is too high
             test.test_time.TestAsctime4dyear('test_negative'), # ValueError: year is too low
             test.test_time.TimeTestCase('test_asctime'), # ValueError: year is too high
             test.test_time.TimeTestCase('test_asctime_bounding_check'), # ValueError: Hour, Minute, and Second parameters describe an un-representable DateTime.
-            test.test_time.TimeTestCase('test_clock'), # NotImplementedError: get_clock_info('clock')
-            test.test_time.TimeTestCase('test_get_clock_info'), # NotImplementedError: get_clock_info
             test.test_time.TimeTestCase('test_insane_timestamps'), # ValueError: unreasonable date/time
             test.test_time.TimeTestCase('test_mktime_error'), # ValueError: year is too low
-            test.test_time.TimeTestCase('test_process_time'), # AttributeError: 'module' object has no attribute 'process_time'
             test.test_time.TimeTestCase('test_strftime_bounding_check'), # ValueError: Hour, Minute, and Second parameters describe an un-representable DateTime.
-            test.test_time.TimeTestCase('test_time'), # NotImplementedError: get_clock_info('time')
             test.test_time.TimeTestCase('test_default_values_for_zero'), # AssertionError: '2000 01 01 00 00 00 1 001' != '2000 01 01 00 00 00 6 001'
         ]
 
+        if is_netcoreapp21 and is_osx:
+            failing_tests += [
+                test.test_time.TimeTestCase('test_process_time'), # AssertionError
+            ]
+
         skip_tests = []
 
         return generate_suite(tests, failing_tests, skip_tests)

WhatsNewInPython33.md

@@ -117,7 +117,7 @@ Deprecated Python modules, functions and methods
 - [ ] `platform.popen()`: use the `subprocess` module. Check especially the "Replacing Older Functions with the `subprocess` Module" section (issue 11377).
 - [ ] The Windows `bytes` API has been deprecated in the `os` module. Use Unicode filenames, instead of `bytes` filenames, to not depend on the ANSI code page anymore and to support any filename.
 - [x] The `xml.etree.cElementTree` module is deprecated. The accelerator is used automatically whenever available.
-- [ ] The behaviour of `time.clock()` depends on the platform: use the new `time.perf_counter()` or `time.process_time()` function instead, depending on your requirements, to have a well defined behaviour.
+- [x] The behaviour of `time.clock()` depends on the platform: use the new `time.perf_counter()` or `time.process_time()` function instead, depending on your requirements, to have a well defined behaviour.
 - [x] ~~The `os.stat_float_times()` function is deprecated.~~ (Never implemented, but removed in Python 3.7)
 - `abc` module:
     + [ ] `abc.abstractproperty` has been deprecated, use `property` with `abc.abstractmethod()` instead.