Remove backports.functools_lru_cache

jkseppan · jkseppan · commit 13225b30cc1d · 2018-02-15T20:37:22.000+02:00
diff --git a/build_alllocal.cmd b/build_alllocal.cmd
@@ -6,8 +6,6 @@
 :: conda install pyqt
 :: # this package is only available in the conda-forge channel
 :: conda install -c conda-forge msinttypes
-:: if you build on py2.7:
-:: conda install -c conda-forge backports.functools_lru_cache
 
 set TARGET=bdist_wheel
 IF [%1]==[] (
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -23,7 +23,7 @@
 from six.moves import xrange
 
 from collections import namedtuple
-from functools import partial, wraps
+from functools import lru_cache, partial, wraps
 import logging
 import numpy as np
 import os
@@ -35,11 +35,6 @@
 from matplotlib import cbook, rcParams
 from matplotlib.compat import subprocess
 
-try:
-    from functools import lru_cache
-except ImportError:  # Py2
-    from backports.functools_lru_cache import lru_cache
-
 if six.PY3:
     def ord(x):
         return x
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -45,6 +45,7 @@
 """
 
 from collections import Iterable
+from functools import lru_cache
 import json
 import os
 import sys
@@ -57,11 +58,6 @@
 from matplotlib.fontconfig_pattern import (
     parse_fontconfig_pattern, generate_fontconfig_pattern)
 
-try:
-    from functools import lru_cache
-except ImportError:
-    from backports.functools_lru_cache import lru_cache
-
 _log = logging.getLogger(__name__)
 
 USE_FONTCONFIG = False
diff --git a/lib/matplotlib/fontconfig_pattern.py b/lib/matplotlib/fontconfig_pattern.py
@@ -22,10 +22,7 @@
 from pyparsing import (Literal, ZeroOrMore, Optional, Regex, StringEnd,
                        ParseException, Suppress)
 
-try:
-    from functools import lru_cache
-except ImportError:
-    from backports.functools_lru_cache import lru_cache
+from functools import lru_cache
 
 family_punc = r'\\\-:,'
 family_unescape = re.compile(r'\\([%s])' % family_punc).sub
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -24,11 +24,7 @@
 from math import ceil
 import unicodedata
 from warnings import warn
-
-try:
-    from functools import lru_cache
-except ImportError:  # Py2
-    from backports.functools_lru_cache import lru_cache
+from functools import lru_cache
 
 import numpy as np
 
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -16,10 +16,7 @@
 
 from weakref import WeakValueDictionary
 
-try:
-    from functools import lru_cache
-except ImportError:  # Py2
-    from backports.functools_lru_cache import lru_cache
+from functools import lru_cache
 
 import numpy as np
 
diff --git a/setupext.py b/setupext.py
@@ -1441,8 +1441,6 @@ def get_install_requires(self):
             "six>=1.10",
             "kiwisolver>=1.0.1",
         ]
-        if sys.version_info < (3,):
-            install_requires += ["backports.functools_lru_cache"]
         if sys.version_info < (3,) and os.name == "posix":
             install_requires += ["subprocess32"]
         return install_requires

Original file line number	Diff line number	Diff line change
`@@ -1441,8 +1441,6 @@ def get_install_requires(self):`
`1441`	`1441`	`"six>=1.10",`
`1442`	`1442`	`"kiwisolver>=1.0.1",`
`1443`	`1443`	`]`
`1444`		`- if sys.version_info < (3,):`
`1445`		`- install_requires += ["backports.functools_lru_cache"]`
`1446`	`1444`	`if sys.version_info < (3,) and os.name == "posix":`
`1447`	`1445`	`install_requires += ["subprocess32"]`
`1448`	`1446`	`return install_requires`