[Python-checkins] cpython (merge 3.5 -> default): Issue #13849: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/a28abe83cf5c
changeset:   102429:a28abe83cf5c
parent:      102427:9498736fbd8f
parent:      102428:9e997c8f4876
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Jul 23 08:43:04 2016 +0300
summary:
  Issue #13849: Merge from 3.5

files:
  Lib/test/test_genericpath.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -280,7 +280,7 @@
             with self.subTest(attr=attr):
                 with self.assertRaises(ValueError) as cm:
                     getattr(self.pathmodule, attr)('/tmp\x00abcds')
-                self.assertEqual(str(cm.exception), 'embedded null byte')
+                self.assertIn('embedded null', str(cm.exception))
 
 # Following TestCase is not supposed to be run from test_genericpath.
 # It is inherited by other test modules (macpath, ntpath, posixpath).

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