Modify import from setuptools.modified

wxWidgets · Sep 10, 2024 · 0da5a0b · 0da5a0b
1 parent 3af6625
commit 0da5a0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/build.py b/build.py
@@ -40,8 +40,11 @@
 except ImportError:
     from buildtools.backports.shutil_which import which
 
+try:
+    from setuptools.modified import newer, newer_group
+except ImportError:
+    from distutils.dep_util import newer, newer_group
 
-from setuptools.modified import newer, newer_group
 from buildtools.config  import Config, msg, opj, posixjoin, loadETG, etg2sip, findCmd, \
                                phoenixDir, wxDir, copyIfNewer, copyFile, \
                                macSetLoaderNames, \

diff --git a/buildtools/config.py b/buildtools/config.py
@@ -23,7 +23,10 @@
 
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath
-from setuptools.modified  import newer
+try:
+    from setuptools.modified import newer
+except ImportError:
+    from distutils.dep_util import newer
 
 import distutils.sysconfig
 

diff --git a/buildtools/distutils_hacks.py b/buildtools/distutils_hacks.py
@@ -18,7 +18,11 @@
 import distutils.command.install_headers
 import distutils.command.clean
 
-from setuptools.modified import newer, newer_group
+try:
+    from setuptools.modified import newer, newer_group
+except ImportError:
+    from distutils.dep_util import newer, newer_group
+
 from distutils import log
 
 from .config import Config, posixjoin, loadETG, etg2sip