Merge pull request #9224 from drawks/iss9223

Resolve #9223 Fix test for python 2.6

test/units/TestUtils.py

@@ -687,14 +687,8 @@ class TestUtils(unittest.TestCase):
         )
 
         # invalid quote detection
-        try:
-            with self.assertRaises(Exception):
-                split_args('hey I started a quote"')
-            with self.assertRaises(Exception):
-                split_args('hey I started a\' quote')
-        except TypeError:
-            # you must be on Python 2.6 still, FIXME
-            pass
+        self.assertRaises(Exception, split_args, 'hey I started a quote"')
+        self.assertRaises(Exception, split_args, 'hey I started a\' quote')
 
         # jinja2 loop blocks with lots of complexity
         _test_combo(