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
4e81296b
Commit
4e81296b
authored
May 16, 2018
by
Eric V. Smith
Committed by
GitHub
May 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-33536: Validate make_dataclass() field names. (GH-6906)
parent
5db5c066
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
182 additions
and
108 deletions
+182
-108
Lib/dataclasses.py
Lib/dataclasses.py
+15
-0
Lib/test/test_dataclasses.py
Lib/test/test_dataclasses.py
+165
-108
Misc/NEWS.d/next/Library/2018-05-16-10-07-40.bpo-33536._s0TE8.rst
...S.d/next/Library/2018-05-16-10-07-40.bpo-33536._s0TE8.rst
+2
-0
No files found.
Lib/dataclasses.py
View file @
4e81296b
...
...
@@ -3,6 +3,7 @@ import sys
import
copy
import
types
import
inspect
import
keyword
__all__
=
[
'dataclass'
,
'field'
,
...
...
@@ -1100,6 +1101,9 @@ def make_dataclass(cls_name, fields, *, bases=(), namespace=None, init=True,
# Copy namespace since we're going to mutate it.
namespace
=
namespace
.
copy
()
# While we're looking through the field names, validate that they
# are identifiers, are not keywords, and not duplicates.
seen
=
set
()
anns
=
{}
for
item
in
fields
:
if
isinstance
(
item
,
str
):
...
...
@@ -1110,6 +1114,17 @@ def make_dataclass(cls_name, fields, *, bases=(), namespace=None, init=True,
elif
len
(
item
)
==
3
:
name
,
tp
,
spec
=
item
namespace
[
name
]
=
spec
else
:
raise
TypeError
(
f'Invalid field:
{
item
!
r
}
'
)
if
not
isinstance
(
name
,
str
)
or
not
name
.
isidentifier
():
raise
TypeError
(
f'Field names must be valid identifers:
{
name
!
r
}
'
)
if
keyword
.
iskeyword
(
name
):
raise
TypeError
(
f'Field names must not be keywords:
{
name
!
r
}
'
)
if
name
in
seen
:
raise
TypeError
(
f'Field name duplicated:
{
name
!
r
}
'
)
seen
.
add
(
name
)
anns
[
name
]
=
tp
namespace
[
'__annotations__'
]
=
anns
...
...
Lib/test/test_dataclasses.py
View file @
4e81296b
This diff is collapsed.
Click to expand it.
Misc/NEWS.d/next/Library/2018-05-16-10-07-40.bpo-33536._s0TE8.rst
0 → 100644
View file @
4e81296b
dataclasses.make_dataclass now checks for invalid field names and duplicate
fields. Also, added a check for invalid field specifications.
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