Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Refix for pyparsing compat.#21501

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
jklymak merged 1 commit intomatplotlib:mainfromanntzer:p3b
Nov 14, 2021
Merged

Refix for pyparsing compat.#21501

jklymak merged 1 commit intomatplotlib:mainfromanntzer:p3b
Nov 14, 2021

Conversation

anntzer
Copy link
Contributor

@anntzeranntzer commentedOct 29, 2021
edited
Loading

PR Summary

cf#21489 (comment) (@ptmcg I'm not super certain about the expected semantics, but the need to explicitly skip whitespace herelooks like a bug to me?)

For master, I think#21448 also fixes that.

PR Checklist

  • Has pytest style unit tests (andpytest passes).
  • IsFlake 8 compliant (runflake8 on changed files to check).
  • New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).
  • Conforms to Matplotlib style conventions (installflake8-docstrings and runflake8 --docstring-convention=all).
  • New features have an entry indoc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented indoc/api/next_api_changes/ (follow instructions in README.rst there).

@anntzeranntzer added this to thev3.5.0 milestoneOct 29, 2021
@@ -2060,6 +2060,7 @@ def __init__(self):
p.accent <<= Group(
Suppress(p.bslash)
+ oneOf([*self._accent_map, *self._wide_accents])
+ Suppress(Optional(White()))
Copy link

@ptmcgptmcgOct 29, 2021
edited
Loading

Choose a reason for hiding this comment

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

If the code is not working without this explicit whitespace-skipping, that is a pyparsing bug. Since you have made it Optional, then this won't break once the pyparsing bug is fixed. (You can also - or at leastshould be able to - useEmpty() as a synonym forSuppress(Optional(White()))

Choose a reason for hiding this comment

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

Ok. Thereis a bug in pyparsing, but fixing it doesn't completely solve your problem.

What is the purpose ofleaveWhitespace() here?

    p.symbol        <<= (p.single_symbol | p.symbol_name).leaveWhitespace()

It looks like this is the only element inp.placeable that suppresses whitespace-skipping. The new code detects this and instead of doing whitespace-skipping before theMatchFirst, it doesn't do whitespace-skipping, relying on all the separate elements to do it themselves (this is the performance optimization - if all the alternatives will want whitespace to be skipped, theMatchFirstwill do it once, and then all the alternatives get a pass). Sincep.symbol suppresses whitespace-skipping, and so makesp.placeable suppress whitespace-skipping, then when it is time to matchp.symbol, the leading space has not been skipped, and so it fails.

So:

  • I need to fix the bug in pyparsing - this will be in 3.0.4, which I will push out this evening.

  • This is another pyparsingimprovement that needs to be documented in the "stuff that has changed for the better, but may affect your code" - I'll add that information in 3.0.4 also.

  • Please revisit why you need to haveleaveWhitespace() onp.symbol.

    If it is required, then I think you could remove theSuppress(Optional(White())) fromp.accent, and instead change thep.symbol usage inp.placeable to:

      | Empty() + p.symbol  # Must be third to catch all named symbols and single

    (I tested this in my minimal repro example and that works.)
    But ideally, you could just remove the call toleaveWhitespace().

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

Agreed that removing leaveWhitespace seems to work; looking at the git history it seems to be a historical artefact of the times when symbol and symbol_name were not split, and was used for symbol_name.

@jklymakjklymak modified the milestones:v3.5.0,v3.5.1Nov 11, 2021
@tacaswelltacaswell modified the milestones:v3.5.1,v3.5.0Nov 11, 2021
@tacaswelltacaswell added the Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. labelNov 11, 2021
Copy link
Member

@jklymakjklymak left a comment

Choose a reason for hiding this comment

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

@anntzer are you in agreement that this should go in as-is and be back ported per@tacaswell analysis in#21606?

@anntzer
Copy link
ContributorAuthor

Yes per#21606 (comment).

@jklymakjklymak merged commit1127632 intomatplotlib:mainNov 14, 2021
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull requestNov 14, 2021
@anntzeranntzer deleted the p3b branchNovember 14, 2021 20:41
timhoffm added a commit that referenced this pull requestNov 14, 2021
…501-on-v3.5.xBackport PR#21501 on branch v3.5.x (Refix for pyparsing compat.)
tacaswell added a commit to tacaswell/matplotlib that referenced this pull requestApr 1, 2022
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@ptmcgptmcgptmcg left review comments

@tacaswelltacaswelltacaswell approved these changes

@jklymakjklymakjklymak approved these changes

Assignees
No one assigned
Labels
Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.topic: text/mathtext
Projects
None yet
Milestone
v3.5.0
Development

Successfully merging this pull request may close these issues.

4 participants
@anntzer@tacaswell@ptmcg@jklymak

[8]ページ先頭

©2009-2025 Movatter.jp