Catch Python >= 3.5.4 error for relative imports in non-packages.

braincore · braincore · commit 10ef3ba6cbe9 · 2017-12-18T14:21:58.000-08:00
- Error is now an ImportError rather than SystemError.
diff --git a/stone/backends/python_helpers.py b/stone/backends/python_helpers.py
@@ -103,7 +103,7 @@ def generate_imports_for_referenced_namespaces(
             for ns in imported_namespaces:
                 backend.emit(ns.name + ',')
         backend.emit(')')
-    backend.emit('except (SystemError, ValueError):')
+    backend.emit('except (ImportError, SystemError, ValueError):')
     # Fallback if imported from outside a package.
     with backend.indent():
         for ns in imported_namespaces:
@@ -119,7 +119,7 @@ def generate_imports_for_referenced_namespaces(
 try:
     from . import stone_validators as bv
     from . import stone_base as bb
-except (SystemError, ValueError):
+except (ImportError, SystemError, ValueError):
     # Catch errors raised when importing a relative module when not in a package.
     # This makes testing this file directly (outside of a package) easier.
     import stone_validators as bv{type_ignore_comment}
diff --git a/stone/backends/python_rsrc/stone_base.py b/stone/backends/python_rsrc/stone_base.py
@@ -10,7 +10,7 @@
 
 try:
     from . import stone_validators as bv
-except (SystemError, ValueError):
+except (ImportError, SystemError, ValueError):
     # Catch errors raised when importing a relative module when not in a package.
     # This makes testing this file directly (outside of a package) easier.
     import stone_validators as bv  # type: ignore
diff --git a/stone/backends/python_rsrc/stone_serializers.py b/stone/backends/python_rsrc/stone_serializers.py
@@ -24,7 +24,7 @@
 try:
     from . import stone_base as bb  # noqa: F401 # pylint: disable=unused-import
     from . import stone_validators as bv
-except (SystemError, ValueError):
+except (ImportError, SystemError, ValueError):
     # Catch errors raised when importing a relative module when not in a package.
     # This makes testing this file directly (outside of a package) easier.
     import stone_validators as bb  # type: ignore # noqa: F401 # pylint: disable=unused-import
diff --git a/test/test_python_type_stubs.py b/test/test_python_type_stubs.py
@@ -180,7 +180,7 @@ def _api():
 try:
     from . import stone_validators as bv
     from . import stone_base as bb
-except (SystemError, ValueError):
+except (ImportError, SystemError, ValueError):
     # Catch errors raised when importing a relative module when not in a package.
     # This makes testing this file directly (outside of a package) easier.
     import stone_validators as bv  # type: ignore
