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
02ec289f
Commit
02ec289f
authored
Jan 16, 2008
by
Thomas Heller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Raise a TypeError if conflicting positional and named arguments are
passed to a Structure or Union constructor.
parent
902d3075
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
0 deletions
+27
-0
Lib/ctypes/test/test_structures.py
Lib/ctypes/test/test_structures.py
+9
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_ctypes/_ctypes.c
Modules/_ctypes/_ctypes.c
+15
-0
No files found.
Lib/ctypes/test/test_structures.py
View file @
02ec289f
...
...
@@ -215,6 +215,15 @@ class StructureTestCase(unittest.TestCase):
# too long
self
.
assertRaises
(
ValueError
,
Person
,
"1234567"
,
5
)
def
test_conflicting_initializers
(
self
):
class
POINT
(
Structure
):
_fields_
=
[(
"x"
,
c_int
),
(
"y"
,
c_int
)]
# conflicting positional and keyword args
self
.
assertRaises
(
TypeError
,
POINT
,
2
,
3
,
x
=
4
)
self
.
assertRaises
(
TypeError
,
POINT
,
2
,
3
,
y
=
4
)
# Should this raise TypeError instead?
self
.
assertRaises
(
ValueError
,
POINT
,
2
,
3
,
4
)
def
test_keyword_initializers
(
self
):
class
POINT
(
Structure
):
...
...
Misc/NEWS
View file @
02ec289f
...
...
@@ -364,6 +364,9 @@ Core and builtins
Library
-------
- Issue #1831: ctypes now raises a TypeError if conflicting positional
and named arguments are passed to a Structure or Union initializer.
- Convert the internal ctypes array type cache to a WeakValueDict so
that array types do not live longer than needed.
...
...
Modules/_ctypes/_ctypes.c
View file @
02ec289f
...
...
@@ -3578,6 +3578,21 @@ Struct_init(PyObject *self, PyObject *args, PyObject *kwds)
return
IBUG
(
"_fields_[i][0] failed"
);
}
if
(
kwds
&&
PyDict_GetItem
(
kwds
,
name
))
{
char
*
field
=
PyString_AsString
(
name
);
if
(
field
==
NULL
)
{
PyErr_Clear
();
field
=
"???"
;
}
PyErr_Format
(
PyExc_TypeError
,
"duplicate values for field %s"
,
field
);
Py_DECREF
(
pair
);
Py_DECREF
(
name
);
Py_DECREF
(
fields
);
return
-
1
;
}
val
=
PyTuple_GET_ITEM
(
args
,
i
);
if
(
-
1
==
PyObject_SetAttr
(
self
,
name
,
val
))
{
Py_DECREF
(
pair
);
...
...
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