Merge pull request #11262 from mdboom/optional-threading

anntzer · tacaswell · commit 758bfca3917b · 2018-08-04T19:27:38.000-04:00
Use dummy_threading if threading not available
Conflicts:
	lib/matplotlib/backends/backend_agg.py
          - conflicts due to removing __future__ / six on master
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -24,7 +24,11 @@
 
 import six
 
-import threading
+try:
+    import threading
+except ImportError:
+    import dummy_threading as threading
+
 import numpy as np
 from collections import OrderedDict
 from math import radians, cos, sin
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -48,7 +48,10 @@
 import json
 import os
 import sys
-from threading import Timer
+try:
+    from threading import Timer
+except ImportError:
+    from dummy_threading import Timer
 import warnings
 import logging
 
