Merge branch 'trunk' into pinned-browser-updates

Author: diemol

java/src/org/openqa/selenium/internal/Require.java

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.internal;
 
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -161,11 +160,6 @@ public static IntChecker argument(String argName, @Nullable Integer number) {
     return new IntChecker(argName, number);
   }
 
-  @Deprecated(forRemoval = true)
-  public static FileChecker argument(String argName, @Nullable File file) {
-    return new FileChecker(argName, file);
-  }
-
   public static PathChecker argument(String argName, @Nullable Path path) {
     return new PathChecker(argName, path);
   }
@@ -180,11 +174,6 @@ public static <T> StateChecker<T> state(String name, @Nullable T state) {
     return new StateChecker<>(name, state);
   }
 
-  @Deprecated(forRemoval = true)
-  public static FileStateChecker state(String name, @Nullable File file) {
-    return new FileStateChecker(name, file);
-  }
-
   public static PathStateChecker state(String name, @Nullable Path path) {
     return new PathStateChecker(name, path);
   }
@@ -255,48 +244,6 @@ public int greaterThan(int max, String message) {
     }
   }
 
-  @Deprecated(forRemoval = true)
-  public static class FileChecker {
-
-    private final String argName;
-    private final @Nullable File file;
-
-    FileChecker(String argName, @Nullable File file) {
-      this.argName = argName;
-      this.file = file;
-    }
-
-    public File isFile() {
-      if (file == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
-      }
-      if (!file.exists()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_EXIST, argName, file.getAbsolutePath()));
-      }
-      if (!file.isFile()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_BE_FILE, argName, file.getAbsolutePath()));
-      }
-      return file;
-    }
-
-    public File isDirectory() {
-      if (file == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
-      }
-      if (!file.exists()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_EXIST, argName, file.getAbsolutePath()));
-      }
-      if (!file.isDirectory()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_BE_DIR, argName, file.getAbsolutePath()));
-      }
-      return file;
-    }
-  }
-
   public static class PathChecker {
 
     private final String argName;
@@ -373,58 +320,6 @@ public T instanceOf(Class<?> cls) {
     }
   }
 
-  @Deprecated(forRemoval = true)
-  public static class FileStateChecker {
-
-    private final String name;
-    private final @Nullable File file;
-
-    FileStateChecker(String name, @Nullable File file) {
-      this.name = name;
-      this.file = file;
-    }
-
-    public File isFile() {
-      if (file == null) {
-        throw new IllegalStateException(String.format(MUST_BE_SET, name));
-      }
-      if (!file.exists()) {
-        throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
-      }
-      if (!file.isFile()) {
-        throw new IllegalStateException(String.format(MUST_BE_FILE, name, file.getAbsolutePath()));
-      }
-      return file;
-    }
-
-    public File isDirectory() {
-      if (file == null) {
-        throw new IllegalStateException(String.format(MUST_BE_SET, name));
-      }
-      if (!file.exists()) {
-        throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
-      }
-      if (!file.isDirectory()) {
-        throw new IllegalStateException(String.format(MUST_BE_DIR, name, file.getAbsolutePath()));
-      }
-      return file;
-    }
-
-    public File isExecutable() {
-      if (file == null) {
-        throw new IllegalStateException(String.format(MUST_BE_SET, name));
-      }
-      if (!file.exists()) {
-        throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
-      }
-      if (!file.canExecute()) {
-        throw new IllegalStateException(
-            String.format(MUST_BE_EXECUTABLE, name, file.getAbsolutePath()));
-      }
-      return file;
-    }
-  }
-
   public static class PathStateChecker {
 
     private final String name;

py/selenium/webdriver/remote/webelement.py

@@ -77,7 +77,11 @@ def __init__(self, parent, id_) -> None:
         self._id = id_
 
     def __repr__(self):
-        return f'<{type(self).__module__}.{type(self).__name__} (session="{self._parent.session_id}", element="{self._id}")>'
+        return f'<{type(self).__module__}.{type(self).__name__} (session="{self.session_id}", element="{self._id}")>'
+
+    @property
+    def session_id(self) -> str:
+        return self._parent.session_id
 
     @property
     def tag_name(self) -> str:

py/selenium/webdriver/support/wait.py

@@ -81,15 +81,15 @@ def __init__(
         # avoid the divide by zero
         if self._poll == 0:
             self._poll = POLL_FREQUENCY
-        exceptions = list(IGNORED_EXCEPTIONS)
+        exceptions: list = list(IGNORED_EXCEPTIONS)
         if ignored_exceptions:
             try:
                 exceptions.extend(iter(ignored_exceptions))
             except TypeError:  # ignored_exceptions is not iterable
                 exceptions.append(ignored_exceptions)
         self._ignored_exceptions = tuple(exceptions)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f'<{type(self).__module__}.{type(self).__name__} (session="{self._driver.session_id}")>'
 
     def until(self, method: Callable[[D], Union[Literal[False], T]], message: str = "") -> T: