Skip to content
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

module: fix decorator multiple-use inconsistency #1632

Merged
merged 3 commits into from
Sep 1, 2019

Conversation

Exirel
Copy link
Contributor

@Exirel Exirel commented May 30, 2019

Not much to say: fix [main part of] #1619

(editorial by @dgw so GH won't close the other issue)

@Exirel Exirel added the Tweak label May 30, 2019
@Exirel Exirel added this to the 7.0.0 milestone May 30, 2019
@Exirel Exirel requested a review from dgw May 30, 2019 23:10
Copy link
Member

@dgw dgw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I nitpicked grammar per usual, but there are some other things in here.

Notably, I did not review the tests yet. (My Sopel bot will remind me to look at them tomorrow.)

I'm also looking at the fix for what started this whole thing—the @url decorator—and wondering if we can't support multiple decorations without adding extra stack frames. Since, as I understand it, each additional time @url is called, it will wrap a new helper() around the previous one(s).

Happy to be wrong about that, but if I am reading it right I'd like to find a more efficient way to achieve the same goal than nested wrapper functions.

sopel/module.py Outdated Show resolved Hide resolved
sopel/module.py Outdated Show resolved Hide resolved
sopel/module.py Outdated Show resolved Hide resolved
sopel/module.py Outdated Show resolved Hide resolved
Exirel added 2 commits May 31, 2019 09:49
These decorators can be properly called many times, with many
arguments:

* rule
* url
* commands
* nickname_commands
@Exirel Exirel force-pushed the decorator-consistency branch from 524a5a2 to 3a7d25e Compare May 31, 2019 07:49
@Exirel
Copy link
Contributor Author

Exirel commented May 31, 2019

I'm [...] wondering if we can't support multiple decorations without adding extra stack frames.

We can. I wanted to be sure that it worked first, and I'm glad you could review this first. I'll work on that next.

@Exirel
Copy link
Contributor Author

Exirel commented May 31, 2019

@dgw done

Copy link
Member

@dgw dgw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked over the tests before my Sopel bot even reminded me to! 👍

Having reviewed the diff of the third commit (removing the wrapper from @url decorated functions), and seeing that the new tests for @url pass, I say we're good, after taking a pass through loader and bot for good measure to check how url_regex is handled.

@dgw dgw merged commit 0b2c08b into sopel-irc:master Sep 1, 2019
dgw referenced this pull request Sep 2, 2019
currency: switched crypto api and combined rates to allow cross-lookup
@Exirel Exirel deleted the decorator-consistency branch September 5, 2019 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants