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
1dabdb25
Commit
1dabdb25
authored
Feb 02, 2008
by
Mark Dickinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
parent
5a6cfee6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
Lib/rational.py
Lib/rational.py
+12
-3
Lib/test/test_rational.py
Lib/test/test_rational.py
+6
-0
No files found.
Lib/rational.py
View file @
1dabdb25
...
...
@@ -25,9 +25,18 @@ def gcd(a, b):
return
a
_RATIONAL_FORMAT
=
re
.
compile
(
r'^\
s*(?P<sig
n>[-+]?)(?P<num>\
d+)
'
r'
(
?
:
/
(
?
P
<
denom
>
\
d
+
)
|
\
.(
?
P
<
decimal
>
\
d
+
))
?
\
s
*
$
')
_RATIONAL_FORMAT
=
re
.
compile
(
r"""
\
A
\s* # optional whitespace at the start, then
(?P<sign>[-+]?) # an optional sign, then
(?=\
d|
\.\
d) # look
ahead for digit or .digit
(?P<num>\
d*) #
numerator (possibly empty)
(?: # followed by an optional
/(?P<denom>\
d+) # /
and denominator
| # or
\
.(?P<decim
al>\
d*) # decim
al point and fractional part
)?
\
s*
\Z # and optional whitespace to finish
"""
,
re
.
VERBOSE
)
class
Rational
(
RationalAbc
):
...
...
Lib/test/test_rational.py
View file @
1dabdb25
...
...
@@ -78,6 +78,8 @@ class RationalTest(unittest.TestCase):
self
.
assertEquals
((
16
,
5
),
_components
(
R
(
" 3.2 "
)))
self
.
assertEquals
((
-
16
,
5
),
_components
(
R
(
u" -3.2 "
)))
self
.
assertEquals
((
-
3
,
1
),
_components
(
R
(
u" -3. "
)))
self
.
assertEquals
((
3
,
5
),
_components
(
R
(
u" .6 "
)))
self
.
assertRaisesMessage
(
...
...
@@ -113,6 +115,10 @@ class RationalTest(unittest.TestCase):
# Don't accept combinations of decimals and rationals.
ValueError
,
"Invalid literal for Rational: 3.2/7"
,
R
,
"3.2/7"
)
self
.
assertRaisesMessage
(
# Allow 3. and .3, but not .
ValueError
,
"Invalid literal for Rational: ."
,
R
,
"."
)
def
testImmutable
(
self
):
r
=
R
(
7
,
3
)
...
...
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