From 46ca3dbc70e2a61e81bf44469d029ff451da0e1f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 5 Sep 2019 19:24:47 -0700 Subject: [PATCH] Merge pull request #1337 from swt2c/time_clock_removed Replace time.clock (removed in Python 3.8) with time.process_time (cherry picked from commit 59e70e7c764fb84dc76d4d7efea011d70b04f733) --- wx/lib/floatcanvas/FloatCanvas.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wx/lib/floatcanvas/FloatCanvas.py b/wx/lib/floatcanvas/FloatCanvas.py index 60b4aa1a..5c5ac104 100644 --- a/wx/lib/floatcanvas/FloatCanvas.py +++ b/wx/lib/floatcanvas/FloatCanvas.py @@ -48,7 +48,10 @@ import sys mac = sys.platform.startswith("darwin") import numpy as N -from time import clock +try: + from time import process_time as clock +except ImportError: + from time import clock import wx import six