Upstream merge (python#659)

Author: Seluj78

.travis.yml

@@ -11,4 +11,4 @@ install:
 script:
   - powrap --check --quiet **/*.po
   - pospell -p dict -l fr_FR **/*.po
-  - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=40ee9a3640
+  - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=796698adf

c-api/exceptions.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-20 09:03+0100\n"
+"POT-Creation-Date: 2019-04-10 09:35+0200\n"
 "PO-Revision-Date: 2018-10-04 12:24+0200\n"
 "Last-Translator: Julien Palard <julien@palard.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"