chore: roll to the new driver (microsoft#415)

dgozman · web-flow · commit 8daba92c75b0 · 2021-01-05T20:30:15.000-08:00
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Playwright is a Python library to automate [Chromium](https://www.chromium.org/H
 |   :---   | :---: | :---: | :---:   |
 | Chromium <!-- GEN:chromium-version -->89.0.4344.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
 | WebKit <!-- GEN:webkit-version -->14.1<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->84.0b9<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->85.0b1<!-- GEN:stop --> | ✅ | ✅ | ✅ |
 
 Headless execution is supported for all browsers on all platforms.
 
diff --git a/playwright/_impl/_driver.py b/playwright/_impl/_driver.py
@@ -25,8 +25,8 @@ def compute_driver_executable() -> Path:
     package_path = Path(inspect.getfile(playwright)).parent
     platform = sys.platform
     if platform == "win32":
-        return package_path / "driver" / "playwright-cli.exe"
-    return package_path / "driver" / "playwright-cli"
+        return package_path / "driver" / "playwright.cmd"
+    return package_path / "driver" / "playwright.sh"
 
 
 if sys.version_info.major == 3 and sys.version_info.minor == 7:
diff --git a/playwright/async_api/_generated.py b/playwright/async_api/_generated.py
@@ -2320,7 +2320,7 @@ async def wait_for_element_state(
     ) -> NoneType:
         """ElementHandle.wait_for_element_state
 
-        Returns the element satisfies the `state`.
+        Returns when the element satisfies the `state`.
 
         Depending on the `state` parameter, this method waits for one of the [actionability](./actionability.md) checks to pass.
         This method throws when the element is detached while waiting, unless waiting for the `"hidden"` state.
@@ -2362,7 +2362,8 @@ async def wait_for_selector(
     ) -> typing.Union["ElementHandle", NoneType]:
         """ElementHandle.wait_for_selector
 
-        Returns element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or `detached`.
+        Returns element specified by selector when it satisfies `state` option. Returns `null` if waiting for `hidden` or
+        `detached`.
 
         Wait for the `selector` relative to the element handle to satisfy `state` option (either appear/disappear from dom, or
         become visible/hidden). If at the moment of calling the method `selector` already satisfies the condition, the method
diff --git a/playwright/sync_api/_generated.py b/playwright/sync_api/_generated.py
@@ -2372,7 +2372,7 @@ def wait_for_element_state(
     ) -> NoneType:
         """ElementHandle.wait_for_element_state
 
-        Returns the element satisfies the `state`.
+        Returns when the element satisfies the `state`.
 
         Depending on the `state` parameter, this method waits for one of the [actionability](./actionability.md) checks to pass.
         This method throws when the element is detached while waiting, unless waiting for the `"hidden"` state.
@@ -2416,7 +2416,8 @@ def wait_for_selector(
     ) -> typing.Union["ElementHandle", NoneType]:
         """ElementHandle.wait_for_selector
 
-        Returns element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or `detached`.
+        Returns element specified by selector when it satisfies `state` option. Returns `null` if waiting for `hidden` or
+        `detached`.
 
         Wait for the `selector` relative to the element handle to satisfy `state` option (either appear/disappear from dom, or
         become visible/hidden). If at the moment of calling the method `selector` already satisfies the condition, the method
diff --git a/setup.py b/setup.py
@@ -15,20 +15,31 @@
 import glob
 import os
 import shutil
-import stat
 import subprocess
 import sys
+import typing
 import zipfile
 
 import setuptools
 from wheel.bdist_wheel import bdist_wheel as BDistWheelCommand
 
-driver_version = "0.170.0-next.1608058598043"
+driver_version = "1.8.0-next-1609895143000"
 
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
+NoneType = type(None)
+
+
+def extractall(zip: typing.Any, path: str) -> NoneType:
+    for name in zip.namelist():
+        member = zip.getinfo(name)
+        extracted_path = zip._extract_member(member, path, None)
+        attr = member.external_attr >> 16
+        if attr != 0:
+            os.chmod(extracted_path, attr)
+
 
 class PlaywrightBDistWheelCommand(BDistWheelCommand):
     def run(self) -> None:
@@ -42,9 +53,12 @@ def run(self) -> None:
         os.makedirs("driver", exist_ok=True)
         os.makedirs("playwright/driver", exist_ok=True)
         for platform in ["mac", "linux", "win32", "win32_x64"]:
-            zip_file = f"playwright-cli-{driver_version}-{platform}.zip"
+            zip_file = f"playwright-{driver_version}-{platform}.zip"
             if not os.path.exists("driver/" + zip_file):
-                url = "https://playwright.azureedge.net/builds/cli/next/" + zip_file
+                url = "https://playwright.azureedge.net/builds/driver/"
+                if "-next" in driver_version:
+                    url = url + "next/"
+                url = url + zip_file
                 print("Fetching ", url)
                 subprocess.check_call(
                     ["curl", "--http1.1", url, "-o", "driver/" + zip_file]
@@ -57,19 +71,12 @@ def run(self) -> None:
             "win32": "win32_x64" if sys.maxsize > 2 ** 32 else "win32",
         }
         for platform in ["mac", "linux", "win32", "win32_x64"]:
-            zip_file = f"driver/playwright-cli-{driver_version}-{platform}.zip"
+            zip_file = f"driver/playwright-{driver_version}-{platform}.zip"
             with zipfile.ZipFile(zip_file, "r") as zip:
-                zip.extractall(f"driver/{platform}")
+                extractall(zip, f"driver/{platform}")
             if platform_map[sys.platform] == platform:
                 with zipfile.ZipFile(zip_file, "r") as zip:
-                    zip.extractall("playwright/driver")
-                for file in os.listdir("playwright/driver"):
-                    if file == "playwright-cli" or file.startswith("ffmpeg"):
-                        print(f"playwright/driver/{file}")
-                        os.chmod(
-                            f"playwright/driver/{file}",
-                            os.stat(f"playwright/driver/{file}").st_mode | stat.S_IEXEC,
-                        )
+                    extractall(zip, "playwright/driver")
             wheel = ""
             if platform == "mac":
                 wheel = "macosx_10_13_x86_64.whl"
@@ -82,14 +89,12 @@ def run(self) -> None:
             wheel_location = without_platform + wheel
             shutil.copy(base_wheel_location, wheel_location)
             with zipfile.ZipFile(wheel_location, "a") as zip:
-                for file in os.listdir(f"driver/{platform}"):
-                    from_location = f"driver/{platform}/{file}"
-                    to_location = f"playwright/driver/{file}"
-                    if file == "playwright-cli" or file.startswith("ffmpeg"):
-                        os.chmod(
-                            from_location, os.stat(from_location).st_mode | stat.S_IEXEC
-                        )
-                    zip.write(from_location, to_location)
+                driver_root = os.path.abspath(f"driver/{platform}")
+                for dir_path, dirs, files in os.walk(driver_root):
+                    for file in files:
+                        from_path = os.path.join(dir_path, file)
+                        to_path = os.path.relpath(from_path, driver_root)
+                        zip.write(from_path, f"playwright/driver/{to_path}")
         os.remove(base_wheel_location)
 
 
