Merge pull request RustPython#3790 from xforce/main

Fix broken module_names in compile_dir for sub-directories

Author: youknowone

derive/src/compile_bytecode.rs

@@ -143,7 +143,11 @@ impl CompilationSource {
             if path.is_dir() {
                 code_map.extend(self.compile_dir(
                     &path,
-                    format!("{}{}", parent, file_name),
+                    if parent.is_empty() {
+                        file_name.to_string()
+                    } else {
+                        format!("{}.{}", parent, file_name)
+                    },
                     mode,
                 )?);
             } else if file_name.ends_with(".py") {

extra_tests/snippets/stdlib_dir_module.py

@@ -26,3 +26,6 @@
     assert 'dir_module' not in str(e)
 else:
     assert False
+
+from dir_module import dir_module_inner
+assert dir_module_inner.__name__ == 'dir_module.dir_module_inner'

vm/src/vm/mod.rs

@@ -823,3 +823,30 @@ impl AsRef<Context> for VirtualMachine {
         &self.ctx
     }
 }
+
+#[test]
+fn test_nested_frozen() {
+    use rustpython_vm as vm;
+
+    vm::Interpreter::with_init(Default::default(), |vm| {
+        // vm.add_native_modules(rustpython_stdlib::get_module_inits());
+        vm.add_frozen(rustpython_vm::py_freeze!(dir = "../extra_tests/snippets"));
+    })
+    .enter(|vm| {
+        let scope = vm.new_scope_with_builtins();
+
+        let code_obj = vm
+            .compile(
+                "from dir_module.dir_module_inner import value2",
+                vm::compile::Mode::Exec,
+                "<embedded>".to_owned(),
+            )
+            .map_err(|err| vm.new_syntax_error(&err))
+            .unwrap();
+
+        if let Err(e) = vm.run_code_obj(code_obj, scope.clone()) {
+            vm.print_exception(e.clone());
+            assert!(false);
+        }
+    })
+}