python39: importlib_resources -> importlib.resources

apptools/persistence/tests/test_file_path.py

@@ -19,7 +19,10 @@
 from io import BytesIO
 
 # 3rd party imports.
-from importlib_resources import files
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 from apptools._testing.optional_dependencies import (
     numpy as np,

apptools/preferences/tests/test_preference_binding.py

@@ -17,7 +17,10 @@
 from os.path import join
 
 # Major package imports.
-from importlib_resources import files
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 # Enthought library imports.
 from apptools.preferences.api import Preferences

apptools/preferences/tests/test_preferences.py

@@ -17,7 +17,10 @@
 from os.path import join
 
 # Major package imports.
-from importlib_resources import files
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 # Enthought library imports.
 from apptools.preferences.api import Preferences

apptools/preferences/tests/test_preferences_helper.py

@@ -17,7 +17,10 @@
 import unittest
 
 # Major package imports.
-from importlib_resources import files
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 # Enthought library imports.
 from apptools.preferences.api import Preferences, PreferencesHelper

apptools/preferences/tests/test_py_config_file.py

@@ -17,7 +17,10 @@
 from os.path import join
 
 # Major package imports.
-from importlib_resources import files
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 # Enthought library imports.
 from .py_config_file import PyConfigFile

apptools/preferences/tests/test_scoped_preferences.py

@@ -16,7 +16,10 @@
 from os.path import join
 
 # Major package imports.
-from importlib_resources import files
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 # Enthought library imports.
 from apptools.preferences.api import Preferences, ScopedPreferences

setup.py

@@ -308,7 +308,7 @@ def get_long_description():
         ],
         extras_require={
             "test": [
-                "importlib-resources>=1.1.0",
+                "importlib-resources>=1.1.0; python_version<'3.9'",
             ],
             "h5": [
                 "numpy",