Accept bytes as filename arg to compile (#1480)

Author: BCSharp

Src/IronPython/Modules/Builtin.cs

@@ -162,47 +162,51 @@ public static object chr(int value) {
             "eval compiles the code as if were an expression\n" +
             "single compiles a single statement\n\n" +
             "source can either be a string, bytes or an AST object")]
-        public static object compile(CodeContext/*!*/ context, [NotNone] _ast.AST source, [NotNone] string filename, [NotNone] string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
+        public static object compile(CodeContext/*!*/ context, [NotNone] _ast.AST source, [NotNone] object filename, [NotNone] string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
             // TODO: implement optimize
 
+            string sfilename = PythonOps.FsPathDecoded(context, filename);
             ValidateCompileMode(mode);
 
             bool astOnly = flags != null && (Converter.ConvertToInt32(flags) & _ast.PyCF_ONLY_AST) != 0;
 
             if (astOnly) {
                 return source;
             } else {
-                PythonAst ast = _ast.ConvertToPythonAst(context, (_ast.AST)source, filename);
+                PythonAst ast = _ast.ConvertToPythonAst(context, (_ast.AST)source, sfilename);
                 ast.Bind();
                 ScriptCode code = ast.ToScriptCode();
                 return ((RunnableScriptCode)code).GetFunctionCode(true);
             }
         }
 
         [Documentation("")] // provided by first overload
-        public static object compile(CodeContext/*!*/ context, [NotNone] IBufferProtocol source, [NotNone] string filename, [NotNone] string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
+        public static object compile(CodeContext/*!*/ context, [NotNone] IBufferProtocol source, [NotNone] object filename, [NotNone] string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
             // TODO: implement optimize
+
+            string sfilename = PythonOps.FsPathDecoded(context, filename);
             var sourceCodeKind = ValidateCompileMode(mode);
 
             using var buffer = source.GetBuffer();
             byte[] bytes = buffer.AsUnsafeArray() ?? buffer.ToArray();
-            var contentProvider = new MemoryStreamContentProvider(context.LanguageContext, bytes, filename);
-            var sourceUnit = context.LanguageContext.CreateSourceUnit(contentProvider, filename, sourceCodeKind);
+            var contentProvider = new MemoryStreamContentProvider(context.LanguageContext, bytes, sfilename);
+            var sourceUnit = context.LanguageContext.CreateSourceUnit(contentProvider, sfilename, sourceCodeKind);
 
             return CompileHelper(context, sourceUnit, mode, flags, dont_inherit);
         }
 
         [Documentation("")] // provided by first overload
-        public static object compile(CodeContext/*!*/ context, [NotNone] string source, [NotNone] string filename, [NotNone] string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
+        public static object compile(CodeContext/*!*/ context, [NotNone] string source, [NotNone] object filename, [NotNone] string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
             // TODO: implement optimize
 
+            string sfilename = PythonOps.FsPathDecoded(context, filename);
             var sourceCodeKind = ValidateCompileMode(mode);
 
             if (source.IndexOf('\0') != -1) {
                 throw PythonOps.TypeError("compile() expected string without null bytes");
             }
 
-            var sourceUnit = context.LanguageContext.CreateSnippet(source, filename, sourceCodeKind);
+            var sourceUnit = context.LanguageContext.CreateSnippet(source, sfilename, sourceCodeKind);
 
             return CompileHelper(context, sourceUnit, mode, flags, dont_inherit);
         }

Src/IronPython/Modules/_io.cs

@@ -2794,13 +2794,7 @@ public static _IOBase open(
             string fname = null;
             if (!Converter.TryConvertToIndex(file, out int fd, false, false)) {
                 fd = -1;
-                var path = PythonOps.FsPath(file);
-                fname = path switch {
-                    string s => s,
-                    Extensible<string> es => es,
-                    Bytes b => b.decode(context, SysModule.getfilesystemencoding(), SysModule.getfilesystemencodeerrors()),
-                    _ => throw new InvalidOperationException(),
-                };
+                fname = PythonOps.FsPathDecoded(context, file);
             }
 
             HashSet<char> modes = MakeSet(mode);

Src/IronPython/Runtime/Operations/PythonOps.cs

@@ -342,6 +342,15 @@ internal static object FsPath(object? path) {
             throw PythonOps.TypeError("expected str, bytes or os.PathLike object, not {0}", PythonOps.GetPythonTypeName(path));
         }
 
+        internal static string FsPathDecoded(CodeContext context, object? path) {
+            return PythonOps.FsPath(path) switch {
+                string s => s,
+                Extensible<string> es => es,
+                Bytes b => b.decode(context, SysModule.getfilesystemencoding(), SysModule.getfilesystemencodeerrors()),
+                _ => throw new InvalidOperationException(),
+            };
+        }
+
         public static object Plus(object? o) {
             if (o is int) return o;
             else if (o is double) return o;

Tests/test_builtinfunc.py

@@ -671,9 +671,11 @@ def f():
         f()
 
     def test_compile(self):
-        for x in ['exec', 'eval', 'single']:
-            c = compile('2', 'foo', x)
-            self.assertEqual(c.co_filename, 'foo')
+        for mode in ['exec', 'eval', 'single']:
+            for filename in ['foo', b'foo']:
+                for source in ['2', b'2']:
+                    c = compile(source, filename, mode)
+                    self.assertEqual(c.co_filename, 'foo')
 
         class mystdout(object):
             def __init__(self):