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
e3685fd5
Commit
e3685fd5
authored
Oct 28, 2018
by
Raymond Hettinger
Committed by
GitHub
Oct 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-34160: Preserve user specified order of Element attributes (GH-10163)
parent
18d57b4d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
1 deletion
+30
-1
Doc/library/xml.etree.elementtree.rst
Doc/library/xml.etree.elementtree.rst
+8
-0
Lib/test/test_xml_etree.py
Lib/test/test_xml_etree.py
+20
-0
Lib/xml/etree/ElementTree.py
Lib/xml/etree/ElementTree.py
+1
-1
Misc/NEWS.d/next/Library/2018-10-27-21-11-42.bpo-34160.UzyPZf.rst
...S.d/next/Library/2018-10-27-21-11-42.bpo-34160.UzyPZf.rst
+1
-0
No files found.
Doc/library/xml.etree.elementtree.rst
View file @
e3685fd5
...
...
@@ -489,6 +489,10 @@ Functions
*elem* is an element tree or an individual element.
.. versionchanged:: 3.8
The :func:`dump` function now preserves the attribute order specified
by the user.
.. function:: fromstring(text)
...
...
@@ -947,6 +951,10 @@ ElementTree Objects
.. versionadded:: 3.4
The *short_empty_elements* parameter.
.. versionchanged:: 3.8
The :meth:`write` method now preserves the attribute order specified
by the user.
This is the XML file that is going to be manipulated::
...
...
Lib/test/test_xml_etree.py
View file @
e3685fd5
...
...
@@ -5,6 +5,7 @@
# For this purpose, the module-level "ET" symbol is temporarily
# monkey-patched when running the "test_xml_etree_c" test suite.
import
contextlib
import
copy
import
functools
import
html
...
...
@@ -1044,6 +1045,25 @@ class ElementTreeTest(unittest.TestCase):
method
=
'html'
)
self
.
assertEqual
(
serialized
,
expected
)
def
test_dump_attribute_order
(
self
):
# See BPO 34160
e
=
ET
.
Element
(
'cirriculum'
,
status
=
'public'
,
company
=
'example'
)
with
support
.
captured_stdout
()
as
stdout
:
ET
.
dump
(
e
)
self
.
assertEqual
(
stdout
.
getvalue
(),
'<cirriculum status="public" company="example" />
\
n
'
)
def
test_tree_write_attribute_order
(
self
):
# See BPO 34160
root
=
ET
.
Element
(
'cirriculum'
,
status
=
'public'
,
company
=
'example'
)
tree
=
ET
.
ElementTree
(
root
)
f
=
io
.
BytesIO
()
with
contextlib
.
redirect_stdout
(
f
):
tree
.
write
(
f
,
encoding
=
'utf-8'
,
xml_declaration
=
True
)
self
.
assertEqual
(
f
.
getvalue
(),
b"<?xml version='1.0' encoding='utf-8'?>
\
n
"
b'<cirriculum status="public" company="example" />'
)
class
XMLPullParserTest
(
unittest
.
TestCase
):
...
...
Lib/xml/etree/ElementTree.py
View file @
e3685fd5
...
...
@@ -923,7 +923,7 @@ def _serialize_xml(write, elem, qnames, namespaces,
k
,
_escape_attrib
(
v
)
))
for
k
,
v
in
sorted
(
items
):
# lexical order
for
k
,
v
in
items
:
if
isinstance
(
k
,
QName
):
k
=
k
.
text
if
isinstance
(
v
,
QName
):
...
...
Misc/NEWS.d/next/Library/2018-10-27-21-11-42.bpo-34160.UzyPZf.rst
0 → 100644
View file @
e3685fd5
ElementTree now preserves the attribute order specified by the user.
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