Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
fec6620d
Commit
fec6620d
authored
Nov 13, 2010
by
Mark Dickinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Fraction(-1).__hash__() return -2 rather than -1 (see issue 10356).
parent
24854cac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
Lib/fractions.py
Lib/fractions.py
+3
-6
Lib/test/test_fractions.py
Lib/test/test_fractions.py
+3
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/fractions.py
View file @
fec6620d
...
...
@@ -528,12 +528,8 @@ class Fraction(numbers.Rational):
return
Fraction
(
round
(
self
/
shift
)
*
shift
)
def
__hash__
(
self
):
"""hash(self)
"""hash(self)
"""
Tricky because values that are exactly representable as a
float must have the same hash as that float.
"""
# XXX since this method is expensive, consider caching the result
# In order to make sure that the hash of a Fraction agrees
...
...
@@ -550,7 +546,8 @@ class Fraction(numbers.Rational):
hash_
=
_PyHASH_INF
else
:
hash_
=
abs
(
self
.
_numerator
)
*
dinv
%
_PyHASH_MODULUS
return
hash_
if
self
>=
0
else
-
hash_
result
=
hash_
if
self
>=
0
else
-
hash_
return
-
2
if
result
==
-
1
else
result
def
__eq__
(
a
,
b
):
"""a == b"""
...
...
Lib/test/test_fractions.py
View file @
fec6620d
...
...
@@ -546,6 +546,9 @@ class FractionTest(unittest.TestCase):
self
.
assertEquals
(
hash
(
2.5
),
hash
(
F
(
5
,
2
)))
self
.
assertEquals
(
hash
(
10
**
50
),
hash
(
F
(
10
**
50
)))
self
.
assertNotEquals
(
hash
(
float
(
10
**
23
)),
hash
(
F
(
10
**
23
)))
# Check that __hash__ produces the same value as hash(), for
# consistency with int and Decimal. (See issue #10356.)
self
.
assertEquals
(
hash
(
F
(
-
1
)),
F
(
-
1
).
__hash__
())
def
testApproximatePi
(
self
):
# Algorithm borrowed from
...
...
Misc/NEWS
View file @
fec6620d
...
...
@@ -63,6 +63,9 @@ Core and Builtins
Library
-------
- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See
also issue #10356.)
- Issue #4471: Add the IMAP.starttls() method to enable encryption on
standard IMAP4 connections. Original patch by Lorenzo M. Catucci.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment