RustPython · youknowone · Mar 31, 2025 · Mar 31, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/derive-impl/src/from_args.rs b/derive-impl/src/from_args.rs
@@ -76,7 +76,6 @@ impl ArgAttribute {
                return Err(meta.error("Default already set"));
            }
            let val = meta.value()?;
-            let val = val.parse::<syn::LitStr>()?;
            self.default = Some(Some(val.parse()?))
        } else if meta.path.is_ident("default") || meta.path.is_ident("optional") {
            if self.default.is_none() {
@@ -138,9 +137,10 @@ fn generate_field((i, field): (usize, &Field)) -> Result<TokenStream> {
        .map(|x| ::rustpython_vm::convert::TryFromObject::try_from_object(vm, x)).transpose()?
    };
    let ending = if let Some(default) = attr.default {
+        let ty = &field.ty;
        let default = default.unwrap_or_else(|| parse_quote!(::std::default::Default::default()));
        quote! {
-            .map(::rustpython_vm::function::FromArgOptional::from_inner)
+            .map(<#ty as ::rustpython_vm::function::FromArgOptional>::from_inner)
            .unwrap_or_else(|| #default)
        }
    } else {

diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -14,6 +14,7 @@ proc-macro = true
 [dependencies]
 rustpython-compiler = { workspace = true }
 rustpython-derive-impl = { workspace = true }
+proc-macro2 = { workspace = true }
 syn = { workspace = true }

 [lints]

diff --git a/stdlib/src/binascii.rs b/stdlib/src/binascii.rs
@@ -143,15 +143,15 @@ mod decl {

    #[derive(FromArgs)]
    struct NewlineArg {
-        #[pyarg(named, default = "true")]
+        #[pyarg(named, default = true)]
        newline: bool,
    }

    #[derive(FromArgs)]
    struct A2bBase64Args {
        #[pyarg(any)]
        s: ArgAsciiBuffer,
-        #[pyarg(named, default = "false")]
+        #[pyarg(named, default = false)]
        strict_mode: bool,
    }

@@ -298,7 +298,7 @@ mod decl {
    struct A2bQpArgs {
        #[pyarg(any)]
        data: ArgAsciiBuffer,
-        #[pyarg(named, default = "false")]
+        #[pyarg(named, default = false)]
        header: bool,
    }
    #[pyfunction]
@@ -366,11 +366,11 @@ mod decl {
    struct B2aQpArgs {
        #[pyarg(any)]
        data: ArgAsciiBuffer,
-        #[pyarg(named, default = "false")]
+        #[pyarg(named, default = false)]
        quotetabs: bool,
-        #[pyarg(named, default = "true")]
+        #[pyarg(named, default = true)]
        istext: bool,
-        #[pyarg(named, default = "false")]
+        #[pyarg(named, default = false)]
        header: bool,
    }

@@ -689,7 +689,7 @@ mod decl {

    #[derive(FromArgs)]
    struct BacktickArg {
-        #[pyarg(named, default = "false")]
+        #[pyarg(named, default = false)]
        backtick: bool,
    }


diff --git a/stdlib/src/faulthandler.rs b/stdlib/src/faulthandler.rs
@@ -34,7 +34,7 @@ mod decl {
    struct EnableArgs {
        #[pyarg(any, default)]
        file: Option<i64>,
-        #[pyarg(any, default = "true")]
+        #[pyarg(any, default = true)]
        all_threads: bool,
    }

@@ -50,9 +50,9 @@ mod decl {
        signum: i64,
        #[pyarg(any, default)]
        file: Option<i64>,
-        #[pyarg(any, default = "true")]
+        #[pyarg(any, default = true)]
        all_threads: bool,
-        #[pyarg(any, default = "false")]
+        #[pyarg(any, default = false)]
        chain: bool,
    }


diff --git a/stdlib/src/hashlib.rs b/stdlib/src/hashlib.rs
@@ -28,7 +28,7 @@ pub mod _hashlib {
        name: PyStrRef,
        #[pyarg(any, optional)]
        data: OptionalArg<ArgBytesLike>,
-        #[pyarg(named, default = "true")]
+        #[pyarg(named, default = true)]
        usedforsecurity: bool,
    }

@@ -37,7 +37,7 @@ pub mod _hashlib {
    pub struct BlakeHashArgs {
        #[pyarg(positional, optional)]
        pub data: OptionalArg<ArgBytesLike>,
-        #[pyarg(named, default = "true")]
+        #[pyarg(named, default = true)]
        usedforsecurity: bool,
    }

@@ -55,7 +55,7 @@ pub mod _hashlib {
    pub struct HashArgs {
        #[pyarg(any, optional)]
        pub string: OptionalArg<ArgBytesLike>,
-        #[pyarg(named, default = "true")]
+        #[pyarg(named, default = true)]
        usedforsecurity: bool,
    }

@@ -331,7 +331,7 @@ pub mod _hashlib {
        name: PyBuffer,
        #[pyarg(any, optional)]
        data: OptionalArg<ArgBytesLike>,
-        #[pyarg(named, default = "true")]
+        #[pyarg(named, default = true)]
        digestmod: bool, // TODO: RUSTPYTHON support functions & name functions
    }


diff --git a/stdlib/src/mmap.rs b/stdlib/src/mmap.rs
@@ -191,13 +191,13 @@ mod mmap {
        fileno: RawFd,
        #[pyarg(any)]
        length: isize,
-        #[pyarg(any, default = "MAP_SHARED")]
+        #[pyarg(any, default = MAP_SHARED)]
        flags: libc::c_int,
-        #[pyarg(any, default = "PROT_WRITE|PROT_READ")]
+        #[pyarg(any, default = PROT_WRITE|PROT_READ)]
        prot: libc::c_int,
-        #[pyarg(any, default = "AccessMode::Default")]
+        #[pyarg(any, default = AccessMode::Default)]
        access: AccessMode,
-        #[pyarg(any, default = "0")]
+        #[pyarg(any, default = 0)]
        offset: libc::off_t,
    }


diff --git a/stdlib/src/pystruct.rs b/stdlib/src/pystruct.rs
@@ -134,7 +134,7 @@ pub(crate) mod _struct {
    #[derive(FromArgs)]
    struct UpdateFromArgs {
        buffer: ArgBytesLike,
-        #[pyarg(any, default = "0")]
+        #[pyarg(any, default = 0)]
        offset: isize,
    }


diff --git a/stdlib/src/select.rs b/stdlib/src/select.rs
@@ -529,9 +529,9 @@ mod decl {

        #[derive(FromArgs)]
        pub struct EpollNewArgs {
-            #[pyarg(any, default = "-1")]
+            #[pyarg(any, default = -1)]
            sizehint: i32,
-            #[pyarg(any, default = "0")]
+            #[pyarg(any, default = 0)]
            flags: i32,
        }

@@ -555,7 +555,7 @@ mod decl {
        struct EpollPollArgs {
            #[pyarg(any, default)]
            timeout: poll::TimeoutArg<false>,
-            #[pyarg(any, default = "-1")]
+            #[pyarg(any, default = -1)]
            maxevents: i32,
        }


diff --git a/stdlib/src/socket.rs b/stdlib/src/socket.rs
@@ -1908,13 +1908,13 @@ mod _socket {
        #[pyarg(positional)]
        port: Option<Either<PyStrRef, i32>>,

-        #[pyarg(positional, default = "c::AF_UNSPEC")]
+        #[pyarg(positional, default = c::AF_UNSPEC)]
        family: i32,
-        #[pyarg(positional, default = "0")]
+        #[pyarg(positional, default = 0)]
        ty: i32,
-        #[pyarg(positional, default = "0")]
+        #[pyarg(positional, default = 0)]
        proto: i32,
-        #[pyarg(positional, default = "0")]
+        #[pyarg(positional, default = 0)]
        flags: i32,
    }


diff --git a/stdlib/src/sqlite.rs b/stdlib/src/sqlite.rs
@@ -297,21 +297,21 @@ mod _sqlite {
    struct ConnectArgs {
        #[pyarg(any)]
        database: FsPath,
-        #[pyarg(any, default = "5.0")]
+        #[pyarg(any, default = 5.0)]
        timeout: f64,
-        #[pyarg(any, default = "0")]
+        #[pyarg(any, default = 0)]
        detect_types: c_int,
-        #[pyarg(any, default = "Some(vm.ctx.empty_str.to_owned())")]
+        #[pyarg(any, default = Some(vm.ctx.empty_str.to_owned()))]
        isolation_level: Option<PyStrRef>,
-        #[pyarg(any, default = "true")]
+        #[pyarg(any, default = true)]
        check_same_thread: bool,
-        #[pyarg(any, default = "Connection::class(&vm.ctx).to_owned()")]
+        #[pyarg(any, default = Connection::class(&vm.ctx).to_owned())]
        factory: PyTypeRef,
        // TODO: cache statements
        #[allow(dead_code)]
-        #[pyarg(any, default = "0")]
+        #[pyarg(any, default = 0)]
        cached_statements: c_int,
-        #[pyarg(any, default = "false")]
+        #[pyarg(any, default = false)]
        uri: bool,
    }

@@ -326,13 +326,13 @@ mod _sqlite {
    struct BackupArgs {
        #[pyarg(any)]
        target: PyRef<Connection>,
-        #[pyarg(named, default = "-1")]
+        #[pyarg(named, default = -1)]
        pages: c_int,
        #[pyarg(named, optional)]
        progress: Option<ArgCallable>,
        #[pyarg(named, optional)]
        name: Option<PyStrRef>,
-        #[pyarg(named, default = "0.250")]
+        #[pyarg(named, default = 0.250)]
        sleep: f64,
    }

@@ -375,7 +375,7 @@ mod _sqlite {
        row: i64,
        #[pyarg(named, default)]
        readonly: bool,
-        #[pyarg(named, default = "vm.ctx.new_str(stringify!(main))")]
+        #[pyarg(named, default = vm.ctx.new_str("main"))]
        name: PyStrRef,
    }


diff --git a/stdlib/src/ssl.rs b/stdlib/src/ssl.rs
@@ -351,7 +351,7 @@ mod _ssl {
    #[derive(FromArgs)]
    struct Txt2ObjArgs {
        txt: PyStrRef,
-        #[pyarg(any, default = "false")]
+        #[pyarg(any, default = false)]
        name: bool,
    }


diff --git a/stdlib/src/zlib.rs b/stdlib/src/zlib.rs
@@ -74,9 +74,9 @@ mod zlib {
    struct PyFuncCompressArgs {
        #[pyarg(positional)]
        data: ArgBytesLike,
-        #[pyarg(any, default = "Level::new(Z_DEFAULT_COMPRESSION)")]
+        #[pyarg(any, default = Level::new(Z_DEFAULT_COMPRESSION))]
        level: Level,
-        #[pyarg(any, default = "ArgPrimitiveIndex { value: MAX_WBITS }")]
+        #[pyarg(any, default = ArgPrimitiveIndex { value: MAX_WBITS })]
        wbits: ArgPrimitiveIndex<i8>,
    }

@@ -269,9 +269,9 @@ mod zlib {
    struct PyFuncDecompressArgs {
        #[pyarg(positional)]
        data: ArgBytesLike,
-        #[pyarg(any, default = "ArgPrimitiveIndex { value: MAX_WBITS }")]
+        #[pyarg(any, default = ArgPrimitiveIndex { value: MAX_WBITS })]
        wbits: ArgPrimitiveIndex<i8>,
-        #[pyarg(any, default = "ArgPrimitiveIndex { value: DEF_BUF_SIZE }")]
+        #[pyarg(any, default = ArgPrimitiveIndex { value: DEF_BUF_SIZE })]
        bufsize: ArgPrimitiveIndex<usize>,
    }

@@ -299,7 +299,7 @@ mod zlib {

    #[derive(FromArgs)]
    struct DecompressobjArgs {
-        #[pyarg(any, default = "ArgPrimitiveIndex { value: MAX_WBITS }")]
+        #[pyarg(any, default = ArgPrimitiveIndex { value: MAX_WBITS })]
        wbits: ArgPrimitiveIndex<i8>,
        #[pyarg(any, optional)]
        zdict: OptionalArg<ArgBytesLike>,
@@ -450,16 +450,16 @@ mod zlib {
    #[derive(FromArgs)]
    #[allow(dead_code)] // FIXME: use args
    struct CompressobjArgs {
-        #[pyarg(any, default = "Level::new(Z_DEFAULT_COMPRESSION)")]
+        #[pyarg(any, default = Level::new(Z_DEFAULT_COMPRESSION))]
        level: Level,
        // only DEFLATED is valid right now, it's w/e
-        #[pyarg(any, default = "DEFLATED")]
+        #[pyarg(any, default = DEFLATED)]
        method: i32,
-        #[pyarg(any, default = "ArgPrimitiveIndex { value: MAX_WBITS }")]
+        #[pyarg(any, default = ArgPrimitiveIndex { value: MAX_WBITS })]
        wbits: ArgPrimitiveIndex<i8>,
-        #[pyarg(any, name = "memLevel", default = "DEF_MEM_LEVEL")]
+        #[pyarg(any, name = "memLevel", default = DEF_MEM_LEVEL)]
        mem_level: u8,
-        #[pyarg(any, default = "Z_DEFAULT_STRATEGY")]
+        #[pyarg(any, default = Z_DEFAULT_STRATEGY)]
        strategy: i32,
        #[pyarg(any, optional)]
        zdict: Option<ArgBytesLike>,

diff --git a/vm/src/anystr.rs b/vm/src/anystr.rs
@@ -10,19 +10,19 @@ use num_traits::{cast::ToPrimitive, sign::Signed};
 pub struct SplitArgs<T: TryFromObject> {
    #[pyarg(any, default)]
    sep: Option<T>,
-    #[pyarg(any, default = "-1")]
+    #[pyarg(any, default = -1)]
    maxsplit: isize,
 }

 #[derive(FromArgs)]
 pub struct SplitLinesArgs {
-    #[pyarg(any, default = "false")]
+    #[pyarg(any, default = false)]
    pub keepends: bool,
 }

 #[derive(FromArgs)]
 pub struct ExpandTabsArgs {
-    #[pyarg(any, default = "8")]
+    #[pyarg(any, default = 8)]
    tabsize: isize,
 }


diff --git a/vm/src/builtins/int.rs b/vm/src/builtins/int.rs
@@ -826,17 +826,17 @@ pub struct IntOptions {
 #[derive(FromArgs)]
 struct IntFromByteArgs {
    bytes: PyBytesInner,
-    #[pyarg(any, default = "ArgByteOrder::Big")]
+    #[pyarg(any, default = ArgByteOrder::Big)]
    byteorder: ArgByteOrder,
    #[pyarg(named, optional)]
    signed: OptionalArg<ArgIntoBool>,
 }

 #[derive(FromArgs)]
 struct IntToByteArgs {
-    #[pyarg(any, default = "1")]
+    #[pyarg(any, default = 1)]
    length: usize,
-    #[pyarg(any, default = "ArgByteOrder::Big")]
+    #[pyarg(any, default = ArgByteOrder::Big)]
    byteorder: ArgByteOrder,
    #[pyarg(named, optional)]
    signed: OptionalArg<ArgIntoBool>,

diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs
@@ -91,7 +91,7 @@ pub(crate) struct SortOptions {
    #[pyarg(named, default)]
    key: Option<PyObjectRef>,
    #[pytraverse(skip)]
-    #[pyarg(named, default = "false")]
+    #[pyarg(named, default = false)]
    reverse: bool,
 }


diff --git a/vm/src/stdlib/builtins.rs b/vm/src/stdlib/builtins.rs
@@ -663,7 +663,7 @@ mod builtins {
        sep: Option<PyStrRef>,
        #[pyarg(named, default)]
        end: Option<PyStrRef>,
-        #[pyarg(named, default = "ArgIntoBool::FALSE")]
+        #[pyarg(named, default = ArgIntoBool::FALSE)]
        flush: ArgIntoBool,
        #[pyarg(named, default)]
        file: Option<PyObjectRef>,

diff --git a/vm/src/stdlib/codecs.rs b/vm/src/stdlib/codecs.rs
@@ -109,7 +109,7 @@ mod _codecs {
        data: ArgBytesLike,
        #[pyarg(positional, optional)]
        errors: Option<PyStrRef>,
-        #[pyarg(positional, default = "false")]
+        #[pyarg(positional, default = false)]
        final_decode: bool,
    }