fixed python student file policy

Author: Heliozoa

plugins/python3/src/policy.rs

@@ -22,17 +22,16 @@ impl StudentFilePolicy for Python3StudentFilePolicy {
     }
 
     fn is_student_source_file(&self, path: &Path) -> bool {
-        // .py files in exercise root, and all non-pyc or __pycache__ files in src
-        match path.parent() {
-            Some(parent) => {
-                parent == OsStr::new("src")
-                    && path.extension() != Some(OsStr::new("pyc"))
-                    && !path
-                        .components()
-                        .any(|c| c.as_os_str() == OsStr::new("__pycache__"))
-            }
-            None => path.extension() == Some(OsStr::new("py")),
-        }
+        // all non-pyc or __pycache__ files in src are student source files
+        let in_src = path.starts_with("src");
+        let is_cache_file = path.extension() == Some(OsStr::new("pyc"))
+            || path
+                .components()
+                .any(|c| c.as_os_str() == OsStr::new("__pycache__"));
+        // .py files in exercise root are student source files
+        let is_py_in_root = path.extension() == Some(OsStr::new("py")) && path.parent().is_none();
+
+        in_src && !is_cache_file || is_py_in_root
     }
 }
 

tmc-langs-framework/src/io/tmc_zip.rs

@@ -21,7 +21,7 @@ pub fn zip<P: StudentFilePolicy>(policy: P, root_directory: &Path) -> Result<Vec
         .filter_entry(|e| !contains_tmcnosubmit(e))
         .filter_map(|e| e.ok())
     {
-        log::trace!("processing {:?}", entry.path());
+        log::trace!("processing {}", entry.path().display());
         if policy.is_student_file(entry.path(), &root_directory, &tmc_project_yml)? {
             let path = root_directory
                 .parent()

tmc-langs-framework/src/policy.rs

@@ -41,7 +41,6 @@ pub trait StudentFilePolicy {
         let root_canon = project_root_path
             .canonicalize()
             .map_err(|e| TmcError::Canonicalize(project_root_path.to_path_buf(), e))?;
-        log::debug!("{} {}", path_canon.display(), root_canon.display());
 
         // the project root path should be considered a student file
         if path_canon == root_canon {