Re-repair tests for 2019

cmdx.py

@@ -180,6 +180,13 @@ def function():
 
     """
 
+    try:
+        perf_counter = time_.perf_counter
+
+    # Python 2.7
+    except AttributeError:
+        perf_counter = time_.clock
+
     def timings_decorator(func):
         if not TIMINGS:
             # Do not wrap the function.
@@ -188,12 +195,12 @@ def timings_decorator(func):
 
         @wraps(func)
         def func_wrapper(*args, **kwargs):
-            t0 = time_.perf_counter()
+            t0 = perf_counter()
 
             try:
                 return func(*args, **kwargs)
             finally:
-                t1 = time_.perf_counter()
+                t1 = perf_counter()
                 duration = (t1 - t0) * 10 ** 6  # microseconds
 
                 Stats.LastTiming = duration

run_tests.py

@@ -6,8 +6,8 @@
 import flaky.flaky_nose_plugin as flaky
 
 # For nose
-if sys.version_info[0] == 3:
-    import collections
+import collections
+if not hasattr(collections, "Callable"):
     collections.Callable = collections.abc.Callable
 
 
@@ -34,8 +34,6 @@
         "cmdx.py",
     ])
 
-    cmds.colorManagementPrefs(cmEnabled=False, edit=True)
-
     result = nose.main(
         argv=argv,
         addplugins=[flaky.FlakyPlugin()],