Merge pull request #29 from scivisum/task/RD-37645_remove_usages_of_lxml

[RD-37645] Removed validation of xpaths, and dep lxml

Author: erustusagutu

browserdebuggertools/chrome/interface.py

@@ -2,9 +2,7 @@
 import logging
 from base64 import b64decode, b64encode
 
-from lxml.etree import XPath, XPathSyntaxError
-
-from browserdebuggertools.exceptions import InvalidXPathError, ResourceNotFoundError
+from browserdebuggertools.exceptions import ResourceNotFoundError
 from browserdebuggertools.sockethandler import SocketHandler
 
 
@@ -196,17 +194,9 @@ def get_iframe_source_content(self, xpath):
 
         :param xpath: following the spec 3.1 https://www.w3.org/TR/xpath-31/
         :return: HTML markup
-        :raises XPathSyntaxError: The given xpath is invalid
         :raises IFrameNotFoundError: A matching iframe document could not be found
         :raises UnknownError: The socket handler received a message with an unknown error code
         """
-
-        try:
-            XPath(xpath)  # Validates the xpath
-
-        except XPathSyntaxError:
-            raise InvalidXPathError("{0} is not a valid xpath".format(xpath))
-
         return self._dom_manager.get_iframe_html(xpath)
 
     def get_page_source(self):

browserdebuggertools/exceptions.py

@@ -46,9 +46,5 @@ class MaxRetriesException(DevToolsException):
     pass
 
 
-class InvalidXPathError(DevToolsException):
-    pass
-
-
 class UnknownError(ProtocolError):
     pass

dev_requirements.txt

@@ -2,6 +2,5 @@ requests
 mock
 typing
 jinja2
-lxml
 websocket-client==0.56
 cherrypy==17.4.2

setup.py

@@ -5,15 +5,14 @@
         "requests",
         "websocket-client",
         "typing",
-        "lxml"
 ]
 
 
 PACKAGES = find_packages(include="browserdebuggertools*")
 
 setup(
     name="browserdebuggertools",
-    version="5.2.0",
+    version="5.3.0",
     packages=PACKAGES,
     install_requires=requires,
     license="GNU General Public License v3",

tests/e2etests/chrome/test_interface.py

@@ -9,7 +9,7 @@
 
 from browserdebuggertools.exceptions import (
     DevToolsException, DevToolsTimeoutException, JavascriptDialogNotFoundError,
-    InvalidXPathError, ResourceNotFoundError
+    ResourceNotFoundError
 )
 from browserdebuggertools.models import JavascriptDialog
 from tests.e2etests.testsite.start import Server as TestSiteServer, env
@@ -584,13 +584,6 @@ def test_node_found_but_its_not_an_iframe(self):
         with self.assertRaises(ResourceNotFoundError):
             self.devtools_client.get_iframe_source_content("//div")
 
-    def test_invalid_xpath(self):
-
-        assert isinstance(self, (ChromeInterfaceTest, TestCase))
-
-        with self.assertRaises(InvalidXPathError):
-            self.devtools_client.get_iframe_source_content("@@")
-
 
 class Test_ChromeInterface_test_get_frame_html_headed(
     HeadedChromeInterfaceTest, Test_ChromeInterface_test_get_iframe_source_content, TestCase