[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/552547e92707
changeset:   102951:552547e92707
parent:      102949:14f042958c32
parent:      102950:53f2cde033ac
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Aug 30 10:03:32 2016 -0500
summary:
  Merge with 3.5

files:
  Lib/test/test_tools/test_i18n.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_tools/test_i18n.py b/Lib/test/test_tools/test_i18n.py
--- a/Lib/test/test_tools/test_i18n.py
+++ b/Lib/test/test_tools/test_i18n.py
@@ -4,9 +4,13 @@
 import unittest
 
 from test.support.script_helper import assert_python_ok
-from test.test_tools import toolsdir
+from test.test_tools import skip_if_missing, toolsdir
 from test.support import temp_cwd
 
+
+skip_if_missing()
+
+
 class Test_pygettext(unittest.TestCase):
     """Tests for the pygettext.py tool"""
 

-- 
Repository URL: https://hg.python.org/cpython