Skip to content

Replace BytesLikeAttribute usage with IBufferProtocol in builtins #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2020
Merged

Replace BytesLikeAttribute usage with IBufferProtocol in builtins #987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Src/IronPython/Modules/Builtin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,18 @@ public static object compile(CodeContext/*!*/ context, [NotNull]_ast.AST source,
}

[Documentation("")] // provided by first overload
public static object compile(CodeContext/*!*/ context, [BytesLike, NotNull]IList<byte> source, [NotNull]string filename, [NotNull]string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
public static object compile(CodeContext/*!*/ context, [NotNull]IBufferProtocol source, [NotNull]string filename, [NotNull]string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
// TODO: implement optimize
var sourceCodeKind = ValidateCompileMode(mode);

byte[] bytes = source as byte[] ?? ((source is Bytes b) ? b.UnsafeByteArray : source.ToArray());
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);

return CompileHelper(context, sourceUnit, mode, flags, dont_inherit);
}

public static object compile(CodeContext/*!*/ context, [NotNull]MemoryView source, [NotNull]string filename, [NotNull]string mode, object? flags = null, bool dont_inherit = false, int optimize = -1)
=> compile(context, source.tobytes(), filename, mode, flags, dont_inherit, optimize);

[Documentation("")] // provided by first overload
public static object compile(CodeContext/*!*/ context, [NotNull]string source, [NotNull]string filename, [NotNull]string mode, object? flags = null, bool dont_inherit = false, int optimize = -1) {
// TODO: implement optimize
Expand Down Expand Up @@ -296,12 +294,13 @@ public static object eval(CodeContext/*!*/ context, [NotNull]FunctionCode code,

[Documentation("")] // provided by first overload
[LightThrowing]
public static object eval(CodeContext/*!*/ context, [BytesLike, NotNull]IList<byte> expression, PythonDictionary? globals = null, object? locals = null) {
public static object eval(CodeContext/*!*/ context, [NotNull]IBufferProtocol expression, PythonDictionary? globals = null, object? locals = null) {
if (locals != null && !PythonOps.IsMappingType(context, locals)) {
throw PythonOps.TypeError("locals must be mapping");
}

byte[] bytes = expression as byte[] ?? ((expression is Bytes b) ? b.UnsafeByteArray : expression.ToArray());
using var buffer = expression.GetBuffer();
byte[] bytes = buffer.AsUnsafeArray() ?? buffer.ToArray();

// Count number of whitespace characters to skip at the beginning.
// It assumes an ASCII compatible encoding (like UTF-8 or Latin-1) but excludes UTF-16 or UTF-32.
Expand Down Expand Up @@ -373,8 +372,9 @@ public static void exec(CodeContext/*!*/ context, [NotNull]string code, PythonDi
}

[Documentation("")] // provided by first overload
public static void exec(CodeContext/*!*/ context, [BytesLike, NotNull]IList<byte> code, PythonDictionary? globals = null, object? locals = null) {
byte[] bytes = code as byte[] ?? ((code is Bytes b) ? b.UnsafeByteArray : code.ToArray());
public static void exec(CodeContext/*!*/ context, [NotNull]IBufferProtocol code, PythonDictionary? globals = null, object? locals = null) {
using var buffer = code.GetBuffer();
byte[] bytes = buffer.AsUnsafeArray() ?? buffer.ToArray();
SourceUnit source = context.LanguageContext.CreateSourceUnit(
new MemoryStreamContentProvider(context.LanguageContext, bytes, "<string>"),
"<string>",
Expand Down