appium · KazuCocoa · Oct 15, 2021 · Dec 14, 2020 · Dec 15, 2020 · Dec 19, 2020
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,122 @@ Changelog
 =========
 
 
+(unreleased)
+------------
+
+New
+~~~
+- Feat: do not raise an error in case method is already defined (#632)
+  [Kazuaki Matsuo]
+- Feat: add satellites in set_location (#620) [Kazuaki Matsuo]
+
+  * feat: add satellites in set_location
+
+  * fix review
+- Feat: Add command with `setattr` (#615) [Kazuaki Matsuo]
+
+  * chore: add placeholder
+
+  * move to extention way
+
+  * revert pytest
+
+  * add todo
+
+  * call method_name instead of wrapper
+
+  * remove types
+
+  * rename a method
+
+  * add examples
+
+  * add types-python-dateutil as error message
+
+  * add example more
+
+  * tweak naming
+
+  * Explicit Dict
+- Add types-python-dateutil in 4 branch. [Kazuaki Matsuo]
+- Add test to check log path. [Kazuaki Matsuo]
+
+Fix
+~~~
+- Fix tests. [Kazuaki Matsuo]
+- Remove w3c argument in MobileWebElement (#598) [Kazuaki Matsuo]
+
+  * Bump 2.0.0.b1
+
+  * Update changelog for 2.0.0.b1
+
+  * remove w3c
+- Fix format with black. [Kazuaki Matsuo]
+- Fix lint, CI and tests. [Kazuaki Matsuo]
+
+Other
+~~~~~
+- Bump 2.0.0.rc4. [Kazuaki Matsuo]
+- Tweak tests. [Kazuaki Matsuo]
+- Remove w3c flag. [Kazuaki Matsuo]
+- Remove w3c=True from MobileWebElement argument. [Kazuaki Matsuo]
+- Bump selenium version. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.rc3. [Kazuaki Matsuo]
+- Bump 2.0.0.rc3. [Kazuaki Matsuo]
+- Use 4.0.0.rc3. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.rc2. [Kazuaki Matsuo]
+- Bump 2.0.0.rc2. [Kazuaki Matsuo]
+- Try rc2. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.rc1. [Kazuaki Matsuo]
+- Bump 2.0.0.rc1. [Kazuaki Matsuo]
+- Try rc1. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.b5. [Kazuaki Matsuo]
+- Bump 2.0.0.b5. [Kazuaki Matsuo]
+- Chore(deps): update pylint requirement from ~=2.8 to ~=2.10 (#628)
+  [dependabot[bot]]
+
+  Updates the requirements on [pylint](https://github.com/PyCQA/pylint) to permit the latest version.
+  - [Release notes](https://github.com/PyCQA/pylint/releases)
+  - [Changelog](https://github.com/PyCQA/pylint/blob/main/ChangeLog)
+  - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.8.0...v2.10.2)
+
+  ---
+  updated-dependencies:
+  - dependency-name: pylint
+    dependency-type: direct:production
+  ...
+- Chore(deps): update tox requirement from ~=3.23 to ~=3.24 (#619)
+  [dependabot[bot]]
+
+  Updates the requirements on [tox](https://github.com/tox-dev/tox) to permit the latest version.
+  - [Release notes](https://github.com/tox-dev/tox/releases)
+  - [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
+  - [Commits](https://github.com/tox-dev/tox/compare/3.23.0...3.24.0)
+
+  ---
+  updated-dependencies:
+  - dependency-name: tox
+    dependency-type: direct:production
+  ...
+- Override log. [Kazuaki Matsuo]
+- Bump selenium version in tox. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.b4. [Kazuaki Matsuo]
+- Bump 2.0.0.b4. [Kazuaki Matsuo]
+- Use python selenium client v4.0.0.b4. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.b3. [Kazuaki Matsuo]
+- Bump 2.0.0.b3. [Kazuaki Matsuo]
+- Tweak some lines. [Kazuaki Matsuo]
+- Update selenium in pipfile. [Kazuaki Matsuo]
+- Bump selenium 4.0.0.b3. [Kazuaki Matsuo]
+- Update pipfile. [Kazuaki Matsuo]
+- Update changelog for 2.0.0.b2. [Kazuaki Matsuo]
+- Bump 2.0.0.b2. [Kazuaki Matsuo]
+- Bump base selenium version to 4.0.0.b2. [Kazuaki Matsuo]
+- Bump v2.0.0.a0. [Kazuaki Matsuo]
+- Update changelog for v2.0.0.a0. [Kazuaki Matsuo]
+- Bump selenium. [Kazuaki Matsuo]
+
+
 v1.3.0 (2021-09-27)
 -------------------
 

diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,7 @@ verify_ssl = true
 pre-commit = "~=2.15"
 
 [packages]
-selenium = "~=3.141"
+selenium = "~=4.0.0"
 
 black = "==20.8b1"
 

diff --git a/README.md b/README.md
@@ -7,18 +7,15 @@
 
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
-An extension library for adding [Selenium 3.0 draft](https://dvcs.w3.org/hg/webdriver/raw-file/tip/webdriver-spec.html) and [Mobile JSON Wire Protocol Specification draft](https://github.com/SeleniumHQ/mobile-spec/blob/master/spec-draft.md)
-functionality to the Python language bindings, for use with the mobile testing
-framework [Appium](https://appium.io).
+An extension library for adding [WebDriver Protocol](https://www.w3.org/TR/webdriver/) and Appium commands to the Selenium Python language binding for use with the mobile testing framework [Appium](https://appium.io).
 
 ## Notice
 
-Since **v1.0.0**, only Python 3 is supported
+Since **v1.0.0**, only Python 3.7+ is supported.
 
-### developing version
-[selenium-4](https://github.com/appium/python-client/tree/selenium-4) branch is a developing branch to switch base selenium client version from v3 to v4. The branch is available as pre-release versioning like `2.0.0.a0` via pypi.
-
-Main differences since current v1 is the v2 can connect to invalid SSL environment like self-certificated server. Please take a look at the branch's README for more details.
+Since **v2.0.0**, the base selenium client version is v4.
+The version only works in W3C WebDriver protocol format.
+If you would like to use the old protocol (MJSONWP), please use v1 Appium Python client.
 
 ## Getting the Appium Python client
 
@@ -52,12 +49,8 @@ download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
 
 ## Usage
 
-The Appium Python Client is fully compliant with the Selenium 3.0 specification
-draft, with some helpers to make mobile testing in Python easier. The majority of
-the usage remains as it has been for Selenium 2 (WebDriver), and as the [official
-Selenium Python bindings](https://pypi.org/project/selenium/) begins to
-implement the new specification that implementation will be used underneath, so
-test code can be written that is utilizable with both bindings.
+The Appium Python Client is fully compliant with the WebDriver Protocol
+including several helpers to make mobile testing in Python easier.
 
 To use the new functionality now, and to use the superset of functions, instead of
 including the Selenium `webdriver` module in your test code, use that from
@@ -133,6 +126,25 @@ desired_caps = dict(
 self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps, direct_connection=True)
 ```
 
+## Relax SSL validation
+
+`strict_ssl` option allows you to send commands to an invalid certificate host like a self-signed one.
+
+```python
+import unittest
+from appium import webdriver
+
+desired_caps = dict(
+    platformName='iOS',
+    platformVersion='13.4',
+    automationName='xcuitest',
+    deviceName='iPhone Simulator',
+    app=PATH('../../apps/UICatalog.app.zip')
+)
+
+self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps, strict_ssl=False)
+```
+
 ## Documentation
 
 - https://appium.github.io/python-client-sphinx/ is detailed documentation

diff --git a/appium/version.py b/appium/version.py
@@ -1 +1 @@
-version = '1.3.0'
+version = '2.0.0.rc4'
diff --git a/appium/webdriver/appium_connection.py b/appium/webdriver/appium_connection.py
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 import uuid
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any, Dict, Union
 
+import urllib3
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 
 from appium.common.helper import library_version
@@ -24,6 +25,23 @@
 
 
 class AppiumConnection(RemoteConnection):
+    def _get_connection_manager(self) -> Union[urllib3.PoolManager, urllib3.ProxyManager]:
+        # https://github.com/SeleniumHQ/selenium/blob/0e0194b0e52a34e7df4b841f1ed74506beea5c3e/py/selenium/webdriver/remote/remote_connection.py#L134
+        pool_manager_init_args = {'timeout': self._timeout}
+        # pylint: disable=E1101
+        if self._ca_certs:
+            pool_manager_init_args['cert_reqs'] = 'CERT_REQUIRED'
+            pool_manager_init_args['ca_certs'] = self._ca_certs
+        else:
+            # This line is necessary to disable certificate verification
+            pool_manager_init_args['cert_reqs'] = 'CERT_NONE'
+
+        return (
+            urllib3.PoolManager(**pool_manager_init_args)
+            if self._proxy_url is None
+            else urllib3.ProxyManager(self._proxy_url, **pool_manager_init_args)
+        )
+
     @classmethod
     def get_remote_connection_headers(cls, parsed_url: 'ParseResult', keep_alive: bool = True) -> Dict[str, Any]:
         """Override get_remote_connection_headers in RemoteConnection"""

diff --git a/appium/webdriver/extensions/action_helpers.py b/appium/webdriver/extensions/action_helpers.py
@@ -45,7 +45,7 @@ def scroll(self: T, origin_el: WebElement, destination_el: WebElement, duration:
         """
 
         # XCUITest x W3C spec has no duration by default in server side
-        if self.w3c and duration is None:
+        if duration is None:
             duration = 600
 
         action = TouchAction(self)

diff --git a/appium/webdriver/mobilecommand.py b/appium/webdriver/mobilecommand.py
@@ -107,3 +107,7 @@ class MobileCommand:
     # iOS
     TOUCH_ID = 'touchId'
     TOGGLE_TOUCH_ID_ENROLLMENT = 'toggleTouchIdEnrollment'
+
+    # To override selenium commands
+    GET_LOG = 'getLog'
+    GET_AVAILABLE_LOG_TYPES = 'getAvailableLogTypes'