Skip to content

Conversation

@skirpichev
Copy link
Member

@skirpichevskirpichev commented May 28, 2021

@mdickinsonmdickinson self-requested a review May 28, 2021 14:56
denom = m.group('denom')
if denom:
denominator = int(denom)
denominator = m.group('den')
Copy link
Member

Choose a reason for hiding this comment

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

I'd suggest reverting this set of changes; IIUC they're not needed for this PR, and I don't see any particular advantage to the rename. (In fact, I prefer the version where we don't have the same local name referring to both a string and an int.)

Copy link
MemberAuthor

@skirpichevskirpichevMay 30, 2021

Choose a reason for hiding this comment

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

I don't see any particular advantage to the rename.

Naming of patterns seems to be more consistent in this case: num/den vs num/denom.

But you are right, this is not related to the PR. I'll revert.

I prefer the version where we don't have the same local name referring to both a string and an int

I don't think there are. We have den/denom for strings and denominator - which is an integer.

This patch may be better:

diff --git a/Lib/fractions.py b/Lib/fractions.py index 180cd94c28..1268b6bd27 100644 --- a/Lib/fractions.py+++ b/Lib/fractions.py@@ -26,7 +26,7 @@ (?=\d|\.\d) # lookahead for digit or .digit (?P<num>\d*|\d+(_\d+)*) # numerator (possibly empty) (?: # followed by - (?:/(?P<denom>\d+(_\d+)*))? # an optional denominator+ (?:/(?P<den>\d+(_\d+)*))? # an optional denominator | # or (?:\.(?P<decimal>d*|\d+(_\d+)*))? # an optional fractional part (?:E(?P<exp>[-+]?\d+(_\d+)*))? # and optional exponent @@ -115,9 +115,9 @@ def __new__(cls, numerator=0, denominator=None, *, _normalize=True): raise ValueError('Invalid literal for Fraction: %r' % numerator) numerator = int(m.group('num') or '0') - denom = m.group('denom')- if denom:- denominator = int(denom)+ den = m.group('den')+ if den:+ denominator = int(den) else: denominator = 1 decimal = m.group('decimal')

@skirpichev
Copy link
MemberAuthor

Artifact uploading failure seems to be unrelated.

Copy link
Member

@mdickinsonmdickinson left a comment

Choose a reason for hiding this comment

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

Thanks for the updates. LGTM! Please could you add a doc update? I think we need a .. versionchanged entry in the main docs, and a what's new entry.

@skirpichev
Copy link
MemberAuthor

Please could you add a doc update? I think we need a .. versionchanged entry in the main docs, and a what's new entry.

I did. Lets see how it's...

Copy link
Member

@mdickinsonmdickinson left a comment

Choose a reason for hiding this comment

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

LGTM. One suggestion for rewording the .. versionchanged note.

@skirpichev
Copy link
MemberAuthor

skirpichev commented May 31, 2021 via email

@mdickinsonmdickinson merged commit 89e50ab into python:mainJun 7, 2021
@skirpichevskirpichev deleted the fix-44258 branch June 7, 2021 07:19
@skirpichev
Copy link
MemberAuthor

Oh, next time warn me about merging: commit message was a bit messy. If I did expect that - I would did rebase after every commit in the pr histoiry.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@skirpichev@mdickinson@the-knights-who-say-ni@bedevere-bot