Prefer clock() over times() for timer function, except on the Mac,

where we use GetTicks() -- its clock() is a crock, with only 1 second
accuracy, I believe.

diff --git a/Lib/profile.py b/Lib/profile.py
index ae5182ad3dd349e139ca68278fabc66329b282ca..f7de6a42f54db9b46132ce72c9f1a400902e1ad2 100755 (executable)
--- a/Lib/profile.py
+++ b/Lib/profile.py
@@ -149,14 +149,17 @@ class Profile:
                          }
 
                if not timer:
-                       if hasattr(os, 'times'):
-                               self.timer = os.times
-                               self.dispatcher = self.trace_dispatch
-                       elif os.name == 'mac':
+                       if os.name == 'mac':
                                import MacOS
                                self.timer = MacOS.GetTicks
                                self.dispatcher = self.trace_dispatch_mac
                                self.get_time = self.get_time_mac
+                       elif hasattr(time, 'clock'):
+                               self.timer = time.clock
+                               self.dispatcher = self.trace_dispatch_i
+                       elif hasattr(os, 'times'):
+                               self.timer = os.times
+                               self.dispatcher = self.trace_dispatch
                        else:
                                self.timer = time.time
                                self.dispatcher = self.trace_dispatch_i