remove unnecessary try-except around thrift-python types import

Summary: Now that issues with thrift-python validity have been addressed, it's safe to remove this `try-except`. In particular, `types.pyx` already unconditionally imports the thrift-python `.thrift_types` before this import runs, so we know this is safe: Reviewed By: createdbysk Differential Revision: D66461787 fbshipit-source-id: 95157bd9496f8abfba8cb0b7fc9d4dc49a59863c
facebook · Nov 25, 2024 · 93a9011 · 93a9011
1 parent ecabe01
commit 93a9011
Show file tree

Hide file tree

Showing 69 changed files with 68 additions and 506 deletions.
diff --git a/thrift/compiler/generate/templates/py3/types/enum_py.mustache b/thrift/compiler/generate/templates/py3/types/enum_py.mustache
@@ -42,12 +42,6 @@ class {{enum:name}}(thrift.py3.types.{{!
         return "{{program:name}}.{{enum:name}}"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum {{enum:name}} doesn't define `_to_python` because couldn't import "
-                "{{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_types"
-            )
-
         return _fbthrift_python_types.{{enum:name}}(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/thrift/compiler/generate/templates/py3/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py.mustache b/thrift/compiler/generate/templates/py3/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py.mustache
@@ -25,10 +25,7 @@ are re-exported via types.pyx
 import enum
 import thrift.py3.types
 import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_metadata as _fbthrift_python_metadata
-try:
-    import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "{{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.types"
 

diff --git a/.../fixtures/basic-annotations/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/.../fixtures/basic-annotations/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"
 
@@ -34,12 +31,6 @@ def __get_thrift_name__():
         return "module.MyEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum doesn't define `_to_python` because couldn't import "
-                "module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/...um/out/py3/gen-py3/test/fixtures/enumstrict/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...um/out/py3/gen-py3/test/fixtures/enumstrict/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import test.fixtures.enumstrict.module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import test.fixtures.enumstrict.module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import test.fixtures.enumstrict.module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "test.fixtures.enumstrict.module.types"
 
@@ -31,12 +28,6 @@ def __get_thrift_name__():
         return "module.EmptyEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum EmptyEnum doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enumstrict.module.thrift_types"
-            )
-
         return _fbthrift_python_types.EmptyEnum(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -78,12 +69,6 @@ def __get_thrift_name__():
         return "module.MyEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enumstrict.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -126,12 +111,6 @@ def __get_thrift_name__():
         return "module.MyUseIntrinsicDefaultEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyUseIntrinsicDefaultEnum doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enumstrict.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyUseIntrinsicDefaultEnum(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -191,12 +170,6 @@ def __get_thrift_name__():
         return "module.MyBigEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyBigEnum doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enumstrict.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyBigEnum(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/...tures/basic-stack-arguments/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...tures/basic-stack-arguments/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"
 
@@ -33,12 +30,6 @@ def __get_thrift_name__():
         return "module.MyEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum doesn't define `_to_python` because couldn't import "
-                "module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/...s/basic/out/py3/gen-py3/test/fixtures/basic/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...s/basic/out/py3/gen-py3/test/fixtures/basic/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import test.fixtures.basic.module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import test.fixtures.basic.module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import test.fixtures.basic.module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "test.fixtures.basic.module.types"
 
@@ -33,12 +30,6 @@ def __get_thrift_name__():
         return "module.MyEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum doesn't define `_to_python` because couldn't import "
-                "test.fixtures.basic.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -80,12 +71,6 @@ def __get_thrift_name__():
         return "module.HackEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum HackEnum doesn't define `_to_python` because couldn't import "
-                "test.fixtures.basic.module.thrift_types"
-            )
-
         return _fbthrift_python_types.HackEnum(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/...test/fixtures/complex-union/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...test/fixtures/complex-union/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"
 

diff --git a/...ler/test/fixtures/constants/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...ler/test/fixtures/constants/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"
 
@@ -31,12 +28,6 @@ def __get_thrift_name__():
         return "module.EmptyEnum"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum EmptyEnum doesn't define `_to_python` because couldn't import "
-                "module.thrift_types"
-            )
-
         return _fbthrift_python_types.EmptyEnum(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -80,12 +71,6 @@ def __get_thrift_name__():
         return "module.City"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum City doesn't define `_to_python` because couldn't import "
-                "module.thrift_types"
-            )
-
         return _fbthrift_python_types.City(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -130,12 +115,6 @@ def __get_thrift_name__():
         return "module.Company"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum Company doesn't define `_to_python` because couldn't import "
-                "module.thrift_types"
-            )
-
         return _fbthrift_python_types.Company(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/.../test/fixtures/empty-struct/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/.../test/fixtures/empty-struct/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"
 

diff --git a/...s/enums/out/py3/gen-py3/test/fixtures/enums/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...s/enums/out/py3/gen-py3/test/fixtures/enums/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import test.fixtures.enums.module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import test.fixtures.enums.module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import test.fixtures.enums.module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "test.fixtures.enums.module.types"
 
@@ -35,12 +32,6 @@ def __get_thrift_name__():
         return "module.Metasyntactic"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum Metasyntactic doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.Metasyntactic(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -86,12 +77,6 @@ def __get_thrift_name__():
         return "module.MyEnum1"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum1 doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum1(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -134,12 +119,6 @@ def __get_thrift_name__():
         return "module.MyEnum2"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum2 doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum2(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -185,12 +164,6 @@ def __get_thrift_name__():
         return "module.MyEnum3"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum3 doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum3(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -234,12 +207,6 @@ def __get_thrift_name__():
         return "module.MyEnum4"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyEnum4 doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyEnum4(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -282,12 +249,6 @@ def __get_thrift_name__():
         return "module.MyBitmaskEnum1"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyBitmaskEnum1 doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyBitmaskEnum1(self._fbthrift_value_)
 
     def _to_py3(self):
@@ -330,12 +291,6 @@ def __get_thrift_name__():
         return "module.MyBitmaskEnum2"
 
     def _to_python(self):
-        if _fbthrift_python_types is None:
-            raise AttributeError(
-                "Enum MyBitmaskEnum2 doesn't define `_to_python` because couldn't import "
-                "test.fixtures.enums.module.thrift_types"
-            )
-
         return _fbthrift_python_types.MyBitmaskEnum2(self._fbthrift_value_)
 
     def _to_py3(self):

diff --git a/...er/test/fixtures/exceptions/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...er/test/fixtures/exceptions/out/py3/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"
 

diff --git a/...res/includes/out/py3_auto_migrate/gen-py3/includes/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...res/includes/out/py3_auto_migrate/gen-py3/includes/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import includes.thrift_metadata as _fbthrift_python_metadata
-try:
-    import includes.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import includes.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "includes.types"
 

diff --git a/...tures/includes/out/py3_auto_migrate/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py b/...tures/includes/out/py3_auto_migrate/gen-py3/module/types_impl_FBTHRIFT_ONLY_DO_NOT_USE.py
@@ -8,10 +8,7 @@
 import enum
 import thrift.py3.types
 import module.thrift_metadata as _fbthrift_python_metadata
-try:
-    import module.thrift_types as _fbthrift_python_types
-except Exception: # TODO(T205494848): fix thrift-python import failures
-    _fbthrift_python_types = None
+import module.thrift_types as _fbthrift_python_types
 
 _fbthrift__module_name__ = "module.types"