From 969df8303b848cef8342be25cbc9b6343d7425b8 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Fri, 11 Oct 2019 22:36:33 +0100
Subject: [PATCH] Remove some Python 2 era import gaming

---
 Lib/fontTools/misc/loggingTools.py     | 11 ++---------
 Lib/fontTools/misc/macRes.py           |  5 +----
 Lib/fontTools/misc/plistlib.py         | 14 ++------------
 Lib/fontTools/misc/psLib.py            |  5 +----
 Lib/fontTools/misc/testTools.py        |  5 +----
 Lib/fontTools/ttLib/tables/_h_d_m_x.py |  6 +-----
 Lib/fontTools/ttLib/tables/_t_r_a_k.py |  5 +----
 Tests/misc/plistlib_test.py            |  5 +----
 8 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/Lib/fontTools/misc/loggingTools.py b/Lib/fontTools/misc/loggingTools.py
index f479c916a..e08aec989 100644
--- a/Lib/fontTools/misc/loggingTools.py
+++ b/Lib/fontTools/misc/loggingTools.py
@@ -7,16 +7,9 @@ import sys
 import logging
 import timeit
 from functools import wraps
-try:
-	from collections.abc import Mapping, Callable
-except ImportError:  # python < 3.3
-	from collections import Mapping, Callable
+from collections.abc import Mapping, Callable
 import warnings
-
-try:
-	from logging import PercentStyle
-except ImportError:
-	PercentStyle = None
+from logging import PercentStyle
 
 
 # default logging level used by Timer class
diff --git a/Lib/fontTools/misc/macRes.py b/Lib/fontTools/misc/macRes.py
index e8b3cbc20..da3237394 100644
--- a/Lib/fontTools/misc/macRes.py
+++ b/Lib/fontTools/misc/macRes.py
@@ -3,10 +3,7 @@ from fontTools.misc.py23 import *
 import struct
 from fontTools.misc import sstruct
 from collections import OrderedDict
-try:
-	from collections.abc import MutableMapping
-except ImportError:
-	from UserDict import DictMixin as MutableMapping
+from collections.abc import MutableMapping
 
 
 class ResourceError(Exception):
diff --git a/Lib/fontTools/misc/plistlib.py b/Lib/fontTools/misc/plistlib.py
index 52f7ec391..3804e8e5f 100644
--- a/Lib/fontTools/misc/plistlib.py
+++ b/Lib/fontTools/misc/plistlib.py
@@ -5,18 +5,8 @@ from datetime import datetime
 from base64 import b64encode, b64decode
 from numbers import Integral
 
-try:
-    from collections.abc import Mapping # python >= 3.3
-except ImportError:
-    from collections import Mapping
-
-try:
-    from functools import singledispatch
-except ImportError:
-    try:
-        from singledispatch import singledispatch
-    except ImportError:
-        singledispatch = None
+from collections.abc import Mapping
+from functools import singledispatch
 
 from fontTools.misc import etree
 
diff --git a/Lib/fontTools/misc/psLib.py b/Lib/fontTools/misc/psLib.py
index 5dc94ae38..e47483021 100644
--- a/Lib/fontTools/misc/psLib.py
+++ b/Lib/fontTools/misc/psLib.py
@@ -2,10 +2,7 @@ from fontTools.misc.py23 import *
 from fontTools.misc import eexec
 from .psOperators import *
 import re
-try:
-	from collections.abc import Callable
-except ImportError:  # python < 3.3
-	from collections import Callable
+from collections.abc import Callable
 from string import whitespace
 import logging
 
diff --git a/Lib/fontTools/misc/testTools.py b/Lib/fontTools/misc/testTools.py
index b4ade8b5a..59055062b 100644
--- a/Lib/fontTools/misc/testTools.py
+++ b/Lib/fontTools/misc/testTools.py
@@ -1,9 +1,6 @@
 """Helpers for writing unit tests."""
 
-try:
-    from collections.abc import Iterable
-except ImportError:  # python < 3.3
-    from collections import Iterable
+from collections.abc import Iterable
 import os
 import shutil
 import sys
diff --git a/Lib/fontTools/ttLib/tables/_h_d_m_x.py b/Lib/fontTools/ttLib/tables/_h_d_m_x.py
index a42cb6a73..db5d9d8aa 100644
--- a/Lib/fontTools/ttLib/tables/_h_d_m_x.py
+++ b/Lib/fontTools/ttLib/tables/_h_d_m_x.py
@@ -2,6 +2,7 @@ from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from . import DefaultTable
 import array
+from collections.abc import Mapping
 
 hdmxHeaderFormat = """
 	>   # big endian!
@@ -10,11 +11,6 @@ hdmxHeaderFormat = """
 	recordSize:	l
 """
 
-try:
-	from collections.abc import Mapping
-except:
-	from UserDict import DictMixin as Mapping
-
 class _GlyphnamedList(Mapping):
 
 	def __init__(self, reverseGlyphOrder, data):
diff --git a/Lib/fontTools/ttLib/tables/_t_r_a_k.py b/Lib/fontTools/ttLib/tables/_t_r_a_k.py
index 090bf14a2..7448916c2 100644
--- a/Lib/fontTools/ttLib/tables/_t_r_a_k.py
+++ b/Lib/fontTools/ttLib/tables/_t_r_a_k.py
@@ -10,10 +10,7 @@ from fontTools.misc.textTools import safeEval
 from fontTools.ttLib import TTLibError
 from . import DefaultTable
 import struct
-try:
-	from collections.abc import MutableMapping
-except ImportError:
-	from UserDict import DictMixin as MutableMapping
+from collections.abc import MutableMapping
 
 
 # Apple's documentation of 'trak':
diff --git a/Tests/misc/plistlib_test.py b/Tests/misc/plistlib_test.py
index aa2a24e25..4a60600fb 100644
--- a/Tests/misc/plistlib_test.py
+++ b/Tests/misc/plistlib_test.py
@@ -12,11 +12,8 @@ from fontTools.ufoLib.plistlib import (
     readPlist, readPlistFromString, writePlist, writePlistToString,
 )
 import pytest
+from collections.abc import Mapping
 
-try:
-    from collections.abc import Mapping # python >= 3.3
-except ImportError:
-    from collections import Mapping
 
 PY2 = sys.version_info < (3,)
 if PY2: