Merge 3.5 (pytime)

diff --cc Python/pytime.c
index 8a6cb551f0c4b61bbb3a861fa835dac7050b5285,7f65824b47670eca57c2d35989b51d7639e775d7..81682caa968a3fec970b5081a8a2534919ef340e
--- 1/Python/pytime.c
--- 2/Python/pytime.c
+++ b/Python/pytime.c
@@@ -639,9 -554,10 +639,9 @@@ _PyTime_GetSystemClock(void
  int
  _PyTime_GetSystemClockWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
  {
-     return pygettimeofday_new(t, info, 1);
+     return pygettimeofday(t, info, 1);
  }
  
 -
  static int
  pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
  {