From ed97067f6d85d28f6255c70eaf64b6631547eb56 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 23 Sep 2016 10:18:04 -0700
Subject: [PATCH] Different fix for locale/str/__builtin__ issue (#570)

---
 stdlib/2and3/locale.pyi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/stdlib/2and3/locale.pyi b/stdlib/2and3/locale.pyi
index 4f6aaf02a..9ad00e73b 100644
--- a/stdlib/2and3/locale.pyi
+++ b/stdlib/2and3/locale.pyi
@@ -5,11 +5,9 @@ import sys
 
 # workaround for mypy#2010
 if sys.version_info < (3,):
-    import __builtin__
-    _str = __builtin__.str
+    from __builtin__ import str as _str
 else:
-    import builtins
-    _str = builtins.str
+    from builtins import str as _str
 
 CODESET = ...  # type: int
 D_T_FMT = ...  # type: int