[Python-checkins] cpython (merge 3.6 -> default): merge

Mon Feb 6 10:16:04 EST 2017

https://hg.python.org/cpython/rev/e06af4027546
changeset: 106450:e06af4027546
parent: 106448:1c048539200c
parent: 106449:844ce25a0617
user: Raymond Hettinger <python at rcn.com>
date: Mon Feb 06 07:15:57 2017 -0800
summary:
 merge
files:
 Doc/library/re.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -1465,7 +1465,7 @@
 elif kind == 'SKIP':
 pass
 elif kind == 'MISMATCH':
- raise RuntimeError('%r unexpected on line %d' % (value, line_num))
+ raise RuntimeError(f'{value!r} unexpected on line {line_num}')
 else:
 if kind == 'ID' and value in keywords:
 kind = value
-- 
Repository URL: https://hg.python.org/cpython
