PR Summary

Change the parameter nameannotate(text, ...) back toannotate(s, ...) (was introduced in#10830).

Fixes#12325.

Not sure if it's ok to go back straight. IMO, it's rather uncommon to pass this param as kwarg. But technically, that's an API change again. If people have adapted fors -> text in 3.0, they would have to adapt back again.

Possible alternative

Generally, I'd rather have descriptive argument names such astext ortitle instead ofs. However, I'm learning to be more careful with API changes and these things would have to go through a deprecation mechanism with a transition phase of allowing both. If there is a general approval to migrate parameter names in such a way, I can apply the mechanism here and just adds back in as a fallback (including changing the originalAnnotation class as well.

Note: Thinking about it, a transition mechanism is technically possible, however a bit complicated. We would have to support:

• annotate('text', xy)
• annotate(s='text', xy=xy)
• annotate(text='text', xy=xy)

which would require

def annotate(self, text=None, xy=None, ..., s=None):"""annotate(self, text, xy, ...)"""# merge text and s# check that xy is not None