From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 28 May 2015 17:45:29 +0000 (+0300)
Subject: Issue #24309: Removed Python 2 idioms.
X-Git-Tag: v3.5.0b2~13^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e6883f11ae8d0beaed3bc32537b977236c40170;p=python

Issue #24309: Removed Python 2 idioms.
---

diff --git a/Lib/string.py b/Lib/string.py
index f3365c67fb..e7b692d7f7 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -112,10 +112,7 @@ class Template(metaclass=_TemplateMetaclass):
             # Check the most common path first.
             named = mo.group('named') or mo.group('braced')
             if named is not None:
-                val = mapping[named]
-                # We use this idiom instead of str() because the latter will
-                # fail if val is a Unicode containing non-ASCII characters.
-                return '%s' % (val,)
+                return str(mapping[named])
             if mo.group('escaped') is not None:
                 return self.delimiter
             if mo.group('invalid') is not None:
@@ -142,9 +139,7 @@ class Template(metaclass=_TemplateMetaclass):
             named = mo.group('named') or mo.group('braced')
             if named is not None:
                 try:
-                    # We use this idiom instead of str() because the latter
-                    # will fail if val is a Unicode containing non-ASCII
-                    return '%s' % (mapping[named],)
+                    return str(mapping[named])
                 except KeyError:
                     return mo.group()
             if mo.group('escaped') is not None: