@yuja: you wanted separate commits, you got separate commits. :-)

This would need more thought then; the evolve/topic/topicmap codebase wraps the whole branchmap.branchcache class and mucks about with a context manager to re-instate the right name in the branchmap globals so super() doesn't break, which is what led to this patch.

The goal of this refactor is to bring clarity to the branchmap cache behaviour, and to make it easier to add performance improvements (in an upcoming additional series of patches).

In D5064#78545, @av6 wrote:

I look at the changes and see nitpicks at best. On the one hand, black proved better than any linter that we can already write consistent code. On the other, if black were a linter... I'd switch to flake8, which at least is configurable.

This was split out from D5064 (cc @indygreg )

Note: I undid the change to mercurial/thirdparty/zope/interface/_compat.py as it should not have been changed to begin with.

The import parentheses collapsing is described here: https://github.com/ambv/black#parentheses. The behavior is not configurable.

Agreed on all points. The following update makes these changes, and in addition:

This no longer applies.