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
91b5eca5
Commit
91b5eca5
authored
Dec 16, 2012
by
Stefan Krah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #15783: Support None default values in the Context() constructor.
parent
66494d6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
30 deletions
+54
-30
Lib/test/test_decimal.py
Lib/test/test_decimal.py
+21
-0
Modules/_decimal/_decimal.c
Modules/_decimal/_decimal.c
+33
-30
No files found.
Lib/test/test_decimal.py
View file @
91b5eca5
...
...
@@ -2718,6 +2718,27 @@ class PyPythonAPItests(PythonAPItests):
class
ContextAPItests
(
unittest
.
TestCase
):
def
test_none_args
(
self
):
Context
=
self
.
decimal
.
Context
InvalidOperation
=
self
.
decimal
.
InvalidOperation
DivisionByZero
=
self
.
decimal
.
DivisionByZero
Overflow
=
self
.
decimal
.
Overflow
ROUND_HALF_EVEN
=
self
.
decimal
.
ROUND_HALF_EVEN
c1
=
Context
()
c2
=
Context
(
prec
=
None
,
rounding
=
None
,
Emax
=
None
,
Emin
=
None
,
capitals
=
None
,
clamp
=
None
,
flags
=
None
,
traps
=
None
)
for
c
in
[
c1
,
c2
]:
self
.
assertEqual
(
c
.
prec
,
28
)
self
.
assertEqual
(
c
.
rounding
,
ROUND_HALF_EVEN
)
self
.
assertEqual
(
c
.
Emax
,
999999
)
self
.
assertEqual
(
c
.
Emin
,
-
999999
)
self
.
assertEqual
(
c
.
capitals
,
1
)
self
.
assertEqual
(
c
.
clamp
,
0
)
assert_signals
(
self
,
c
,
'flags'
,
[])
assert_signals
(
self
,
c
,
'traps'
,
[
InvalidOperation
,
DivisionByZero
,
Overflow
])
def
test_pickle
(
self
):
Context
=
self
.
decimal
.
Context
...
...
Modules/_decimal/_decimal.c
View file @
91b5eca5
...
...
@@ -1241,50 +1241,53 @@ context_init(PyObject *self, PyObject *args, PyObject *kwds)
"prec"
,
"rounding"
,
"Emin"
,
"Emax"
,
"capitals"
,
"clamp"
,
"flags"
,
"traps"
,
NULL
};
PyObject
*
rounding
=
NULL
;
PyObject
*
traps
=
NULL
;
PyObject
*
status
=
NULL
;
mpd_context_t
*
ctx
,
t
;
int
capitals
=
1
;
PyObject
*
prec
=
Py_None
;
PyObject
*
rounding
=
Py_None
;
PyObject
*
emin
=
Py_None
;
PyObject
*
emax
=
Py_None
;
PyObject
*
capitals
=
Py_None
;
PyObject
*
clamp
=
Py_None
;
PyObject
*
status
=
Py_None
;
PyObject
*
traps
=
Py_None
;
int
ret
;
assert
(
PyTuple_Check
(
args
));
ctx
=
CTX
(
self
);
t
=
*
ctx
;
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwds
,
"|nOnniiOO"
,
kwlist
,
&
t
.
prec
,
&
rounding
,
&
t
.
emin
,
&
t
.
emax
,
&
capitals
,
&
t
.
clamp
,
&
status
,
&
traps
"|OOOOOOOO"
,
kwlist
,
&
prec
,
&
rounding
,
&
emin
,
&
emax
,
&
capitals
,
&
clamp
,
&
status
,
&
traps
))
{
return
-
1
;
}
if
(
rounding
!=
NULL
)
{
t
.
round
=
getround
(
rounding
);
if
(
t
.
round
<
0
)
{
return
-
1
;
}
}
if
(
!
mpd_qsetprec
(
ctx
,
t
.
prec
)
||
!
mpd_qsetemin
(
ctx
,
t
.
emin
)
||
!
mpd_qsetemax
(
ctx
,
t
.
emax
)
||
!
mpd_qsetclamp
(
ctx
,
t
.
clamp
)
)
{
return
value_error_int
(
"invalid context"
)
;
if
(
prec
!=
Py_None
&&
context_setprec
(
self
,
prec
,
NULL
)
<
0
)
{
return
-
1
;
}
if
(
emin
!=
Py_None
&&
context_setemin
(
self
,
emin
,
NULL
)
<
0
)
{
return
-
1
;
}
if
(
!
mpd_qsetround
(
ctx
,
t
.
round
)
||
!
mpd_qsettraps
(
ctx
,
t
.
traps
)
||
!
mpd_qsetstatus
(
ctx
,
t
.
status
))
{
return
type_error_int
(
"invalid context"
);
if
(
emax
!=
Py_None
&&
context_setemax
(
self
,
emax
,
NULL
)
<
0
)
{
return
-
1
;
}
if
(
capitals
!=
Py_None
&&
context_setcapitals
(
self
,
capitals
,
NULL
)
<
0
)
{
return
-
1
;
}
if
(
clamp
!=
Py_None
&&
context_setclamp
(
self
,
clamp
,
NULL
)
<
0
)
{
return
-
1
;
}
if
(
capitals
!=
0
&&
capitals
!=
1
)
{
return
value_error_int
(
"invalid context"
);
if
(
rounding
!=
Py_None
)
{
int
x
=
getround
(
rounding
);
if
(
x
<
0
)
{
return
-
1
;
}
if
(
!
mpd_qsetround
(
CTX
(
self
),
x
))
{
return
type_error_int
(
invalid_rounding_err
);
}
}
CtxCaps
(
self
)
=
capitals
;
if
(
traps
!=
NULL
)
{
if
(
traps
!=
Py_None
)
{
if
(
PyList_Check
(
traps
))
{
ret
=
context_settraps_list
(
self
,
traps
);
}
...
...
@@ -1300,7 +1303,7 @@ context_init(PyObject *self, PyObject *args, PyObject *kwds)
return
ret
;
}
}
if
(
status
!=
NULL
)
{
if
(
status
!=
Py_None
)
{
if
(
PyList_Check
(
status
))
{
ret
=
context_setstatus_list
(
self
,
status
);
}
...
...
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