Merged r72753:72754 from 2.9 branch.

Raise SyntaxError when encountering invalid PythonScript headers.

lib/python/Products/PythonScripts/PythonScript.py

@@ -417,7 +417,7 @@ class PythonScript(Script, Historical, Cacheable):
                 k = k.strip().lower()
                 v = v.strip()
                 if not mdata.has_key(k):
-                    SyntaxError, 'Unrecognized header line "%s"' % line
+                    raise SyntaxError, 'Unrecognized header line "%s"' % line
                 if v == mdata[k]:
                     # Unchanged value
                     continue

lib/python/Products/PythonScripts/tests/testPythonScript.py

@@ -197,6 +197,9 @@ class TestPythonScriptNoAq(PythonScriptTestBase):
         bound = f.__render_with_namespace__({'yes': 1, 'no': self.fail})
         self.assertEqual(bound, 1)
 
+    def testNSBindInvalidHeader(self):
+        self.assertRaises(SyntaxError, self._filePS, 'ns_bind_invalid')
+
     def testBooleanMap(self):
         res = self._filePS('boolean_map')()
         self.failUnless(res)

lib/python/Products/PythonScripts/tests/tscripts/ns_bind_invalid.ps

+##parameters=yes
+##unknownheader='foo'
+return