GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Allow #[pyexception] on module attr by youknowone · Pull Request #6218 · RustPython/RustPython

Allow #[pyexception] on module attr #6218

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.

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

youknowone merged 2 commits into RustPython:main from youknowone:pyexcetion

Oct 27, 2025

Uh oh!

There was an error while loading. Please reload this page.

Merged

Allow #[pyexception] on module attr #6218

Show file tree

Hide file tree

Changes from 1 commit

Commits

Show all changes

2 commits

Select commit Hold shift + click to select a range

c8ff4b9

Expand #[pyexception] macro working with module attr

youknowone Oct 26, 2025

ded211d

pyssl errors

youknowone Oct 26, 2025

File filter

Filter by extension .rs (3) All 1 file type selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

Next commit

Expand #[pyexception] macro working with module attr

Loading branch information

Uh oh!

There was an error while loading. Please reload this page.

youknowone committed Oct 26, 2025

commit c8ff4b9903009291b1e5eee5489baf7ab95b84d9

There are no files selected for viewing

8 changes: 7 additions & 1 deletion 8 derive-impl/src/pyclass.rs

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -551,7 +551,13 @@ pub(crate) fn impl_pyexception(attr: PunctuatedNestedMeta, item: Item) -> Result
		}
		}
		} else {
		quote! {}
		quote! {
		impl ::rustpython_vm::PyPayload for #ident {
		fn class(_ctx: &::rustpython_vm::vm::Context) -> &'static ::rustpython_vm::Py<::rustpython_vm::builtins::PyType> {
		<Self as ::rustpython_vm::class::StaticType>::static_type()
		}
		}
		}
		};
		let impl_pyclass = if class_meta.has_impl()? {
		quote! {
Expand Down

10 changes: 7 additions & 3 deletions 10 derive-impl/src/pymodule.rs

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@ enum AttrName {
		Function,
		Attr,
		Class,
		Exception,
		}

		impl std::fmt::Display for AttrName {
Expand All		@@ -24,6 +25,7 @@ impl std::fmt::Display for AttrName {
		Self::Function => "pyfunction",
		Self::Attr => "pyattr",
		Self::Class => "pyclass",
		Self::Exception => "pyexception",
		};
		s.fmt(f)
		}
Expand All		@@ -37,6 +39,7 @@ impl FromStr for AttrName {
		"pyfunction" => Self::Function,
		"pyattr" => Self::Attr,
		"pyclass" => Self::Class,
		"pyexception" => Self::Exception,
		s => {
		return Err(s.to_owned());
		}
Expand Down Expand Up		@@ -232,7 +235,8 @@ fn module_item_new(
		inner: ContentItemInner { index, attr_name },
		py_attrs,
		}),
		AttrName::Class => Box::new(ClassItem {
		// pyexception is treated like pyclass - both define types
		AttrName::Class \| AttrName::Exception => Box::new(ClassItem {
		inner: ContentItemInner { index, attr_name },
		py_attrs,
		}),
Expand Down Expand Up		@@ -302,13 +306,13 @@ where
		result.push(item_new(i, attr_name, Vec::new()));
		} else {
		match attr_name {
		AttrName::Class \| AttrName::Function => {
		AttrName::Class \| AttrName::Function \| AttrName::Exception => {
		result.push(item_new(i, attr_name, py_attrs.clone()));
		}
		_ => {
		bail_span!(
		attr,
		"#[pyclass] or #[pyfunction] only can follow #[pyattr]",
		"#[pyclass], #[pyfunction], or #[pyexception] can follow #[pyattr]",
		)
		}
		}
Expand Down

3 changes: 2 additions & 1 deletion 3 derive-impl/src/util.rs

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -446,7 +446,8 @@ impl ClassItemMeta {
		pub(crate) struct ExceptionItemMeta(ClassItemMeta);

		impl ItemMeta for ExceptionItemMeta {
		const ALLOWED_NAMES: &'static [&'static str] = &["name", "base", "unhashable", "ctx", "impl"];
		const ALLOWED_NAMES: &'static [&'static str] =
		&["module", "name", "base", "unhashable", "ctx", "impl"];

		fn from_inner(inner: ItemMetaInner) -> Self {
		Self(ClassItemMeta(inner))
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.