Mailman 3 August 2016 - Python-checkins

cpython: Issue #17642: add larger font sizes for classroom projection.
by terry.reedy Aug. 31, 2016

Aug. 31, 2016

https://hg.python.org/cpython/rev/c9d59e6cc1e4 changeset: 102962:c9d59e6cc1e4 parent: 102960:3b59ca37b4a1 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Aug 30 20:19:13 2016 -0400 summary: Issue #17642: add larger font sizes for classroom projection. files: Lib/idlelib/configdialog.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py --- a/Lib/idlelib/configdialog.py +++ b/… [View More]

1 0

cpython (2.7): Issue #17642: add larger font sizes for classroom projection.
by terry.reedy Aug. 31, 2016

Aug. 31, 2016

https://hg.python.org/cpython/rev/f478f9b88319 changeset: 102961:f478f9b88319 branch: 2.7 parent: 102958:a5c43e660ae9 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Aug 30 20:19:07 2016 -0400 summary: Issue #17642: add larger font sizes for classroom projection. files: Lib/idlelib/configDialog.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/… [View More]

1 0

cpython (3.5): ? Working Directory ?
by terry.reedy Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/d048df7efe0b changeset: 102959:d048df7efe0b branch: 3.5 parent: 102955:8d9d90ef80b0 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Aug 30 16:58:01 2016 -0400 summary: ? Working Directory ? files: Doc/library/idle.rst | 2 +- Lib/idlelib/help.html | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/… [View More]idle.rst +++ b/Doc/library/idle.rst @@ -531,7 +531,7 @@ -c command run command in the shell window -d enable debugger and open shell window -e open editor window - -h print help message with legal combinatios and exit + -h print help message with legal combinations and exit -i open shell window -r file run file in shell window -s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -6,7 +6,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>25.5. IDLE — Python 3.5.2 documentation</title> + <title>25.5. IDLE — Python 3.5.2 documentation</title> <link rel="stylesheet" href="../_static/pydoctheme.css" type="text/css" /> <link rel="stylesheet" href="../_static/pygments.css" type="text/css" /> @@ -58,13 +58,13 @@ accesskey="P">previous</a> |</li> <li><img src="../_static/py.png" alt="" style="vertical-align: middle; margin-top: -1px"/></li> - <li><a href="https://www.python.org/">Python</a> »</li> + <li><a href="https://www.python.org/">Python</a> »</li> <li> - <a href="../index.html">3.5.2 Documentation</a> » + <a href="../index.html">3.5.2 Documentation</a> » </li> - <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> - <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">25. Graphical User Interfaces with Tk</a> »</li> + <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> + <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">25. Graphical User Interfaces with Tk</a> »</li> </ul> </div> @@ -497,7 +497,7 @@ -c command run command in the shell window -d enable debugger and open shell window -e open editor window --h print help message with legal combinatios and exit +-h print help message with legal combinations and exit -i open shell window -r file run file in shell window -s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window @@ -659,11 +659,14 @@ <div id="searchbox" style="display: none" role="search"> <h3>Quick search</h3> <form class="search" action="../search.html" method="get"> - <div><input type="text" name="q" /></div> - <div><input type="submit" value="Go" /></div> + <input type="text" name="q" /> + <input type="submit" value="Go" /> <input type="hidden" name="check_keywords" value="yes" /> <input type="hidden" name="area" value="default" /> </form> + <p class="searchtip" style="font-size: 90%"> + Enter search terms or a module, class or function name. + </p> </div> <script type="text/javascript">$('#searchbox').show(0);</script> </div> @@ -687,13 +690,13 @@ >previous</a> |</li> <li><img src="../_static/py.png" alt="" style="vertical-align: middle; margin-top: -1px"/></li> - <li><a href="https://www.python.org/">Python</a> »</li> + <li><a href="https://www.python.org/">Python</a> »</li> <li> - <a href="../index.html">3.5.2 Documentation</a> » + <a href="../index.html">3.5.2 Documentation</a> » </li> - <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> - <li class="nav-item nav-item-2"><a href="tk.html" >25. Graphical User Interfaces with Tk</a> »</li> + <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> + <li class="nav-item nav-item-2"><a href="tk.html" >25. Graphical User Interfaces with Tk</a> »</li> </ul> </div> <div class="footer"> @@ -702,10 +705,10 @@ The Python Software Foundation is a non-profit corporation. <a href="https://www.python.org/psf/donations/">Please donate.</a> <br /> - Last updated on Aug 25, 2016. + Last updated on Aug 30, 2016. <a href="../bugs.html">Found a bug</a>? <br /> - Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.4.6. + Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3.6. </div> </body> -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (2.7): Backport spelling fix.
by terry.reedy Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/a5c43e660ae9 changeset: 102958:a5c43e660ae9 branch: 2.7 parent: 102943:58ea646ef657 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Aug 30 16:57:53 2016 -0400 summary: Backport spelling fix. files: Doc/library/idle.rst | 2 +- Lib/idlelib/help.html | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/… [View More]idle.rst +++ b/Doc/library/idle.rst @@ -527,7 +527,7 @@ -c command run command in the shell window -d enable debugger and open shell window -e open editor window - -h print help message with legal combinatios and exit + -h print help message with legal combinations and exit -i open shell window -r file run file in shell window -s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -6,7 +6,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>24.6. IDLE — Python 2.7.12 documentation</title> + <title>24.6. IDLE — Python 2.7.12 documentation</title> <link rel="stylesheet" href="../_static/classic.css" type="text/css" /> <link rel="stylesheet" href="../_static/pygments.css" type="text/css" /> @@ -58,13 +58,13 @@ accesskey="P">previous</a> |</li> <li><img src="../_static/py.png" alt="" style="vertical-align: middle; margin-top: -1px"/></li> - <li><a href="https://www.python.org/">Python</a> »</li> + <li><a href="https://www.python.org/">Python</a> »</li> <li> - <a href="../index.html">Python 2.7.12 documentation</a> » + <a href="../index.html">Python 2.7.12 documentation</a> » </li> - <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> - <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">24. Graphical User Interfaces with Tk</a> »</li> + <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> + <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">24. Graphical User Interfaces with Tk</a> »</li> </ul> </div> @@ -495,7 +495,7 @@ -c command run command in the shell window -d enable debugger and open shell window -e open editor window --h print help message with legal combinatios and exit +-h print help message with legal combinations and exit -i open shell window -r file run file in shell window -s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window @@ -657,11 +657,14 @@ <div id="searchbox" style="display: none" role="search"> <h3>Quick search</h3> <form class="search" action="../search.html" method="get"> - <div><input type="text" name="q" /></div> - <div><input type="submit" value="Go" /></div> + <input type="text" name="q" /> + <input type="submit" value="Go" /> <input type="hidden" name="check_keywords" value="yes" /> <input type="hidden" name="area" value="default" /> </form> + <p class="searchtip" style="font-size: 90%"> + Enter search terms or a module, class or function name. + </p> </div> <script type="text/javascript">$('#searchbox').show(0);</script> </div> @@ -685,13 +688,13 @@ >previous</a> |</li> <li><img src="../_static/py.png" alt="" style="vertical-align: middle; margin-top: -1px"/></li> - <li><a href="https://www.python.org/">Python</a> »</li> + <li><a href="https://www.python.org/">Python</a> »</li> <li> - <a href="../index.html">Python 2.7.12 documentation</a> » + <a href="../index.html">Python 2.7.12 documentation</a> » </li> - <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> - <li class="nav-item nav-item-2"><a href="tk.html" >24. Graphical User Interfaces with Tk</a> »</li> + <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> + <li class="nav-item nav-item-2"><a href="tk.html" >24. Graphical User Interfaces with Tk</a> »</li> </ul> </div> <div class="footer"> @@ -700,10 +703,10 @@ The Python Software Foundation is a non-profit corporation. <a href="https://www.python.org/psf/donations/">Please donate.</a> <br /> - Last updated on Aug 25, 2016. + Last updated on Aug 30, 2016. <a href="../bugs.html">Found a bug</a>? <br /> - Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.4.6. + Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3.6. </div> </body> -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (merge 3.5 -> default): Merge with 3.5
by terry.reedy Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/3b59ca37b4a1 changeset: 102960:3b59ca37b4a1 parent: 102957:4340be056a7c parent: 102959:d048df7efe0b user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Aug 30 16:58:27 2016 -0400 summary: Merge with 3.5 files: Lib/idlelib/help.html | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/… [View More]help.html @@ -6,7 +6,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>25.5. IDLE — Python 3.5.2 documentation</title> + <title>25.5. IDLE — Python 3.5.2 documentation</title> <link rel="stylesheet" href="../_static/pydoctheme.css" type="text/css" /> <link rel="stylesheet" href="../_static/pygments.css" type="text/css" /> @@ -58,13 +58,13 @@ accesskey="P">previous</a> |</li> <li><img src="../_static/py.png" alt="" style="vertical-align: middle; margin-top: -1px"/></li> - <li><a href="https://www.python.org/">Python</a> »</li> + <li><a href="https://www.python.org/">Python</a> »</li> <li> - <a href="../index.html">3.5.2 Documentation</a> » + <a href="../index.html">3.5.2 Documentation</a> » </li> - <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> - <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">25. Graphical User Interfaces with Tk</a> »</li> + <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> + <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">25. Graphical User Interfaces with Tk</a> »</li> </ul> </div> @@ -659,11 +659,14 @@ <div id="searchbox" style="display: none" role="search"> <h3>Quick search</h3> <form class="search" action="../search.html" method="get"> - <div><input type="text" name="q" /></div> - <div><input type="submit" value="Go" /></div> + <input type="text" name="q" /> + <input type="submit" value="Go" /> <input type="hidden" name="check_keywords" value="yes" /> <input type="hidden" name="area" value="default" /> </form> + <p class="searchtip" style="font-size: 90%"> + Enter search terms or a module, class or function name. + </p> </div> <script type="text/javascript">$('#searchbox').show(0);</script> </div> @@ -687,13 +690,13 @@ >previous</a> |</li> <li><img src="../_static/py.png" alt="" style="vertical-align: middle; margin-top: -1px"/></li> - <li><a href="https://www.python.org/">Python</a> »</li> + <li><a href="https://www.python.org/">Python</a> »</li> <li> - <a href="../index.html">3.5.2 Documentation</a> » + <a href="../index.html">3.5.2 Documentation</a> » </li> - <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> - <li class="nav-item nav-item-2"><a href="tk.html" >25. Graphical User Interfaces with Tk</a> »</li> + <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li> + <li class="nav-item nav-item-2"><a href="tk.html" >25. Graphical User Interfaces with Tk</a> »</li> </ul> </div> <div class="footer"> @@ -702,10 +705,10 @@ The Python Software Foundation is a non-profit corporation. <a href="https://www.python.org/psf/donations/">Please donate.</a> <br /> - Last updated on Aug 25, 2016. + Last updated on Aug 30, 2016. <a href="../bugs.html">Found a bug</a>? <br /> - Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.4.6. + Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3.6. </div> </body> -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (merge 3.5 -> default): Merge
by raymond.hettinger Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/4340be056a7c changeset: 102957:4340be056a7c parent: 102956:f673a60bdc1a parent: 102955:8d9d90ef80b0 user: Raymond Hettinger <python(a)rcn.com> date: Tue Aug 30 13:46:29 2016 -0700 summary: Merge files: Doc/library/smtplib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -439,7 +439,7 @@… [View More]

1 0

cpython (3.5): Fix typos
by raymond.hettinger Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/8d9d90ef80b0 changeset: 102955:8d9d90ef80b0 branch: 3.5 parent: 102950:53f2cde033ac user: Raymond Hettinger <python(a)rcn.com> date: Tue Aug 30 13:25:06 2016 -0700 summary: Fix typos files: Doc/library/smtplib.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -439,7 +439,7 @@ and … [View More]

1 0

cpython: Issue #28894: Fix to_addrs refs in smtplib docs
by raymond.hettinger Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/f673a60bdc1a changeset: 102956:f673a60bdc1a parent: 102954:89ce78ce1bfa user: Raymond Hettinger <python(a)rcn.com> date: Tue Aug 30 13:43:53 2016 -0700 summary: Issue #28894: Fix to_addrs refs in smtplib docs files: Doc/library/smtplib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -486,7 … [View More]

1 0

cpython: Issue #27895: Strengthen the dict reader tests.
by raymond.hettinger Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/89ce78ce1bfa changeset: 102954:89ce78ce1bfa user: Raymond Hettinger <python(a)rcn.com> date: Tue Aug 30 12:57:26 2016 -0700 summary: Issue #27895: Strengthen the dict reader tests. files: Lib/test/test_csv.py | 38 ++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -11,6 +11,8 @@ import … [View More]pickle from test import support from itertools import permutations +from textwrap import dedent +from collections import OrderedDict class Test_Csv(unittest.TestCase): """ @@ -1109,6 +1111,42 @@ # Final sanity check: were all permutations unique? self.assertEqual(len(resultset), 120, "Key ordering: some key permutations not collected (expected 120)") + def test_ordered_dict_reader(self): + data = dedent('''\ + FirstName,LastName + Eric,Idle + Graham,Chapman,Over1,Over2 + + Under1 + John,Cleese + ''').splitlines() + + self.assertEqual(list(csv.DictReader(data)), + [OrderedDict([('FirstName', 'Eric'), ('LastName', 'Idle')]), + OrderedDict([('FirstName', 'Graham'), ('LastName', 'Chapman'), + (None, ['Over1', 'Over2'])]), + OrderedDict([('FirstName', 'Under1'), ('LastName', None)]), + OrderedDict([('FirstName', 'John'), ('LastName', 'Cleese')]), + ]) + + self.assertEqual(list(csv.DictReader(data, restkey='OtherInfo')), + [OrderedDict([('FirstName', 'Eric'), ('LastName', 'Idle')]), + OrderedDict([('FirstName', 'Graham'), ('LastName', 'Chapman'), + ('OtherInfo', ['Over1', 'Over2'])]), + OrderedDict([('FirstName', 'Under1'), ('LastName', None)]), + OrderedDict([('FirstName', 'John'), ('LastName', 'Cleese')]), + ]) + + del data[0] # Remove the header row + self.assertEqual(list(csv.DictReader(data, fieldnames=['fname', 'lname'])), + [OrderedDict([('fname', 'Eric'), ('lname', 'Idle')]), + OrderedDict([('fname', 'Graham'), ('lname', 'Chapman'), + (None, ['Over1', 'Over2'])]), + OrderedDict([('fname', 'Under1'), ('lname', None)]), + OrderedDict([('fname', 'John'), ('lname', 'Cleese')]), + ]) + + class MiscTestCase(unittest.TestCase): def test__all__(self): extra = {'__doc__', '__version__'} -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython: Issue #27842: The csv.DictReader now returns rows of type OrderedDict.
by raymond.hettinger Aug. 30, 2016

Aug. 30, 2016

https://hg.python.org/cpython/rev/bb3e2a5be31b changeset: 102953:bb3e2a5be31b user: Raymond Hettinger <python(a)rcn.com> date: Tue Aug 30 12:35:50 2016 -0700 summary: Issue #27842: The csv.DictReader now returns rows of type OrderedDict. files: Doc/library/csv.rst | 39 +++++++++++++++++++------------ Lib/csv.py | 3 +- Lib/test/test_csv.py | 16 +++++++++++++ Misc/NEWS | 3 ++ 4 files changed, 45 insertions(+), 16 deletions(-) diff --… [View More]git a/Doc/library/csv.rst b/Doc/library/csv.rst --- a/Doc/library/csv.rst +++ b/Doc/library/csv.rst @@ -149,18 +149,25 @@ .. class:: DictReader(csvfile, fieldnames=None, restkey=None, restval=None, \ dialect='excel', *args, **kwds) - Create an object which operates like a regular reader but maps the - information read into a dict whose keys are given by the optional - *fieldnames* parameter. The *fieldnames* parameter is a :mod:`sequence - <collections.abc>` whose elements are associated with the fields of the - input data in order. These elements become the keys of the resulting - dictionary. If the *fieldnames* parameter is omitted, the values in the - first row of the *csvfile* will be used as the fieldnames. If the row read - has more fields than the fieldnames sequence, the remaining data is added as - a sequence keyed by the value of *restkey*. If the row read has fewer - fields than the fieldnames sequence, the remaining keys take the value of - the optional *restval* parameter. Any other optional or keyword arguments - are passed to the underlying :class:`reader` instance. + Create an object that operates like a regular reader but maps the + information in each row to an :mod:`OrderedDict <collections.OrderedDict>` + whose keys are given by the optional *fieldnames* parameter. + + The *fieldnames* parameter is a :term:`sequence`. If *fieldnames* is + omitted, the values in the first row of the *csvfile* will be used as the + fieldnames. Regardless of how the fieldnames are determined, the ordered + dictionary preserves their original ordering. + + If a row has more fields than fieldnames, the remaining data is put in a + list and stored with the fieldname specified by *restkey* (which defaults + to ``None``). If a non-blank row has fewer fields than fieldnames, the + missing values are filled-in with ``None``. + + All other optional or keyword arguments are passed to the underlying + :class:`reader` instance. + + .. versionchanged:: 3.6 + Returned rows are now of type :class:`OrderedDict`. A short usage example:: @@ -170,9 +177,11 @@ ... for row in reader: ... print(row['first_name'], row['last_name']) ... - Baked Beans - Lovely Spam - Wonderful Spam + Eric Idle + John Cleese + + >>> print(row) + OrderedDict([('first_name', 'John'), ('last_name', 'Cleese')]) .. class:: DictWriter(csvfile, fieldnames, restval='', extrasaction='raise', \ diff --git a/Lib/csv.py b/Lib/csv.py --- a/Lib/csv.py +++ b/Lib/csv.py @@ -11,6 +11,7 @@ __doc__ from _csv import Dialect as _Dialect +from collections import OrderedDict from io import StringIO __all__ = ["QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE", @@ -116,7 +117,7 @@ # values while row == []: row = next(self.reader) - d = dict(zip(self.fieldnames, row)) + d = OrderedDict(zip(self.fieldnames, row)) lf = len(self.fieldnames) lr = len(row) if lf < lr: diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -10,6 +10,7 @@ import gc import pickle from test import support +from itertools import permutations class Test_Csv(unittest.TestCase): """ @@ -1092,6 +1093,21 @@ fileobj.seek(0) self.assertEqual(fileobj.read(), expected) +class KeyOrderingTest(unittest.TestCase): + + def test_ordering_for_the_dict_reader_and_writer(self): + resultset = set() + for keys in permutations("abcde"): + with TemporaryFile('w+', newline='', encoding="utf-8") as fileobject: + dw = csv.DictWriter(fileobject, keys) + dw.writeheader() + fileobject.seek(0) + dr = csv.DictReader(fileobject) + kt = tuple(dr.fieldnames) + self.assertEqual(keys, kt) + resultset.add(kt) + # Final sanity check: were all permutations unique? + self.assertEqual(len(resultset), 120, "Key ordering: some key permutations not collected (expected 120)") class MiscTestCase(unittest.TestCase): def test__all__(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -64,6 +64,9 @@ match ``math.inf`` and ``math.nan``, and also ``cmath.infj`` and ``cmath.nanj`` to match the format used by complex repr. +- Issue #27842: The csv.DictReader now returns rows of type OrderedDict. + (Contributed by Steve Holden.) + - Issue #27861: Fixed a crash in sqlite3.Connection.cursor() when a factory creates not a cursor. Patch by Xiang Zhang. -- Repository URL: https://hg.python.org/cpython [View Less]

1 0