don't use type | None syntax because we support 3.9

Author: bmos

requestium/requestium_mixin.py

@@ -1,6 +1,7 @@
 import functools
 import time
 import warnings
+from typing import Optional
 
 import tldextract
 from parsel.selector import Selector, SelectorList
@@ -90,31 +91,31 @@ def is_cookie_in_driver(self, cookie) -> bool:
                 return True
         return False
 
-    def ensure_element_by_id(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_id(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.ID, selector, state, timeout)
 
-    def ensure_element_by_name(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_name(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.NAME, selector, state, timeout)
 
-    def ensure_element_by_xpath(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_xpath(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.XPATH, selector, state, timeout)
 
-    def ensure_element_by_link_text(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_link_text(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.LINK_TEXT, selector, state, timeout)
 
-    def ensure_element_by_partial_link_text(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_partial_link_text(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.PARTIAL_LINK_TEXT, selector, state, timeout)
 
-    def ensure_element_by_tag_name(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_tag_name(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.TAG_NAME, selector, state, timeout)
 
-    def ensure_element_by_class_name(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_class_name(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.CLASS_NAME, selector, state, timeout)
 
-    def ensure_element_by_css_selector(self, selector, state="present", timeout=None) -> WebElement | None:
+    def ensure_element_by_css_selector(self, selector, state="present", timeout=None) -> Optional[WebElement]:
         return self.ensure_element(By.CSS_SELECTOR, selector, state, timeout)
 
-    def ensure_element(self, locator: str, selector: str, state: str = "present", timeout=None) -> WebElement | None:
+    def ensure_element(self, locator: str, selector: str, state: str = "present", timeout=None) -> Optional[WebElement]:
         """This method allows us to wait till an element appears or disappears in the browser
 
         The webdriver runs in parallel with our scripts, so we must wait for it everytime it
@@ -192,7 +193,7 @@ def css(self, *args, **kwargs) -> SelectorList[Selector]:
     def re(self, *args, **kwargs) -> list[str]:
         return self.selector.re(*args, **kwargs)
 
-    def re_first(self, *args, **kwargs) -> str | None:
+    def re_first(self, *args, **kwargs) -> Optional[str]:
         return self.selector.re_first(*args, **kwargs)
 
 

requestium/requestium_response.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import requests
 from parsel.selector import Selector, SelectorList
 from requests import Response
@@ -27,5 +29,5 @@ def css(self, *args, **kwargs) -> SelectorList[Selector]:
     def re(self, *args, **kwargs) -> list[str]:
         return self.selector.re(*args, **kwargs)
 
-    def re_first(self, *args, **kwargs) -> str | None:
+    def re_first(self, *args, **kwargs) -> Optional[str]:
         return self.selector.re_first(*args, **kwargs)

requestium/requestium_session.py

@@ -1,7 +1,7 @@
 import functools
 import types
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional, Union
 
 import requests
 from selenium import webdriver
@@ -30,10 +30,10 @@ class Session(requests.Session):
 
     def __init__(
         self,
-        webdriver_path: Path | str | None = None,
-        headless: bool | None = None,
+        webdriver_path: Optional[Union[Path | str]] = None,
+        headless: Optional[bool] = None,
         default_timeout: float = 5,
-        webdriver_options: dict[str, Any] | None = None,
+        webdriver_options: Optional[dict[str, Any]] = None,
         driver=None,
     ) -> None:
         super().__init__()
@@ -65,7 +65,7 @@ def driver(self):
             self._driver = self._driver_initializer()
         return self._driver
 
-    def _start_chrome_browser(self, headless: bool | None = False):  # noqa C901
+    def _start_chrome_browser(self, headless: Optional[bool] = False):  # noqa C901
         # TODO transfer of proxies and headers: Not supported by chromedriver atm.
         # Choosing not to use plug-ins for this as I don't want to worry about the
         # extra dependencies and plug-ins don't work in headless mode. :-(
@@ -105,7 +105,7 @@ def _start_chrome_browser(self, headless: bool | None = False):  # noqa C901
         service = ChromeService(executable_path=str(self.webdriver_path))
         return RequestiumChrome(service=service, options=chrome_options, default_timeout=self.default_timeout)
 
-    def transfer_session_cookies_to_driver(self, domain: str | None = None) -> None:
+    def transfer_session_cookies_to_driver(self, domain: Optional[str] = None) -> None:
         """Copies the Session's cookies into the webdriver
 
         Using the 'domain' parameter we choose the cookies we wish to transfer, we only
@@ -125,7 +125,7 @@ def transfer_session_cookies_to_driver(self, domain: str | None = None) -> None:
 
             self.driver.ensure_add_cookie({k: v for k, v in cookie.items() if v is not None})
 
-    def transfer_driver_cookies_to_session(self, copy_user_agent: bool | None = True) -> None:
+    def transfer_driver_cookies_to_session(self, copy_user_agent: Optional[bool] = True) -> None:
         if copy_user_agent:
             self.copy_user_agent_from_driver()