]> granicus.if.org Git - python/log
python
6 years agoFix spelling typo (GH-6443) (GH-6507)
Miss Islington (bot) [Tue, 17 Apr 2018 15:40:48 +0000 (08:40 -0700)]
Fix spelling typo (GH-6443) (GH-6507)

(cherry picked from commit 28e8b66d6c632552765b5fb4573b7f3c9decc3c1)

Co-authored-by: jdemeyer <jdemeyer@cage.ugent.be>
6 years agobpo-33295: Skip test using missing external site (GH-6504) (GH-6509)
Miss Islington (bot) [Tue, 17 Apr 2018 15:33:48 +0000 (08:33 -0700)]
bpo-33295: Skip test using missing external site (GH-6504) (GH-6509)

`test_urllib2net.OtherNetworkTests.test_sites_no_connection_close`
used `http://www.imdb.com/` but it is moved to https so the test is
not valid anymore.  Skip test for the moment to allow CI to proceed.
(cherry picked from commit 36d56ea826caffbeac0fc0c6d90248b80516e33c)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agofix pydoc-topics to work with Sphinx 1.7 (GH-6475)
Miss Islington (bot) [Tue, 17 Apr 2018 06:32:43 +0000 (23:32 -0700)]
fix pydoc-topics to work with Sphinx 1.7 (GH-6475)

In fact, we now require a newer Sphinx version because APIs have moved around.
(cherry picked from commit acfb087f9f5590e5174a30eced3c2fe911f49d70)

Co-authored-by: Benjamin Peterson <benjamin@python.org>
6 years agoRevert 725476222a3c1f2f93162d75a540e6bcdeaa36fd (GH-6494) (GH-6495)
Miss Islington (bot) [Tue, 17 Apr 2018 03:35:06 +0000 (20:35 -0700)]
Revert 725476222a3c1f2f93162d75a540e6bcdeaa36fd (GH-6494) (GH-6495)

This note in documentation was never true.
(cherry picked from commit a00d440edb4ccf36c83673a0fb172b29c76a66e6)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
6 years agoacks += Zsolt Dollenstein (GH-6490) (GH-6492)
Miss Islington (bot) [Tue, 17 Apr 2018 00:26:25 +0000 (17:26 -0700)]
acks += Zsolt Dollenstein (GH-6490) (GH-6492)

(cherry picked from commit 2bea9476286ad8e2e87bf0415ff743b1487c5018)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
6 years agoAdd support for all string literals to lib2to3 (GH-6457) (GH-6488)
Miss Islington (bot) [Mon, 16 Apr 2018 22:16:57 +0000 (15:16 -0700)]
Add support for all string literals to lib2to3 (GH-6457) (GH-6488)

(cherry picked from commit 8f37e846646444d84daf95787f4a0fa2b2316754)

Co-authored-by: Zsolt Dollenstein <zsol.zsol@gmail.com>
6 years agobpo-31947: remove None default for names param in Enum._create_ (GH-4288)
Miss Islington (bot) [Mon, 16 Apr 2018 20:49:34 +0000 (13:49 -0700)]
bpo-31947: remove None default for names param in Enum._create_ (GH-4288)

(cherry picked from commit b8e21f12891382bc0aac5ccd13dcb4a990d65e0a)

Co-authored-by: anentropic <ego@anentropic.com>
6 years agoRemove to-be-deprecated urllib.request.urlretrieve function reference (GH-6454)
Miss Islington (bot) [Mon, 16 Apr 2018 14:16:20 +0000 (07:16 -0700)]
Remove to-be-deprecated urllib.request.urlretrieve function reference (GH-6454)

(cherry picked from commit c89b22175807d64c47b598163b804b5dc005d1bb)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
6 years agobpo-33185: Improve wording and markup (GH-6477)
Miss Islington (bot) [Sun, 15 Apr 2018 13:55:10 +0000 (06:55 -0700)]
bpo-33185: Improve wording and markup (GH-6477)

Adds some working and markup fixes that I missed
in the initial commit for this issue.

(Follow-up to GH-6419)
(cherry picked from commit 1a5c4bdb6ecc6a8b19ff33bde323ab188ed60977)

Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>
6 years agobpo-33185: Fix regression in pydoc CLI sys.path handling (GH-6419)
Miss Islington (bot) [Sun, 15 Apr 2018 12:17:13 +0000 (05:17 -0700)]
bpo-33185: Fix regression in pydoc CLI sys.path handling (GH-6419)

The pydoc CLI assumed -m pydoc would add the empty string
to sys.path, and hence got confused when it switched to
adding the full initial working directory instead.

This refactors the pydoc CLI path manipulation to be
more testable, and ensures it won't accidentally
remove the standard library directory containing
pydoc itself from sys.path.
(cherry picked from commit 82a948105920100ca2ec5c2340bc3890adcfe778)

Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>
6 years agobpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463)
Miss Islington (bot) [Sat, 14 Apr 2018 00:52:02 +0000 (17:52 -0700)]
bpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463)

(cherry picked from commit b1dc07509f78b354e83f5f4a902f1ff80c7bb05d)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
6 years ago[3.7] bpo-33217: deprecate non-Enum lookups in Enums (GH-6392)
Ethan Furman [Thu, 12 Apr 2018 01:56:25 +0000 (18:56 -0700)]
[3.7] bpo-33217: deprecate non-Enum lookups in Enums (GH-6392)

deprecate non-Enum lookups in Enums

Lookups such as `1 in Color` and `2 in SomeFlag()` will raise TypeError
in 3.8+.

6 years agoFix error messages in argparse examples (GH-6435)
Miss Islington (bot) [Wed, 11 Apr 2018 18:58:09 +0000 (11:58 -0700)]
Fix error messages in argparse examples (GH-6435)

The examples in argparse documentation use `error: too few arguments`
error message which was removed in this commit f97c59a in 2011.
(cherry picked from commit 04e82934659487ecae76bf4a2db7f92c8dbe0d25)

Co-authored-by: suic86 <marko.gabriel.cz@gmail.com>
6 years agobpo-33260: Regenerate token.py after removing ASYNC and AWAIT. (GH-6447)
Miss Islington (bot) [Wed, 11 Apr 2018 17:07:23 +0000 (10:07 -0700)]
bpo-33260: Regenerate token.py after removing ASYNC and AWAIT. (GH-6447)

(cherry picked from commit d08972fdb92cad6b813d22205752c97ea18df060)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agobpo-33097: Fix submit accepting callable after executor shutdown by interpreter exit...
Miss Islington (bot) [Tue, 10 Apr 2018 18:35:02 +0000 (11:35 -0700)]
bpo-33097: Fix submit accepting callable after executor shutdown by interpreter exit (GH-6144) (GH-6445)

Executors in concurrent.futures accepted tasks after executor was shutdown by interpreter exit. Tasks were left in PENDING state forever. This fix changes submit to instead raise a RuntimeError.
(cherry picked from commit c4b695f85e141f57d22d8edf7bc2c756da136918)

Co-authored-by: Mark Nemec <mrknmc@me.com>
6 years agobpo-33253: Fix xxsubtype.bench() to accept correct str signature. (GH-6439)
Miss Islington (bot) [Tue, 10 Apr 2018 06:00:57 +0000 (23:00 -0700)]
bpo-33253: Fix xxsubtype.bench() to accept correct str signature. (GH-6439)

(cherry picked from commit f178028f37c9dafb72608b719eb03e5a70af4ff5)

Co-authored-by: Devon R <Gorialis@users.noreply.github.com>
6 years ago[3.7] bpo-31201: Clarify command to re-run failing test(s) with example (GH-6417...
Miss Islington (bot) [Mon, 9 Apr 2018 21:17:20 +0000 (14:17 -0700)]
[3.7] bpo-31201: Clarify command to re-run failing test(s) with example (GH-6417) (GH-6437)

(cherry picked from commit 0f914b5b5f6ba186afd7112fc851c97247076f70)

Co-authored-by: Aaron Ang <aaronang@users.noreply.github.com>
6 years ago[3.7] bpo-33031: Remove dead code in C implementation of OrderedDict. (GH-6120) ...
Serhiy Storchaka [Mon, 9 Apr 2018 18:46:41 +0000 (21:46 +0300)]
[3.7] bpo-33031: Remove dead code in C implementation of OrderedDict. (GH-6120) (GH-6433)

This code doesn't have effect on the final result, but causes
GCC 8 warnings and can have an undefined behavior.
(cherry picked from commit 827d49f3cf0296f1e267eae6834a977cf312cc1e)

6 years agobpo-31920: Fixed handling directories as arguments in the ``pygettext`` script. ...
Miss Islington (bot) [Mon, 9 Apr 2018 17:57:52 +0000 (10:57 -0700)]
bpo-31920: Fixed handling directories as arguments in the ``pygettext`` script. (GH-6259)

Based on patch by Oleg Krasnikov.
(cherry picked from commit c93938b5beea4c3f592119ebee6d4029558db8de)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agoFix misleading docsting of shelve.open(). (GH-6427)
Miss Islington (bot) [Mon, 9 Apr 2018 14:57:31 +0000 (07:57 -0700)]
Fix misleading docsting of shelve.open(). (GH-6427)

The protocol parameter can be any protocol supported by the
pickle module.
(cherry picked from commit 2ef65f346a5e829a886c075f519e3a49a2ebbde7)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agoImprove highlighting of some code blocks. (GH-6401)
Miss Islington (bot) [Mon, 9 Apr 2018 14:56:44 +0000 (07:56 -0700)]
Improve highlighting of some code blocks. (GH-6401)

(cherry picked from commit 46936d5a71d1683dbd8ddb6d7f39aab50ecfec50)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agoUpdate docstring of tempfile._RandomNameSequence (GH-6414)
Miss Islington (bot) [Mon, 9 Apr 2018 01:01:54 +0000 (18:01 -0700)]
Update docstring of tempfile._RandomNameSequence (GH-6414)

When bpo-12015 got resolved by increasing the length of the
random string generated by _RandomNameSequence from six to eight
characters, the docstring of the class was not adjusted accordingly.
(cherry picked from commit 9c463ec88ba21764f6fff8e01d6045a932a89438)

Co-authored-by: Wolfgang Maier <wolfgang.maier@biologie.uni-freiburg.de>
6 years agoAdd a prepend() recipe to teach a chain() idiom (GH-6415) (GH-6421)
Miss Islington (bot) [Sun, 8 Apr 2018 21:37:30 +0000 (14:37 -0700)]
Add a prepend() recipe to teach a chain() idiom (GH-6415) (GH-6421)

(cherry picked from commit 9265dd72e5ec1cfa5fcdb5be8ebffe1d9994bd4b)

Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>
6 years agobpo-33201: Modernize "Extension types" doc (GH-6337) (GH-6411)
Miss Islington (bot) [Sat, 7 Apr 2018 16:27:05 +0000 (09:27 -0700)]
bpo-33201: Modernize "Extension types" doc (GH-6337) (GH-6411)

* bpo-33201: Modernize "Extension types" doc
* Split tutorial and other topics
* Some small fixes
* Address some review comments
* Rename noddy* to custom* and shoddy to sublist
* Fix markup
(cherry picked from commit 1d80a561734b9932961c546b0897405a3bfbf3e6)

Co-authored-by: Antoine Pitrou <pitrou@free.fr>
6 years agobpo-33184: Update macOS installer build to use OpenSSL 1.1.0h. (GH-6407) (GH-6409)
Miss Islington (bot) [Sat, 7 Apr 2018 07:02:40 +0000 (00:02 -0700)]
bpo-33184: Update macOS installer build to use OpenSSL 1.1.0h. (GH-6407) (GH-6409)

(cherry picked from commit b405752dab95fa5dc65a19d94e798844d0378c61)

Co-authored-by: Ned Deily <nad@python.org>
6 years ago[3.7] bpo-8243: Doc patch for curses.window.addstr and curses.window.addch (GH-5179...
Miss Islington (bot) [Sat, 7 Apr 2018 02:00:06 +0000 (19:00 -0700)]
[3.7] bpo-8243: Doc patch for curses.window.addstr and curses.window.addch (GH-5179) (GH-6404)

(cherry picked from commit ef5ce884a41c8553a7eff66ebace908c1dcc1f89)

Co-authored-by: Jay Crotts <crotts.jay@gmail.com>
6 years ago[3.7] bpo-33169: Remove values of `None` from sys.path_importer_cache when invalidati...
Brett Cannon [Sat, 7 Apr 2018 00:02:18 +0000 (17:02 -0700)]
[3.7] bpo-33169: Remove values of `None` from sys.path_importer_cache when invalidating caches (GH-6402) (GH-6403)

An entry of None in sys.path_importer_cache represents a negative/missing finder for a path, so clearing it out makes sense.
(cherry picked from commit 9e2be60634914f23db2ae5624e4acc9335bf5fea)

6 years ago[3.7] bpo-29673: fix gdb scripts pystack and pystackv (GH-6126) (GH-6399)
Miss Islington (bot) [Fri, 6 Apr 2018 22:14:29 +0000 (15:14 -0700)]
[3.7] bpo-29673: fix gdb scripts pystack and pystackv (GH-6126) (GH-6399)

(cherry picked from commit 3a9ccee0e5dbf7d67f5ab79f6095755969db117c)

Co-authored-by: Marcel Plch <gmarcel.plch@gmail.com>
6 years agofixed capitalization of class name (GH-6396) (GH-6397)
Miss Islington (bot) [Fri, 6 Apr 2018 12:46:05 +0000 (05:46 -0700)]
fixed capitalization of class name (GH-6396) (GH-6397)

(cherry picked from commit 1d87c7b80bf74a3030034a022a7a54ea4e3cdaff)

Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
6 years agobpo-33231: Fix potential leak in normalizestring() (GH-6386)
Miss Islington (bot) [Fri, 6 Apr 2018 07:12:38 +0000 (00:12 -0700)]
bpo-33231: Fix potential leak in normalizestring() (GH-6386)

(cherry picked from commit 0c1c4563a65ac451021d927058e4f25013934eb2)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agobpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6390)
Miss Islington (bot) [Thu, 5 Apr 2018 18:45:33 +0000 (11:45 -0700)]
bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6390)

6 years agobpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338...
Miss Islington (bot) [Thu, 5 Apr 2018 16:02:12 +0000 (09:02 -0700)]
bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338) (GH-6387)

(cherry picked from commit 091e95e9004b794280ab35becec2c3e30dd5e96e)

Co-authored-by: Wolfgang Maier <wolfgang.maier@biologie.uni-freiburg.de>
6 years agoClean up and enhance frozen dataclass tests. (GH-6380)
Miss Islington (bot) [Thu, 5 Apr 2018 11:12:31 +0000 (04:12 -0700)]
Clean up and enhance frozen dataclass tests. (GH-6380)

* Add a test for frozen with unhashable field value.
* Improve a comment.
(cherry picked from commit 74940913d26d9f94b8572eca794369841fa6d9b6)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agobpo-32873: Remove a name hack for generic aliases in typing module (GH-6376)
Miss Islington (bot) [Thu, 5 Apr 2018 00:46:40 +0000 (17:46 -0700)]
bpo-32873: Remove a name hack for generic aliases in typing module (GH-6376)

This removes a hack and replaces it with a proper
mapping {'list': 'List', 'dict': 'Dict', ...}.
(cherry picked from commit 2a363d2930e29ec6d8a774973ed5a4965f881f5f)

Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>
6 years agoCall super in Generic.__init_subclass__ (GH-6356)
Miss Islington (bot) [Wed, 4 Apr 2018 16:51:34 +0000 (09:51 -0700)]
Call super in Generic.__init_subclass__ (GH-6356)

(cherry picked from commit ee566fe526f3d069aa313578ee81ca6cbc25ff52)

Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>
6 years agobpo-29922: Add more tests for error messages in 'async with'. (GH-6370)
Miss Islington (bot) [Wed, 4 Apr 2018 16:28:46 +0000 (09:28 -0700)]
bpo-29922: Add more tests for error messages in 'async with'. (GH-6370)

Different paths are executed for normal exit and for leaving
the 'async with' block with 'break', 'continue' or 'return'.
(cherry picked from commit 2eeac269dd1e04a2a179384576986c3e47895ee0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agobpo-29922: Improve error messages in 'async with' (GH-6352)
Miss Islington (bot) [Wed, 4 Apr 2018 14:09:00 +0000 (07:09 -0700)]
bpo-29922: Improve error messages in 'async with' (GH-6352)

when __aenter__() or __aexit__() return non-awaitable object.
(cherry picked from commit a68f2f0578bbf812fa2264d0e0bb388340d6e230)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agobpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329)
Miss Islington (bot) [Wed, 4 Apr 2018 05:13:38 +0000 (22:13 -0700)]
bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329)

Py_UNICODE is deprecated since Python 3.3.
But the deprecation is missed in the c-api/arg document.
(cherry picked from commit 42ec190761a2e8503aaa06f0bfaaabe98749179b)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agobpo-32337: Update documentats about dict order (GH-4973)
Miss Islington (bot) [Wed, 4 Apr 2018 05:01:46 +0000 (22:01 -0700)]
bpo-32337: Update documentats about dict order (GH-4973)

(cherry picked from commit dfbbbf16f9aab82330c634913441b5ac73267d9c)

Co-authored-by: hui shang <shangdahao@gmail.com>
6 years agobpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). ...
Miss Islington (bot) [Tue, 3 Apr 2018 21:35:11 +0000 (14:35 -0700)]
bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6366)

(cherry picked from commit c869529ea9fbed574d34cf7ac139ca3f81b62ef0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agobpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001)
Miss Islington (bot) [Tue, 3 Apr 2018 04:31:27 +0000 (21:31 -0700)]
bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001)

(cherry picked from commit 629338f1404ea9cd75e4fb0389a2fbe1b589de43)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agocloses bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)
Miss Islington (bot) [Tue, 3 Apr 2018 03:33:38 +0000 (20:33 -0700)]
closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)

(cherry picked from commit badb894bbbb8aaa8b669c4a6f675a0bc7d98e188)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
6 years agobpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341)
Miss Islington (bot) [Tue, 3 Apr 2018 03:00:26 +0000 (20:00 -0700)]
bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341)

(cherry picked from commit d1c82c5cc7be0c21dddf86fd19c1702f6218459b)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agobpo-33204: IDLE - revise and extend colorizer test. (GH-6347)
Miss Islington (bot) [Mon, 2 Apr 2018 16:03:52 +0000 (09:03 -0700)]
bpo-33204: IDLE - revise and extend colorizer test. (GH-6347)

Followup to primary PR for the issue, GH-6344.
(cherry picked from commit 55966f3a0d5f1bf823bd22ce1abbde267b06552f)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
6 years agobpo-33204: IDLE: consistently color invalid string prefixes (GH-6344)
Miss Islington (bot) [Mon, 2 Apr 2018 06:09:18 +0000 (23:09 -0700)]
bpo-33204: IDLE: consistently color invalid string prefixes (GH-6344)

A 'u' string prefix cannot be paired with either 'r' or 'f'.  Consistently
color as much of the prefix, starting at the right, as is valid.
(cherry picked from commit da58533ac67b01ce8f6466e6f03ff6b8b3bb04d5)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
6 years agobpo-20104: Add os.posix_spawn documentation. (GH-6334)
Miss Islington (bot) [Sun, 1 Apr 2018 19:13:37 +0000 (12:13 -0700)]
bpo-20104: Add os.posix_spawn documentation. (GH-6334)

(cherry picked from commit 79760ed256987cead08d668b95675afba6b3760f)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
6 years agoAllow dynamic creation of generic dataclasses (GH-6319) (GH-6320)
Miss Islington (bot) [Sun, 1 Apr 2018 11:33:13 +0000 (04:33 -0700)]
Allow dynamic creation of generic dataclasses (GH-6319) (GH-6320)

(cherry picked from commit 5a7092de1226a95a50f0f384eea8ddb288959249)

Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>
6 years agobpo-33132: Fix more reference counting issues in the compiler. (GH-6323)
Miss Islington (bot) [Sat, 31 Mar 2018 23:41:28 +0000 (16:41 -0700)]
bpo-33132: Fix more reference counting issues in the compiler. (GH-6323)

(cherry picked from commit aa8e51f5ebb2a71c76059f050de01fc3c985376a)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years agoFix socket type in DatagramHandler documentation: TCP -> UDP (GH-6272)
Miss Islington (bot) [Fri, 30 Mar 2018 07:48:45 +0000 (00:48 -0700)]
Fix socket type in DatagramHandler documentation: TCP -> UDP (GH-6272)

(cherry picked from commit 233de021d915364bd3daee921d1d96d50d46d7fe)

Co-authored-by: Mike DePalatis <mike@depalatis.net>
6 years agobpo-33182: Fix pointer types in _testembed (GH-6310) (GH-6311)
Miss Islington (bot) [Fri, 30 Mar 2018 06:24:03 +0000 (23:24 -0700)]
bpo-33182: Fix pointer types in _testembed (GH-6310) (GH-6311)

(cherry picked from commit 69f5c73311a61b05485b19626935bf240ad31c5b)

Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>
6 years agobpo-33175: dataclasses should look up __set_name__ on class, not instance (GH-6305)
Miss Islington (bot) [Thu, 29 Mar 2018 15:32:36 +0000 (08:32 -0700)]
bpo-33175: dataclasses should look up __set_name__ on class, not instance (GH-6305)

(cherry picked from commit 521995205a2cb6b504fe0e39af22a81f785350a3)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agobump to 3.7.0b3+
Ned Deily [Thu, 29 Mar 2018 12:57:23 +0000 (08:57 -0400)]
bump to 3.7.0b3+

6 years ago3.7.0b3 v3.7.0b3
Ned Deily [Thu, 29 Mar 2018 11:57:55 +0000 (07:57 -0400)]
3.7.0b3

6 years agobpo-32726: macOS 10.6+ installer now builds Tcl/TK 8.6 (GH-6308)
Ned Deily [Thu, 29 Mar 2018 11:41:11 +0000 (07:41 -0400)]
bpo-32726: macOS 10.6+ installer now builds Tcl/TK 8.6 (GH-6308)

Build and link with private copy of Tcl/Tk 8.6 for the macOS 10.6+
installer. The 10.9+ installer variant already does this.  This means that
the Python 3.7 provided by the python.org macOS installers no longer need or
use any external versions of Tcl/Tk, either system-provided or user-
installed, such as ActiveTcl.

6 years agoFix typos '.::' should typically just be '::'. (GH-6165) (GH-6300)
Miss Islington (bot) [Thu, 29 Mar 2018 08:34:44 +0000 (01:34 -0700)]
Fix typos '.::' should typically just be '::'. (GH-6165) (GH-6300)

(cherry picked from commit 78553138be3b38d361bded8e641a2a4fd65a9d16)

Co-authored-by: Julien Palard <julien@palard.fr>
6 years agoFIX documentation and NEWS of ThreadedHTTPServer. (GH-6207) (GH-6302)
Miss Islington (bot) [Thu, 29 Mar 2018 08:33:47 +0000 (01:33 -0700)]
FIX documentation and NEWS of ThreadedHTTPServer. (GH-6207) (GH-6302)

(cherry picked from commit 79c3bab35cce55e6d175aff96a845bc6d932b203)

Co-authored-by: Julien Palard <julien@palard.fr>
6 years ago[3.7] Fix duplicating words words. (GH-6296) (GH-6297)
Serhiy Storchaka [Wed, 28 Mar 2018 20:05:24 +0000 (23:05 +0300)]
[3.7] Fix duplicating words words. (GH-6296) (GH-6297)

Most of them have been added in 3.7.
(cherry picked from commit bac2d5ba30339298db7d4caa9c8cd31d807cf081)

6 years agobpo-33126: Document PyBuffer_ToContiguous() (GH-6292) (GH-6294)
Miss Islington (bot) [Wed, 28 Mar 2018 15:50:24 +0000 (08:50 -0700)]
bpo-33126: Document PyBuffer_ToContiguous() (GH-6292) (GH-6294)

(cherry picked from commit aa50bf08e64f49d57917ab0b1aadf4308a3168a6)

Co-authored-by: Antoine Pitrou <pitrou@free.fr>
6 years agos/the the/the/ (GH-6287)
Miss Islington (bot) [Wed, 28 Mar 2018 13:23:32 +0000 (06:23 -0700)]
s/the the/the/ (GH-6287)

(cherry picked from commit 40a536be5337d3723285d597e2906394b26816a5)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years ago[3.7] bpo-33163: Upgrade pip to 9.0.3 and setuptools to v39.0.1. (GH-6283)
Miss Islington (bot) [Wed, 28 Mar 2018 08:49:24 +0000 (01:49 -0700)]
[3.7] bpo-33163: Upgrade pip to 9.0.3 and setuptools to v39.0.1. (GH-6283)

(cherry picked from commit c0518cde7a8404f310cd3495e77e612820ecad4f)

Co-authored-by: Ned Deily <nad@python.org>
6 years agobpo-32726: Do not force IDLE.app to launch in 32-bit mode. (GH-6280)
Miss Islington (bot) [Wed, 28 Mar 2018 08:16:23 +0000 (01:16 -0700)]
bpo-32726: Do not force IDLE.app to launch in 32-bit mode. (GH-6280)

Forcing the macOS IDLE.app gui process to launch in 32-mode was
a necessary hack for old versions of Tk (Aqua Carbon as in Tk 8.4
and early versions of 8.5); it is not needed for current versions
of Tk.  Since 32-bit launching will no longer be supported on
future releases of macOS, allow IDLE.app to launch in 64-bit mode.
(cherry picked from commit df532ab752680f6e359672c2cd40bec8ac848628)

Co-authored-by: Ned Deily <nad@python.org>
6 years agobpo-32872: Avoid regrtest compatibility issue with namespace packages. (GH-6276)...
Miss Islington (bot) [Wed, 28 Mar 2018 06:39:19 +0000 (23:39 -0700)]
bpo-32872: Avoid regrtest compatibility issue with namespace packages. (GH-6276) (#6277)

(cherry picked from commit e52ac045972a4f75d7f52e4ee0d6de128259134d)

Co-authored-by: Ned Deily <nad@python.org>
6 years agoFix senfile typo (GH-6265) (#6274)
Miss Islington (bot) [Wed, 28 Mar 2018 01:34:15 +0000 (18:34 -0700)]
Fix senfile typo (GH-6265) (#6274)

* Also in docs
(cherry picked from commit 65a34709f60711f7c46031d4c6c420f567bc790a)

Co-authored-by: Sam Dunster <me@sdunster.com>
6 years agobpo-32517: re-enable test_read_pty_output on macOS (GH-6112)
Ned Deily [Tue, 27 Mar 2018 21:17:28 +0000 (17:17 -0400)]
bpo-32517: re-enable test_read_pty_output on macOS (GH-6112)

6 years agobpo-33151: Handle submodule resources (GH-6268) (GH-6270)
Miss Islington (bot) [Tue, 27 Mar 2018 17:25:28 +0000 (10:25 -0700)]
bpo-33151: Handle submodule resources (GH-6268) (GH-6270)

(cherry picked from commit 30e507dff465a31901d87df791a2bac40dc88530)

Co-authored-by: Barry Warsaw <barry@python.org>
6 years agobpo-27212: Modify islice recipe to consume initial values preceding start (GH-6195...
Miss Islington (bot) [Tue, 27 Mar 2018 02:23:34 +0000 (19:23 -0700)]
bpo-27212: Modify islice recipe to consume initial values preceding start (GH-6195) (#GH-6266)

(cherry picked from commit da1734c58d2f97387ccc9676074717d38b044128)

Co-authored-by: Cheryl Sabella <cheryl.sabella@gmail.com>
6 years agobpo-32873: Treat type variables and special typing forms as immutable by copy and...
Miss Islington (bot) [Mon, 26 Mar 2018 22:29:06 +0000 (15:29 -0700)]
bpo-32873: Treat type variables and special typing forms as immutable by copy and pickle (GH-6216)

This also fixes python/typingGH-512
This also fixes python/typingGH-511

As was discussed in both issues, some typing forms deserve to be treated
as immutable by copy and pickle modules, so that:
* copy(X) is X
* deepcopy(X) is X
* loads(dumps(X)) is X  GH- pickled by reference

This PR adds such behaviour to:
* Type variables
* Special forms like Union, Any, ClassVar
* Unsubscripted generic aliases to containers like List, Mapping, Iterable

This not only resolves inconsistencies mentioned in the issues, but also
improves backwards compatibility with previous versions of Python
(including 3.6).

Note that this requires some dances with __module__ for type variables
(similar to NamedTuple) because the class TypeVar itself is define in typing,
while type variables should get module where they were defined.

https://bugs.python.org/issue32873
(cherry picked from commit 834940375ae88bc95794226dd8eff1f25fba1cf9)

Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>
6 years agobpo-32844: Fix a subprocess misredirection of a low fd (GH5689)
Miss Islington (bot) [Mon, 26 Mar 2018 20:14:09 +0000 (13:14 -0700)]
bpo-32844: Fix a subprocess misredirection of a low fd (GH5689)

bpo-32844: subprocess: Fix a potential misredirection of a low fd to stderr.

When redirecting, subprocess attempts to achieve the following state:
each fd to be redirected to is less than or equal to the fd
it is redirected from, which is necessary because redirection
occurs in the ascending order of destination descriptors.
It fails to do so in a couple of corner cases,
for example, if 1 is redirected to 2 and 0 is closed in the parent.
(cherry picked from commit 0e7144b064a19493a146af94175a087b3888c37b)

Co-authored-by: Alexey Izbyshev <izbyshev@users.noreply.github.com>
6 years agobpo-33141: Have dataclasses.Field pass through __set_name__ to any default argument...
Miss Islington (bot) [Mon, 26 Mar 2018 17:55:13 +0000 (10:55 -0700)]
bpo-33141: Have dataclasses.Field pass through __set_name__ to any default argument. (GH-6260)

This is part of PEP 487 and the descriptor protocol.
(cherry picked from commit de7a2f04d6b9427d568fcb43b6f512f9b4c4bd84)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agoFix error message in sqlite connection thread check. (GH-6028)
Miss Islington (bot) [Mon, 26 Mar 2018 16:01:22 +0000 (09:01 -0700)]
Fix error message in sqlite connection thread check. (GH-6028)

(cherry picked from commit 030345c0bfc2f76684666fe5c61e766ba5debfe6)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
6 years agoCorrected link targets in collections.rst (GH-1052)
Miss Islington (bot) [Mon, 26 Mar 2018 12:52:35 +0000 (05:52 -0700)]
Corrected link targets in collections.rst (GH-1052)

(cherry picked from commit e105294708ffc78a31566b48468746eb4609abe7)

Co-authored-by: Michael Seifert <michaelseifert04@yahoo.de>
6 years agoFix description about SimpleXMLRPCServer constructor parameter bind_and_activate...
Miss Islington (bot) [Mon, 26 Mar 2018 12:09:23 +0000 (05:09 -0700)]
Fix description about SimpleXMLRPCServer constructor parameter bind_and_activate. (GH-776)

Passing True as the `bind_and_activate` *do* immediately opening and binding to their socket.
(cherry picked from commit e6223579c87b93f3e60d28796f521587d88091d4)

Co-authored-by: cocoatomo <cocoatomo77@gmail.com>
6 years agoGitignore gmon.out (GH-5796)
Miss Islington (bot) [Mon, 26 Mar 2018 11:26:34 +0000 (04:26 -0700)]
Gitignore gmon.out (GH-5796)

gmon.out is generated when profiling turned on

Full Configuration:
./configure --prefix=$PWD/install --enable-profiling  --enable-big-digits=30
--with-pydebug --with-assertions  --with-valgrind
(cherry picked from commit 95ad3822a2b6287772bd752b6ab493c6d4198d4b)

Co-authored-by: Neeraj Badlani <neerajbadlani@gmail.com>
6 years agoFix typo and edit for clarity in the docstrings of sys.float_info. (GH-2251)
Miss Islington (bot) [Mon, 26 Mar 2018 10:58:10 +0000 (03:58 -0700)]
Fix typo and edit for clarity in the docstrings of sys.float_info. (GH-2251)

(cherry picked from commit 0301c9bdd1ebd788d1334cf3fe06c48f35bab0dc)

Co-authored-by: Stefano Taschini <taschini@users.noreply.github.com>
6 years agobpo-33096: Fix ttk.Treeview.insert. (GH-6228)
Miss Islington (bot) [Mon, 26 Mar 2018 08:19:52 +0000 (01:19 -0700)]
bpo-33096: Fix ttk.Treeview.insert. (GH-6228)

Allow ttk.Treeview.insert to insert iid that has a false boolean value.
Note iid=0 and iid=False would be same.
(cherry picked from commit 3ab44c0783eebdff687014f7d14d5dec59b6bd39)

Co-authored-by: Garvit Khatri <garvitdelhi@gmail.com>
6 years agoMinor fixes to dataclass tests. (GH-6243)
Miss Islington (bot) [Mon, 26 Mar 2018 01:00:43 +0000 (18:00 -0700)]
Minor fixes to dataclass tests. (GH-6243)

 Also, re-enable a test for ClassVars with default_factory.
(cherry picked from commit 2b75fc2bc97702224de0fae8ab026ec0cd0706ab)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agoClarify fd inheritance when close_fds=False. (GH-6240)
Miss Islington (bot) [Sun, 25 Mar 2018 17:40:38 +0000 (10:40 -0700)]
Clarify fd inheritance when close_fds=False. (GH-6240)

Clarify the subprocess documentation.
(cherry picked from commit dfb6e54dd8dbd735f55109ad8ee9dfcb6178ede9)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
6 years agobpo-33053: -m now adds *starting* directory to sys.path (GH-6231) (#6236)
Nick Coghlan [Sun, 25 Mar 2018 13:43:50 +0000 (23:43 +1000)]
bpo-33053: -m now adds *starting* directory to sys.path (GH-6231) (#6236)

Historically, -m added the empty string as sys.path
zero, meaning it resolved imports against the current
working directory, the same way -c and the interactive
prompt do.

This changes the sys.path initialisation to add the
*starting* working directory as sys.path[0] instead,
such that changes to the working directory while the
program is running will have no effect on imports
when using the -m switch.

(cherry picked from commit d5d9e02dd3c6df06a8dd9ce75ee9b52976420a8b)

6 years agoTrivial improvements to dataclasses tests. (GH-6234)
Miss Islington (bot) [Sun, 25 Mar 2018 13:27:50 +0000 (06:27 -0700)]
Trivial improvements to dataclasses tests. (GH-6234)

(cherry picked from commit 51c9ab42ab84643081d75c83a586afa45d910383)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years ago[3.7] bpo-33136: Harden ssl module against CVE-2018-8970 (GH-6229) (GH-6230)
Miss Islington (bot) [Sun, 25 Mar 2018 11:28:20 +0000 (04:28 -0700)]
[3.7] bpo-33136: Harden ssl module against CVE-2018-8970 (GH-6229) (GH-6230)

Harden ssl module against LibreSSL CVE-2018-8970.
X509_VERIFY_PARAM_set1_host() is called with an explicit namelen. A new test
ensures that NULL bytes are not allowed.

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit d02ac25ab0879f1a6de6937573bf00a16b7bd22e)

Co-authored-by: Christian Heimes <christian@python.org>
6 years agobpo-33042: Fix pre-initialization sys module configuration (GH-6157)
Miss Islington (bot) [Sun, 25 Mar 2018 11:27:57 +0000 (04:27 -0700)]
bpo-33042: Fix pre-initialization sys module configuration (GH-6157)

- new test case for pre-initialization of sys.warnoptions and sys._xoptions
- restored ability to call these APIs prior to Py_Initialize
- updated the docs for the affected APIs to make it clear they can be
  called before Py_Initialize
- also enhanced the existing embedding test cases
  to check for expected settings in the sys module
(cherry picked from commit bc77eff8b96be4f035e665ab35c1d06e22f46491)

Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>
6 years agobpo-32943: Fix confusing error message for rot13 codec (GH-5869)
Miss Islington (bot) [Sun, 25 Mar 2018 04:30:39 +0000 (21:30 -0700)]
bpo-32943: Fix confusing error message for rot13 codec (GH-5869)

(cherry picked from commit e4ce9fa89cb542dced553710b05de85202bc4715)

Co-authored-by: Xiang Zhang <angwerzx@126.com>
6 years agoFix invalid escape sequence: use raw string. (GH-6225)
Miss Islington (bot) [Sun, 25 Mar 2018 03:23:00 +0000 (20:23 -0700)]
Fix invalid escape sequence: use raw string. (GH-6225)

(cherry picked from commit c42e7aa67ce72a6c4c6cdfe3b0929ca07556d444)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agobpo-33134: dataclasses: use function dispatch table for hash, instead of a string...
Miss Islington (bot) [Sun, 25 Mar 2018 02:31:29 +0000 (19:31 -0700)]
bpo-33134: dataclasses: use function dispatch table for hash, instead of a string lookup which then is tested with if tests. (GH-6222)

* Change _hash_action to be a function table lookup, instead of a list
of strings which is then tested with if statements.
(cherry picked from commit 01d618c5606a239b03ad1269541eddb6e724775d)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agoTrivial dataclass cleanups: (GH-6218)
Miss Islington (bot) [Sat, 24 Mar 2018 21:42:28 +0000 (14:42 -0700)]
Trivial dataclass cleanups: (GH-6218)

- When adding a single element to a list, use .append() instead of
  += and creating a new list.
- For consistency, import the copy module, instead of just deepcopy. This
  leaves only a module at the class level, instead of a function.
- Improve some comments.
- Improve some whitespace.
- Use tuples instead of lists.
- Simplify a test.
(cherry picked from commit f96ddade0094d162cb6c2fd7255c5e8a90b5c37d)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agobpo-33132: Fix reference counting issues in the compiler. (GH-6209)
Miss Islington (bot) [Sat, 24 Mar 2018 21:27:06 +0000 (14:27 -0700)]
bpo-33132: Fix reference counting issues in the compiler. (GH-6209)

(cherry picked from commit a95d98607efe0c43475b354543e49bf8e240bc6f)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
6 years ago[3.7] bpo-33127: Compatibility patch for LibreSSL 2.7.0 (GH-6210) (GH-6213)
Miss Islington (bot) [Sat, 24 Mar 2018 17:37:54 +0000 (10:37 -0700)]
[3.7] bpo-33127: Compatibility patch for LibreSSL 2.7.0 (GH-6210) (GH-6213)

LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
LibreSSL < 2.7.

Documentation updates and fixes for failing tests will be provided in
another patch set.

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1)

Co-authored-by: Christian Heimes <christian@python.org>
6 years ago[3.7] bpo-24334: Remove inaccurate match_hostname call (GH-6211) (#6212)
Miss Islington (bot) [Sat, 24 Mar 2018 14:59:16 +0000 (07:59 -0700)]
[3.7] bpo-24334: Remove inaccurate match_hostname call (GH-6211) (#6212)

Commit 141c5e8c re-added match_hostname() call. The resurrection of the
function call was never intended and was solely a merge mistake.

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit e42ae915095ebca789cc36f3a336a3331fe35945)

Co-authored-by: Christian Heimes <christian@python.org>
6 years agobpo-33061: Add missing 'NoReturn' to __all__ in typing.py (GH-6127) (#6162)
Ivan Levkivskyi [Fri, 23 Mar 2018 21:44:54 +0000 (21:44 +0000)]
bpo-33061: Add missing 'NoReturn' to __all__ in typing.py (GH-6127) (#6162)

6 years agobpo-27428: Fix WindowsRegistryFinder documentation to list appropriate ABC (GH-6061)
Miss Islington (bot) [Fri, 23 Mar 2018 21:41:26 +0000 (14:41 -0700)]
bpo-27428: Fix WindowsRegistryFinder documentation to list appropriate ABC (GH-6061)

(cherry picked from commit 5cbb84106efefd200933aa31e22abf39267d2557)

Co-authored-by: Himanshu Lakhara <himanshulakhara1947@gmail.com>
6 years agobpo-31639: Use threads in http.server module. (GH-5018)
Miss Islington (bot) [Fri, 23 Mar 2018 20:31:20 +0000 (13:31 -0700)]
bpo-31639: Use threads in http.server module. (GH-5018)

(cherry picked from commit 8bcfa02e4b1b65634e526e197588bc600674c80b)

Co-authored-by: Julien Palard <julien@palard.fr>
6 years agoFix a reference to the MRE book in re docs (GH-1113)
Miss Islington (bot) [Fri, 23 Mar 2018 15:55:26 +0000 (08:55 -0700)]
Fix a reference to the MRE book in re docs (GH-1113)

Reported by Maksym Nikulyak on docs.p.o.
(cherry picked from commit a0a42d22d8dff0ec6ea9daa4d9c9e9399f9b4e6c)

Co-authored-by: Berker Peksag <berker.peksag@gmail.com>
6 years agobpo-33041: Fixed jumping if the function contains an "async for" loop. (GH-6154)
Serhiy Storchaka [Fri, 23 Mar 2018 12:35:33 +0000 (14:35 +0200)]
bpo-33041: Fixed jumping if the function contains an "async for" loop. (GH-6154)

6 years agobpo-32999: ast: Convert useless check to assert (GH-6197)
Miss Islington (bot) [Fri, 23 Mar 2018 09:43:11 +0000 (02:43 -0700)]
bpo-32999: ast: Convert useless check to assert (GH-6197)

(cherry picked from commit c65bf3fe4a2bde424b79e350f36b7aaa3f6476f6)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agobpo-32505: dataclasses: raise TypeError if a member variable is of type Field, but...
Miss Islington (bot) [Thu, 22 Mar 2018 20:58:59 +0000 (13:58 -0700)]
bpo-32505: dataclasses: raise TypeError if a member variable is of type Field, but doesn't have a type annotation. (GH-6192)

If a dataclass has a member variable that's of type Field, but it doesn't have a type annotation, raise TypeError.
(cherry picked from commit 56970b8ce9d23269d20a76f13c80e670c856ba7f)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agobpo-32999: Revert GH-6002 (fc7df0e6) (GH-6189) (GH-6190)
Miss Islington (bot) [Thu, 22 Mar 2018 14:00:11 +0000 (07:00 -0700)]
bpo-32999: Revert GH-6002 (fc7df0e6) (GH-6189) (GH-6190)

bpo-33018 (GH-5944) fixed bpo-32999 too.  So fc7df0e6 is not required
anymore.  Revert it except test case.
(cherry picked from commit f757b72b2524ce3451d2269f0b8a9f0593a7b27f)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
6 years agobpo-33018: Improve issubclass() error checking and message. (GH-5944)
Miss Islington (bot) [Thu, 22 Mar 2018 11:49:26 +0000 (04:49 -0700)]
bpo-33018: Improve issubclass() error checking and message. (GH-5944)

This improves error message for situations when a non-class is
checked w.r.t. an abstract base class.
(cherry picked from commit 40472dd42de4f7265d456458cd13ad6894d736db)

Co-authored-by: jab <jab@users.noreply.github.com>
6 years agoUpgrade pip to v9.0.3 and setuptools to v39.0.1 (GH-6184)
Miss Islington (bot) [Thu, 22 Mar 2018 03:38:24 +0000 (20:38 -0700)]
Upgrade pip to v9.0.3 and setuptools to v39.0.1 (GH-6184)

(cherry picked from commit d93b5161af12291f3f98a260c90cc2975ea9e9cd)

Co-authored-by: Donald Stufft <donald@stufft.io>
6 years agobpo-33116: Add 'Field' to dataclasses.__all__. (GH-6182) (GH-6183)
Miss Islington (bot) [Wed, 21 Mar 2018 21:44:23 +0000 (14:44 -0700)]
bpo-33116: Add 'Field' to dataclasses.__all__. (GH-6182) (GH-6183)

- Add missing 'Field' to __all__.
- Improve tests to catch this.
(cherry picked from commit 8e4560a9da6a02aa157dd7df8bd0be0d258c0a73)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
6 years agoFIX failure on OSX sem_getvalue (GH-6180) (GH-6181)
Miss Islington (bot) [Wed, 21 Mar 2018 19:00:55 +0000 (12:00 -0700)]
FIX failure on OSX sem_getvalue (GH-6180) (GH-6181)

(cherry picked from commit dec1c7786f642049c2508e909442189dc043b5da)

Co-authored-by: Thomas Moreau <thomas.moreau.2010@gmail.com>