Load the source file into the correct module name (#50)

* Add a failing test

* Load the source file into the correct module name

Author: di

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Load the source file into the correct module name ([#49])
 
 ## [1.4.2] - 2020-05-13
 ### Fixed
@@ -66,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.0.1]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v1.0.1
 [1.0.0]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v1.0.0
 
+[#49]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/49
 [#44]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/44
 [#38]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/38
 [#33]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/33

src/functions_framework/__init__.py

@@ -141,7 +141,7 @@ def create_app(target=None, source=None, signature_type=None):
     os.environ["FUNCTION_SIGNATURE_TYPE"] = signature_type
 
     # Load the source file
-    spec = importlib.util.spec_from_file_location("main", source)
+    spec = importlib.util.spec_from_file_location("__main__", source)
     source_module = importlib.util.module_from_spec(spec)
     sys.path.append(os.path.dirname(os.path.realpath(source)))
     spec.loader.exec_module(source_module)

tests/test_functions.py

@@ -445,3 +445,13 @@ def test_lazy_wsgi_app(monkeypatch, target, source, signature_type):
         pretend.call(*args, **kwargs),
         pretend.call(*args, **kwargs),
     ]
+
+
+def test_class_in_main_is_in_right_module():
+    source = TEST_FUNCTIONS_DIR / "module_is_correct" / "main.py"
+    target = "function"
+
+    client = create_app(target, source).test_client()
+    resp = client.get("/")
+
+    assert resp.status_code == 200

tests/test_functions/module_is_correct/main.py

@@ -0,0 +1,29 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import typing
+
+
+class TestClass:
+    pass
+
+
+def function(request):
+    # Ensure that the module for any object in this file is set correctly
+    assert TestClass.__mro__[0].__module__ == "__main__"
+
+    # Ensure that calling `get_type_hints` on an object in this file succeeds
+    assert typing.get_type_hints(TestClass) == {}
+
+    return "OK"