Skip to content

bpo-33073: Adding as_integer_ratio to ints. #8750

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.

Sign up for GitHub

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

Merged
rhettinger merged 18 commits into from
Sep 14, 2018
Merged

bpo-33073: Adding as_integer_ratio to ints. #8750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ff0790e
bpo:33073 adding as_integer_ratio to ints.
lisroach Aug 12, 2018
d1daadc
Updates as_integer_ratio to be one line.
lisroach Aug 16, 2018
3b89b6f
Adds ;, fixes spacing.
lisroach Aug 22, 2018
48c7dd0
Update test_doctest expected output to include builtins.int.as_intege…
mdickinson Aug 25, 2018
4ca566a
Regenerate clinic files.
mdickinson Aug 25, 2018
2336cb4
Rewrap text to keep within the line length limit.
mdickinson Aug 25, 2018
673a0ca
One more test_doctest fix.
mdickinson Aug 25, 2018
5102589
Add 'what's new' entry.
mdickinson Aug 25, 2018
a935a7b
Add Misc/ACKS entry.
mdickinson Aug 25, 2018
3cd076c
Adds boolean support.
lisroach Sep 10, 2018
028417a
Merge branch 'iss_33073' of https://github.com/lisroach/cpython into …
lisroach Sep 10, 2018
2028d97
Handles subclasses more smoothly. Adds unit tests.
lisroach Sep 13, 2018
89a0d9d
Fixes docstring and doc format.
lisroach Sep 13, 2018
148225c
Regenerates argument clinic.
lisroach Sep 13, 2018
ac0f11f
Move whatsnew entry to resolve a merge conflict
rhettinger Sep 14, 2018
cb9c978
Restored bogus whitespace redaction
rhettinger Sep 14, 2018
d311b83
Updates the function call. Fixes tests.
lisroach Sep 14, 2018
d3ef843
Fixing failing Travis build.
lisroach Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Handles subclasses more smoothly. Adds unit tests.
  • Loading branch information
@lisroach
lisroach committed Sep 13, 2018
commit 2028d976241a537b04bdba036c4811a205ec0d1e
19 changes: 19 additions & 0 deletions Lib/test/test_long.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import sys

import enum
import random
import math
import array
Expand Down Expand Up @@ -1357,9 +1358,27 @@ def test_as_integer_ratio(self):
self.assertIsInstance(numerator, int)
self.assertIsInstance(denominator, int)

def test_as_integer_ratio_maxint(self):
x = sys.maxsize + 1
self.assertEqual(x.as_integer_ratio()[0], x)

def test_as_integer_ratio_bool(self):
self.assertEqual(True.as_integer_ratio(), (1, 1))
self.assertEqual(False.as_integer_ratio(), (0, 1))
assert(type(True.as_integer_ratio()[0]) == int)
assert(type(False.as_integer_ratio()[0]) == int)

def test_as_integer_ratio_int_enum(self):
class Foo(enum.IntEnum):
X = 42
self.assertEqual(Foo.X.as_integer_ratio(), (42, 1))
assert(type(Foo.X.as_integer_ratio()[0] == int))
Copy link
Copy Markdown
Contributor

@rhettinger rhettinger Sep 13, 2018

Choose a reason for hiding this comment

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

This should be: self.assertEqual(type(Foo.X.as_integer_ratio()[0], int). Unittest doesn't use assertion statements.


def test_as_integer_ratio_int_flag(self):
class Foo(enum.IntFlag):
R = 1 << 2
self.assertEqual(Foo.R.as_integer_ratio(), (4, 1))
assert(type(Foo.R.as_integer_ratio()[0]) == int)



Expand Down
12 changes: 7 additions & 5 deletions Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5282,11 +5282,13 @@ static PyObject *
int_as_integer_ratio_impl(PyObject *self)
/*[clinic end generated code: output=e60803ae1cc8621a input=c1aea0aa6fb85c28]*/
{
if (self == Py_True)
return PyTuple_Pack(2, _PyLong_One, _PyLong_One);
if (self == Py_False)
return PyTuple_Pack(2, _PyLong_Zero, _PyLong_One);
return PyTuple_Pack(2, self, _PyLong_One);
if PyLong_CheckExact(self)
return PyTuple_Pack(2, self, _PyLong_One);
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka Aug 25, 2018

Choose a reason for hiding this comment

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

True.as_integer_ratio() will return (True, 1). It should return (1, 1).

Copy link
Copy Markdown
Member

@mdickinson mdickinson Aug 25, 2018

Choose a reason for hiding this comment

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

Hmm; good point. There's a precedent here in the form of True.numerator, which returns 1.

else {
PyObject *temp = PyNumber_Positive(self);
Copy link
Copy Markdown
Contributor

@rhettinger rhettinger Sep 13, 2018

Choose a reason for hiding this comment

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

We need another way to do this. The intent of this code is to construct a regular integer instance from an instance of an int subclass. The problem with PyNumber_Positive() is that the subclass can itself define pos() to return something other than an exact int. Elsewhere, we use _PyLong_Copy for this purpose.

Copy link
Copy Markdown
Contributor

@eric-wieser eric-wieser Sep 14, 2018

Choose a reason for hiding this comment

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

Is there a reason why PyNumber_Index does not call _PyLong_Copy?

Py_DECREF(temp);
Copy link
Copy Markdown
Contributor

@rhettinger rhettinger Sep 13, 2018

Choose a reason for hiding this comment

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

The DECREF needs to occur after building the tuple; otherwise, the Python integer object can (and likely will) disappear before it gets used.

return PyTuple_Pack(2, temp, _PyLong_One);
}
Comment thread
rhettinger marked this conversation as resolved.
}

/*[clinic input]
Expand Down