generate make_instance impl in auto-migrate

Summary: When both `auto-migrate` and `gen_legacy_container_converters` are enabled, the converters directly implement `__make_instance` rather than just wrapping a call to `types.{{type:flat_name}}__make_instance`.

Reviewed By: createdbysk

Differential Revision: D67999497

fbshipit-source-id: 28844dc3dcb8cdf50caf110efc8bc187c1e1b984

third-party/thrift/src/thrift/compiler/generate/t_mstch_py3_generator.cc

@@ -1572,7 +1572,7 @@ void t_mstch_py3_generator::generate_types() {
     generate_file("__init__.py", FileType::TypesFile, generateRootPath_);
   }
   for (const auto& file : converterFiles) {
-    generate_file(file, FileType::TypesFile, generateRootPath_);
+    generate_file(file, FileType::NotTypesFile, generateRootPath_);
   }
   // - if auto_migrate is present, generate types.pxd, and types.py
   // - else, just generate normal cython files

third-party/thrift/src/thrift/compiler/generate/templates/py3/converter.pxd.mustache

@@ -24,6 +24,7 @@ cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:
 {{#program:includeNamespaces}}
 {{#hasTypes?}}
 cimport {{#includeNamespace}}{{value}}.{{/includeNamespace}}cbindings as _{{#includeNamespace}}{{value}}_{{/includeNamespace}}cbindings
+cimport {{#includeNamespace}}{{value}}.{{/includeNamespace}}converter as _{{#includeNamespace}}{{value}}_{{/includeNamespace}}converter
 {{/hasTypes?}}
 {{/program:includeNamespaces}}
 {{/program:gen_legacy_container_converters?}}
@@ -44,3 +45,12 @@ cdef object {{struct:name}}_from_cpp(const shared_ptr[_fbthrift_cbindings.{{> ty
 cdef {{> types/cython_cpp_type}} {{type:flat_name}}__make_instance(object items) except *
 {{/program:containerTypes}}
 {{/program:gen_legacy_container_converters?}}
+{{!
+    Include Constructor and Extractor specializations.
+    In auto-migrate have to put this in .pxd instead of .pyx
+    for container converters transitive includes
+ }}
+{{#program:auto_migrate?}}
+cdef extern from "{{program:includePrefix}}gen-python-capi/{{program:name}}/thrift_types_capi.h":
+    pass
+{{/program:auto_migrate?}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/converter.pyx.mustache

@@ -22,16 +22,22 @@
 from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
+{{#program:gen_legacy_container_converters?}}
+from libcpp.utility cimport move as cmove
+
+import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.types as {{> types/current_module_types}}
+{{#program:includeNamespaces}}
+{{#hasTypes?}}
+import {{#includeNamespace}}{{value}}.{{/includeNamespace}}types as _{{#includeNamespace}}{{value}}_{{/includeNamespace}}types
+{{/hasTypes?}}
+{{/program:includeNamespaces}}
+
+{{/program:gen_legacy_container_converters?}}
 {{/program:auto_migrate?}}
 {{^program:auto_migrate?}}
 cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.types as _fbthrift_ctypes
 {{/program:auto_migrate?}}
 
-{{#program:auto_migrate?}}{{! include Constructor and Extractor specializations }}
-cdef extern from "{{program:includePrefix}}gen-python-capi/{{program:name}}/thrift_types_capi.h":
-    pass
-{{/program:auto_migrate?}}
-
 {{#program:filtered_structs}}
 {{! direct replacement for ._cpp_obj }}
 cdef shared_ptr[_fbthrift_cbindings.{{> types/c_struct }}] {{struct:name}}_convert_to_cpp(object inst) except*:
@@ -60,8 +66,8 @@ cdef {{> types/cython_cpp_type}} {{type:flat_name}}__make_instance(object items)
     return _fbthrift_ctypes.{{type:flat_name}}__make_instance(items)
 {{/program:auto_migrate?}}
 {{#program:auto_migrate?}}
-    cdef {{> types/cython_cpp_type}} ret
-    return ret
+    {{> types/make_instance}}
+
 {{/program:auto_migrate?}}
 
 {{/program:containerTypes}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_item.mustache

@@ -45,8 +45,13 @@ key, include the parallel CythonPythonToCppKey file instead.
 }}{{#type:string?}}item.encode('UTF-8'){{/type:string?}}{{!
 }}{{#type:binary?}}item{{/type:binary?}}{{!
 }}{{#type:struct}}{{!
+  }}{{^program:auto_migrate?}}{{!
   }}deref((<{{> types/cython_python_type}}>item).{{> types/cpp_obj}}){{!
+  }}{{/program:auto_migrate?}}{{!
+  }}{{#program:auto_migrate?}}{{!
+  }}python_to_cpp[{{> types/cython_cpp_basic_type}}](item){{!
+  }}{{/program:auto_migrate?}}{{!
 }}{{/type:struct}}{{!
-}}{{#type:container?}}{{> types/container_to_cpp }}(item){{/type:container?}}{{!
+}}{{#type:container?}}{{type:flat_name}}__make_instance(item){{/type:container?}}{{!
 }}{{#type:enum?}}<{{> types/cython_cpp_type}}><int>item{{/type:enum?}}{{!
 }}{{/type:customBinaryType?}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_key.mustache

@@ -35,9 +35,14 @@ keys (conventionally used for sets, lists, and map values).
 }}{{#type:string?}}key.encode('UTF-8'){{/type:string?}}{{!
 }}{{#type:binary?}}key{{/type:binary?}}{{!
 }}{{#type:struct}}{{!
+  }}{{^program:auto_migrate?}}{{!
   }}deref((<{{> types/cython_python_type}}>key).{{> types/cpp_obj}}){{!
+  }}{{/program:auto_migrate?}}{{!
+  }}{{#program:auto_migrate?}}{{!
+  }}python_to_cpp[{{> types/cython_cpp_basic_type}}](key){{!
+  }}{{/program:auto_migrate?}}{{!
 }}{{/type:struct}}{{!
 }}{{#type:container?}}{{!
-  }}{{> types/container_to_cpp}}(key){{!
+  }}{{type:flat_name}}__make_instance(key){{!
 }}{{/type:container?}}{{!
 }}{{#type:enum?}}<{{> types/cython_cpp_type}}><int>key{{/type:enum?}}

third-party/thrift/src/thrift/compiler/test/fixtures/basic-annotations/out/py3/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStructNestedAnnotation] MyStructNestedAnnotation_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStructNestedAnnotation?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/basic-enum/out/py3/gen-py3/test/fixtures/enumstrict/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport test.fixtures.enumstrict.module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/basic-stack-arguments/out/py3/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/py3/gen-py3/test/fixtures/basic/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport test.fixtures.basic.module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/complex-union/out/py3/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cComplexUnion] ComplexUnion_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.ComplexUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/py3/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cInternship] Internship_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Internship?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/empty-struct/out/py3/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cEmpty] Empty_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Empty?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/enums/out/py3/gen-py3/test/fixtures/enums/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport test.fixtures.enums.module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cSomeStruct] SomeStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.SomeStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/exceptions/out/py3/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cFiery] Fiery_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Fiery?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/includes/converter.pxd

@@ -13,3 +13,5 @@ cimport includes.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*
 cdef object Included_from_cpp(const shared_ptr[_fbthrift_cbindings.cIncluded]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/includes/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/includes/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/includes/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cIncluded](python_to_cpp[_fbthrift_cbindings.cIncluded](inst))
 cdef object Included_from_cpp(const shared_ptr[_fbthrift_cbindings.cIncluded]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/module/converter.pxd

@@ -13,3 +13,5 @@ cimport module.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/module/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/module/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/module/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cMyStruct](python_to_cpp[_fbthrift_cbindings.cMyStruct](inst))
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/transitive/converter.pxd

@@ -13,3 +13,5 @@ cimport transitive.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/transitive/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cFoo](python_to_cpp[_fbthrift_cbindings.cFoo](inst))
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/includes/converter.pxd

@@ -13,3 +13,5 @@ cimport includes.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*
 cdef object Included_from_cpp(const shared_ptr[_fbthrift_cbindings.cIncluded]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/includes/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/includes/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/includes/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cIncluded](python_to_cpp[_fbthrift_cbindings.cIncluded](inst))
 cdef object Included_from_cpp(const shared_ptr[_fbthrift_cbindings.cIncluded]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/transitive/converter.pxd

@@ -13,3 +13,5 @@ cimport transitive.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/transitive/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cFoo](python_to_cpp[_fbthrift_cbindings.cFoo](inst))
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/includes/converter.pxd

@@ -13,3 +13,5 @@ cimport includes.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*
 cdef object Included_from_cpp(const shared_ptr[_fbthrift_cbindings.cIncluded]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/includes/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/includes/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/includes/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cIncluded](python_to_cpp[_fbthrift_cbindings.cIncluded](inst))
 cdef object Included_from_cpp(const shared_ptr[_fbthrift_cbindings.cIncluded]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/module/converter.pxd

@@ -13,3 +13,5 @@ cimport module.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/module/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/module/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/module/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cMyStruct](python_to_cpp[_fbthrift_cbindings.cMyStruct](inst))
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/service/converter.pxd

@@ -10,3 +10,5 @@ from libcpp.memory cimport shared_ptr
 cimport service.cbindings as _fbthrift_cbindings
 
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/service/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/service/converter.pyx

@@ -10,7 +10,4 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/service/thrift_types_capi.h":
-    pass
-
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/transitive/converter.pxd

@@ -13,3 +13,5 @@ cimport transitive.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/transitive/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cFoo](python_to_cpp[_fbthrift_cbindings.cFoo](inst))
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_transitive/gen-py3/transitive/converter.pxd

@@ -13,3 +13,5 @@ cimport transitive.cbindings as _fbthrift_cbindings
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct)
 
+cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
+    pass

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_transitive/gen-py3/transitive/converter.pyx

@@ -10,9 +10,6 @@ from libcpp.memory cimport make_shared
 from thrift.python.capi.cpp_converter cimport cpp_to_python, python_to_cpp
 from cython.operator cimport dereference as deref
 
-cdef extern from "thrift/compiler/test/fixtures/includes/gen-python-capi/transitive/thrift_types_capi.h":
-    pass
-
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*:
     return make_shared[_fbthrift_cbindings.cFoo](python_to_cpp[_fbthrift_cbindings.cFoo](inst))
 cdef object Foo_from_cpp(const shared_ptr[_fbthrift_cbindings.cFoo]& c_struct):

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_matching_struct_names/gen-py3/includes/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport includes.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Included?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_matching_struct_names/gen-py3/matching_struct_names/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport matching_struct_names.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_matching_struct_names/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_matching_struct_names/gen-py3/transitive/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport transitive.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Foo?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_service/gen-py3/includes/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport includes.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cIncluded] Included_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Included?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_service/gen-py3/module/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport module.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_service/gen-py3/service/converter.pyx

@@ -9,4 +9,3 @@
 cimport service.types as _fbthrift_ctypes
 
 
-

third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_service/gen-py3/transitive/converter.pyx

@@ -8,7 +8,6 @@
 
 cimport transitive.types as _fbthrift_ctypes
 
-
 cdef shared_ptr[_fbthrift_cbindings.cFoo] Foo_convert_to_cpp(object inst) except*:
     return (<_fbthrift_ctypes.Foo?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
 

third-party/thrift/src/thrift/compiler/test/fixtures/inheritance/out/py3/gen-py3/module/converter.pyx

@@ -9,4 +9,3 @@
 cimport module.types as _fbthrift_ctypes
 
 
-