Solve minor bug in python port with __import__ function.

Author: viferga

source/ports/py_port/metacall/api.py

@@ -79,7 +79,7 @@ def metacall_inspect():
 # Save the original Python import
 __python_import__ = builtins.__import__
 
-def __metacall_import__(self, name, globals=None, locals=None, fromlist=(), level=0):
+def __metacall_import__(name, globals=None, locals=None, fromlist=(), level=0):
 	def find_handle(handle_name):
 		metadata = metacall_inspect()
 
@@ -144,13 +144,22 @@ def generate_module(handle_name, handle):
 		# Probably in the future we can differenciate between them, but it is not trivial
 	}
 
+	# Try to load it as a Python module
+	mod = None
+
+	with suppress(ImportError):
+		mod = __python_import__(name, globals, locals, fromlist, level)
+
+	if mod:
+		return mod
+
 	# Obtain the extension of the module if any
-	extension = None if self.count('.') == 0 else self.split('.')[-1]
+	extension = None if name.count('.') == 0 else name.split('.')[-1]
 
 	# Load by extension if there is any (import puppeteer.js)
 	if extension and extension in extensions_to_tag.keys():
 		# Get handle name without extension
-		handle_name = self.split('.')[-2]
+		handle_name = name.split('.')[-2]
 
 		# Check if it is already loaded in MetaCall
 		handle = find_handle(handle_name)
@@ -159,38 +168,28 @@ def generate_module(handle_name, handle):
 			# Generate the module from cached handle
 			return generate_module(handle_name, handle)
 
-		if metacall_load_from_file(extensions_to_tag[extension], [self]):
+		if metacall_load_from_file(extensions_to_tag[extension], [name]):
 			handle = find_handle(handle_name)
 			if handle != None:
 				# Generate the module from cached handle
 				return generate_module(handle_name, handle)
 	else:
-		# Try to load it as a Python module
-		mod = None
-
-		with suppress(ImportError):
-			# TODO: Why level is not needed? Does it depend on the Python version?
-			mod = __python_import__(self, name, globals, locals, fromlist) #, level)
-
-		if mod:
-			return mod
-
 		# Check if it is already loaded in MetaCall
-		handle = find_handle(self)
+		handle = find_handle(name)
 
 		if handle != None:
 			# Generate the module from cached handle
-			return generate_module(self, handle)
+			return generate_module(name, handle)
 
 		# Otherwhise, try to load it by guessing the loader
 		for tag in list(set(extensions_to_tag.values())):
-			if metacall_load_from_file(tag, [self]):
-				handle = find_handle(self)
+			if metacall_load_from_file(tag, [name]):
+				handle = find_handle(name)
 				if handle != None:
 					# Generate the module from cached handle
-					return generate_module(self, handle)
+					return generate_module(name, handle)
 
-	raise ImportError('MetaCall could not import:', self)
+	raise ImportError('MetaCall could not import:', name)
 
 # Override Python import
 builtins.__import__ = __metacall_import__

source/tests/metacall_python_port_test/CMakeLists.txt

@@ -96,6 +96,9 @@ target_compile_definitions(${target}
 	PRIVATE
 	${DEFAULT_COMPILE_DEFINITIONS}
 
+	# NodeJS Port path
+	METACALL_PYTHON_PORT_PATH="${CMAKE_SOURCE_DIR}/source/ports/py_port"
+
 	# NodeJS Port Test path
 	METACALL_PYTHON_PORT_TEST_PATH="${CMAKE_SOURCE_DIR}/source/ports/py_port/run_tests.py"
 )

source/tests/metacall_python_port_test/source/metacall_python_port_test.cpp

@@ -40,7 +40,8 @@ TEST_F(metacall_python_port_test, DefaultConstructor)
 	/* Python */
 	#if defined(OPTION_BUILD_LOADERS_PY)
 	{
-		const char * py_scripts[] =
+		// Run port test
+		static const char * py_scripts[] =
 		{
 			METACALL_PYTHON_PORT_TEST_PATH
 		};
@@ -52,6 +53,35 @@ TEST_F(metacall_python_port_test, DefaultConstructor)
 		EXPECT_EQ((int) 0, (int) strcmp(metacall_value_to_string(ret), "Tests passed without errors"));
 
 		metacall_value_destroy(ret);
+
+		// Test import bug (__metacall_import__() missing 1 required positional argument: 'name')
+		static const char buffer[] =
+			"import sys\n"
+			"from http import client\n"
+			"def fetch_http_py(url: str):\n"
+			"	try:\n"
+			"		conn = client.HTTPSConnection(url, 443)\n"
+			"		conn.request('GET', '/')\n"
+			"		response = conn.getresponse()\n"
+			"		data = response.read()\n"
+			"		conn.close()\n"
+			"		return data\n"
+			"	except Exception as e:\n"
+			"		print(e)\n"
+			"		sys.stdout.flush()\n"
+			"		return b'<!doctype invalid>'\n";
+
+		ASSERT_EQ((int) 0, (int) metacall_load_from_memory("py", buffer, sizeof(buffer), NULL));
+
+		ret = metacall("fetch_http_py", "www.google.com");
+
+		static const char prefix[] = "<!doctype html>";
+
+		ASSERT_EQ((enum metacall_value_id) METACALL_BUFFER, (enum metacall_value_id) metacall_value_id(ret));
+
+		EXPECT_EQ((int) 0, (int) strncmp((const char *)metacall_value_to_buffer(ret), prefix, sizeof(prefix) - 1));
+
+		metacall_value_destroy(ret);
 	}
 	#endif /* OPTION_BUILD_LOADERS_PY */