Properly catch when missing close parenthesis and raise XPathParseError. With test.

Author: kata198

AdvancedHTMLParser/xpath/_body.py

@@ -2055,6 +2055,8 @@ def _parseBodyLevelGroup(restOfBody):
     curString = restOfBody[:].strip()
     ret = []
 
+    foundCloseParen = False
+
     while curString:
 
         gotMatch = False
@@ -2068,6 +2070,8 @@ def _parseBodyLevelGroup(restOfBody):
             newCurString = curString[ groupCloseMatch.span()[1] : ]
             curString = newCurString
 
+            foundCloseParen = True
+
             break
 
         groupOpenMatch = bodyElementGroupOpenRE.match(curString)
@@ -2101,6 +2105,9 @@ def _parseBodyLevelGroup(restOfBody):
 
         curString = newCurString
 
+    if foundCloseParen is False:
+
+        raise XPathParseError('Missing close parenthesis for section: "%s"' %(restOfBody, ))
 
 
     # Optimization: Before returning, run through and perform any operations against static values possible
@@ -2137,6 +2144,8 @@ def _parseFunctionArgsToBodyElements(restOfBody):
     fnArgs = []
     curGroupElements = []
 
+    foundCloseParen = False
+
     while curString:
 
         gotMatch = False
@@ -2150,6 +2159,8 @@ def _parseFunctionArgsToBodyElements(restOfBody):
             newCurString = curString[ groupCloseMatch.span()[1] : ]
             curString = newCurString
 
+            foundCloseParen = True
+
             break
 
         nextArgMatch = bodyElementGroupFunctionNextArgRE.match(curString)
@@ -2218,6 +2229,9 @@ def _parseFunctionArgsToBodyElements(restOfBody):
 
         curString = newCurString
 
+    if foundCloseParen is False:
+
+        raise XPathParseError('Missing close parenthesis for section: "%s"' %(restOfBody, ))
 
     if len(curGroupElements) > 0:
         # Optimize the group elements

tests/AdvancedHTMLParserTests/test_XPath.py

@@ -10,6 +10,7 @@
 import AdvancedHTMLParser
 
 from AdvancedHTMLParser.xpath._body import parseBodyStringIntoBodyElements, BodyElementValue, BodyElementValue_Boolean
+from AdvancedHTMLParser.xpath.exceptions import XPathParseError
 
 class TestXPath(object):
     '''
@@ -493,6 +494,30 @@ def test_xpathCache(self):
 
         assert timeWithCache < timeWithoutCache , 'Expected compiling XPath strings to be faster when caching the compiled result, but was not.\nTime with cache   : %.7f\nTime without cache: %.7f' %( timeWithCache, timeWithoutCache)
 
+
+    def test_xpathCatchMissingCloseParen(self):
+        '''
+            test_xpathCatchMissingCloseParen - Test that we properly catch missing close parenthesis
+        '''
+        try:
+            shouldWork = self.parser.getElementsByXPathExpression('//span[ (@name = ("itemName") ) ]')
+        except Exception as exc:
+            raise AssertionError('Expected normal parenthesis to parse correctly, but got exception: %s  %s' %( exc.__class__.__name__, str(exc) ))
+
+
+        didWork = True
+        theException = None
+        try:
+            shouldNotWork = self.parser.getElementsByXPathExpression('//span[ (@name = ("itemName"  ) ]')
+        except XPathParseError as exc2:
+            didWork = False
+            theException = exc2
+
+        assert didWork is False , 'Expected missing parenthesis to properly raise an XPathParseError exception, but it did not!'
+
+        assert 'Missing close' in str(theException) , 'Expected "Missing close" to be in the XPathParseError message for missing parenthesis, but it was not! Exception message was: %s' %(str(theException), )
+
+
 if __name__ == '__main__':
     sys.exit(subprocess.Popen('GoodTests.py -n1 "%s" %s' %(sys.argv[0], ' '.join(['"%s"' %(arg.replace('"', '\\"'), ) for arg in sys.argv[1:]]) ), shell=True).wait())