Snapshot of cl/621045278

Author: rwgk

clif/pybind11/gen_type_info.py

@@ -47,6 +47,7 @@ def generate_type_caster(self) -> Generator[str, None, None]:
 class ClassType(BaseType):
   """Wraps a C++ Class."""
 
+  module_path: str
   cpp_has_public_dtor: bool
   cpp_copyable: bool
   cpp_movable: bool
@@ -72,7 +73,11 @@ def generate_type_caster(self) -> Generator[str, None, None]:
     # `PYBIND11_SMART_HOLDER_TYPE_CASTERS()` invocation, e.g. a collision
     # between a `std::tuple` alias in the global namespace (to work around
     # b/118736768) and `pybind11::tuple`.
-    using_name = f'PyCLIF_py_name_{self.py_name}'.replace('.', '_')
+    if self.module_path:
+      py_name_fq = '.'.join([self.module_path, self.py_name])
+    else:
+      py_name_fq = self.py_name
+    using_name = f'PyCLIF_py_name_{py_name_fq}'.replace('.', '_')
     yield f'using {using_name} = {self.cpp_name};'
     yield f'PYBIND11_SMART_HOLDER_TYPE_CASTERS({using_name})'
     if not self.cpp_copyable:

clif/pybind11/generator.py

@@ -404,15 +404,21 @@ def _register_types(self, decl: ast_pb2.Decl, parent_py_name: str = '',
           [b.native for b in decl.class_.bases if b.native and
            not b.cpp_canonical_type])
       class_type = gen_type_info.ClassType(
-          cpp_name=decl.class_.name.cpp_canonical_type, py_name=py_name,
-          cpp_namespace=cpp_namespace, py_bases=py_bases,
+          module_path=self._module_path,
+          cpp_name=decl.class_.name.cpp_canonical_type,
+          py_name=py_name,
+          cpp_namespace=cpp_namespace,
+          py_bases=py_bases,
           cpp_has_public_dtor=decl.class_.cpp_has_public_dtor,
-          cpp_copyable=(decl.class_.cpp_copyable and
-                        not decl.class_.cpp_abstract),
-          cpp_movable=(decl.class_.cpp_movable and
-                       not decl.class_.cpp_abstract),
+          cpp_copyable=(
+              decl.class_.cpp_copyable and not decl.class_.cpp_abstract
+          ),
+          cpp_movable=(
+              decl.class_.cpp_movable and not decl.class_.cpp_abstract
+          ),
           override_in_python=override_in_python,
-          enable_instance_dict=decl.class_.enable_instance_dict)
+          enable_instance_dict=decl.class_.enable_instance_dict,
+      )
       self._types.append(class_type)
       for member in decl.class_.members:
         self._register_types(member, py_name, cpp_namespace)

clif/testing/python/CMakeLists.txt

@@ -253,4 +253,11 @@ add_pyclif_library_for_test(std_containers_copy_move std_containers_copy_move.cl
 
 add_pyclif_library_for_test(class_release_gil_before_calling_cpp_dtor class_release_gil_before_calling_cpp_dtor.clif)
 
+add_pyclif_library_for_test(same_class_name_in_two_modules_alpha same_class_name_in_two_modules_alpha.clif)
+add_pyclif_library_for_test(same_class_name_in_two_modules_bravo same_class_name_in_two_modules_bravo.clif)
+add_pyclif_library_for_test(same_class_name_in_two_modules_client same_class_name_in_two_modules_client.clif
+  CLIF_DEPS clif_testing_python_same_class_name_in_two_modules_alpha
+  CLIF_DEPS clif_testing_python_same_class_name_in_two_modules_bravo
+)
+
 # OMITTED: instrumentation_for_testing_test (pytype currently not supported on GitHub)

clif/testing/python/same_class_name_in_two_modules_alpha.clif

@@ -0,0 +1,5 @@
+from "clif/testing/same_class_name_in_two_modules_alpha.h":
+  namespace `clif_testing_same_class_name_in_two_modules_alpha`:
+    class Smith:
+      @classmethod
+      def WhereIsHome(cls) -> str

clif/testing/python/same_class_name_in_two_modules_alpha_test.py

@@ -0,0 +1,13 @@
+from absl.testing import absltest
+
+from clif.testing.python import same_class_name_in_two_modules_alpha as alpha
+
+
+class AlphaTest(absltest.TestCase):
+
+  def testWhereIsHome(self):
+    self.assertEqual(alpha.Smith.WhereIsHome(), 'I live in Alphaville.')
+
+
+if __name__ == '__main__':
+  absltest.main()

clif/testing/python/same_class_name_in_two_modules_bravo.clif

@@ -0,0 +1,5 @@
+from "clif/testing/same_class_name_in_two_modules_bravo.h":
+  namespace `clif_testing_same_class_name_in_two_modules_bravo`:
+    class Smith:
+      @classmethod
+      def WhereIsHome(cls) -> str

clif/testing/python/same_class_name_in_two_modules_bravo_test.py

@@ -0,0 +1,13 @@
+from absl.testing import absltest
+
+from clif.testing.python import same_class_name_in_two_modules_bravo as bravo
+
+
+class BravoTest(absltest.TestCase):
+
+  def testWhereIsHome(self):
+    self.assertEqual(bravo.Smith.WhereIsHome(), 'I live in Bravoville.')
+
+
+if __name__ == '__main__':
+  absltest.main()

clif/testing/python/same_class_name_in_two_modules_client.clif

@@ -0,0 +1,7 @@
+from "clif/testing/python/same_class_name_in_two_modules_alpha_clif.h" import *
+from "clif/testing/python/same_class_name_in_two_modules_bravo_clif.h" import *
+
+from "clif/testing/same_class_name_in_two_modules_client.h":
+  namespace `clif_testing_same_class_name_in_two_modules_client`:
+    def ReturnAlphaSmith() -> `clif_testing_same_class_name_in_two_modules_alpha::Smith` as Smith
+    def ReturnBravoSmith() -> `clif_testing_same_class_name_in_two_modules_bravo::Smith` as Smith

clif/testing/python/same_class_name_in_two_modules_client_test.py

@@ -0,0 +1,22 @@
+from absl.testing import absltest
+
+from clif.testing.python import same_class_name_in_two_modules_alpha as alpha
+from clif.testing.python import same_class_name_in_two_modules_bravo as bravo
+from clif.testing.python import same_class_name_in_two_modules_client as client
+
+
+class AlphaTest(absltest.TestCase):
+
+  def testPassAlphaSmith(self):
+    obj = client.ReturnAlphaSmith()
+    self.assertEqual(obj.WhereIsHome(), 'I live in Alphaville.')
+    self.assertIsInstance(obj, alpha.Smith)
+
+  def testPassBravoSmith(self):
+    obj = client.ReturnBravoSmith()
+    self.assertEqual(obj.WhereIsHome(), 'I live in Bravoville.')
+    self.assertIsInstance(obj, bravo.Smith)
+
+
+if __name__ == '__main__':
+  absltest.main()

clif/testing/same_class_name_in_two_modules_alpha.h

@@ -0,0 +1,15 @@
+#ifndef CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_ALPHA_H_
+#define CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_ALPHA_H_
+
+#include <string>
+
+namespace clif_testing_same_class_name_in_two_modules_alpha {
+
+class Smith {
+ public:
+  static std::string WhereIsHome() { return "I live in Alphaville."; }
+};
+
+}  // namespace clif_testing_same_class_name_in_two_modules_alpha
+
+#endif  // CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_ALPHA_H_

clif/testing/same_class_name_in_two_modules_bravo.h

@@ -0,0 +1,15 @@
+#ifndef CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_BRAVO_H_
+#define CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_BRAVO_H_
+
+#include <string>
+
+namespace clif_testing_same_class_name_in_two_modules_bravo {
+
+class Smith {
+ public:
+  static std::string WhereIsHome() { return "I live in Bravoville."; }
+};
+
+}  // namespace clif_testing_same_class_name_in_two_modules_bravo
+
+#endif  // CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_BRAVO_H_

clif/testing/same_class_name_in_two_modules_client.h

@@ -0,0 +1,21 @@
+#ifndef CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_CLIENT_H_
+#define CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_CLIENT_H_
+
+#include "clif/testing/same_class_name_in_two_modules_alpha.h"
+#include "clif/testing/same_class_name_in_two_modules_bravo.h"
+
+namespace clif_testing_same_class_name_in_two_modules_client {
+
+inline clif_testing_same_class_name_in_two_modules_alpha::Smith
+ReturnAlphaSmith() {
+  return clif_testing_same_class_name_in_two_modules_alpha::Smith();
+}
+
+inline clif_testing_same_class_name_in_two_modules_bravo::Smith
+ReturnBravoSmith() {
+  return clif_testing_same_class_name_in_two_modules_bravo::Smith();
+}
+
+}  // namespace clif_testing_same_class_name_in_two_modules_client
+
+#endif  // CLIF_TESTING_SAME_CLASS_NAME_IN_TWO_MODULES_CLIENT_H_