Test data skeletons contain origin stamps with relative paths

GitOrigin-RevId: 84ceaa719e62245ee59fc1ff3d5720451dca9045

python/helpers/pycharm_generator_utils/module_redeclarator.py

@@ -55,6 +55,11 @@ class ClassBuf(Buf):
         super(ClassBuf, self).__init__(indenter)
         self.name = name
 
+class OriginType(object):
+    FILE = 'FILE'
+    BUILTIN = '(built-in)'
+    PREGENERATED = '(pre-generated)'
+
 
 #noinspection PyBroadException
 class ModuleRedeclarator(object):
@@ -783,17 +788,24 @@ class ModuleRedeclarator(object):
             mod_name = " does not know its name"
         out(0, "# module ", p_name, mod_name) # line 2
 
-        BUILT_IN_HEADER = "(built-in)"
+        origin_type = OriginType.FILE
         if is_pregenerated is not None:
-            filename = '(pre-generated)'
+            origin = origin_type = OriginType.PREGENERATED
         elif self.mod_filename:
-            filename = self.mod_filename
+            origin = self.mod_filename
         elif p_name in sys.builtin_module_names:
-            filename = BUILT_IN_HEADER
+            origin = origin_type = OriginType.BUILTIN
         else:
-            filename = getattr(self.module, "__file__", BUILT_IN_HEADER)
-        if not self.test_mode:
-            out(0, "# from %s" % filename)  # line 3
+            try:
+                origin = getattr(self.module, "__file__")
+            except AttributeError:
+                origin = origin_type = OriginType.BUILTIN
+
+        if self.test_mode and origin_type == OriginType.FILE:
+            origin = self._get_relative_path(origin, self.qname)
+
+
+        out(0, "# from %s" % origin)  # line 3
         out(0, "# by generator %s" % self.gen_version)  # line 4
         if p_name == BUILTIN_MOD_NAME and version[0] == 2 and version[1] >= 6:
             out(0, "from __future__ import print_function")
@@ -1114,3 +1126,12 @@ class ModuleRedeclarator(object):
             for mod_name in sorted_no_case(self.hidden_imports.keys()):
                 out(0, 'import ', mod_name, ' as ', self.hidden_imports[mod_name])
             out(0, "") # empty line after group
+
+    def _get_relative_path(self, path, qname):
+        abs_path_components = os.path.split(path)
+        qname_components_count = len(qname.split('.'))
+        if os.path.splitext(abs_path_components[-1])[0] == '__init__':
+            rel_path_components_count = qname_components_count + 1
+        else:
+            rel_path_components_count = qname_components_count
+        return os.path.join(*abs_path_components[-rel_path_components_count:])

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d6717de698818af85dc9ca0a8c44bf7c7a93986d70e4b8183d884e5/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/bar.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module bar calls itself _bar
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/foo.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module foo calls itself _foo
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/sdk_skeletons/bar.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module bar calls itself _bar
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/sdk_skeletons/foo.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module foo calls itself _foo
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_not_updated_when_sdk_skeleton_is_up_to_date/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_not_updated_when_sdk_skeleton_is_up_to_date/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_regenerated_when_sdk_skeleton_generation_failed_for_modified_binary/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_regenerated_when_sdk_skeleton_generation_failed_for_modified_binary/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/436f6de28726501973ddd9fb91fa92c6ec6225e5c28d8fbdb698dc1720e43714/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/9ce58f4a1ca20495c75bcfb7ef29c947b2de9f9ae0642c33cae59cd393e325b5/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/before/cache/9ce58f4a1ca20495c75bcfb7ef29c947b2de9f9ae0642c33cae59cd393e325b5/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 1000.0
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator test
 # no doc
 

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/after/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/failing.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module failing
+# from failing.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/after/sdk_skeletons/failing.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module failing
+# from failing.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/after/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.2
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports

python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/before/sdk_skeletons/mod.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # module mod
+# from mod.py
 # by generator 0.1
 # no doc
 # no imports