Add isort to pre-commit

.isort.cfg

@@ -0,0 +1,3 @@
+[settings]
+multi_line_output = 3
+known_third_party = dateutil,httpretty,pytest,selenium,setuptools,urllib3

.pre-commit-config.yaml

@@ -3,3 +3,8 @@
     hooks:
     -   id: autopep8
         args: ["--global-config", ".config-pep8", "-i"]
+-   repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.20
+    hooks:
+    -   id: isort
+        args: ["-rc", "."]

README.md

@@ -44,6 +44,10 @@ download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
         ```
         $ python -m autopep8 -r --global-config .config-pep8 -i .
         ```
+    - `isort` helps to order imports automatically
+        ```
+        $ python -m isort -rc .
+        ```
 - You can customise `CHANGELOG.rst` with commit messages following [.gitchangelog.rc](.gitchangelog.rc)
     - It generates readable changelog
 - Setup

appium/saucetestcase.py

@@ -16,9 +16,10 @@
 
 from __future__ import print_function
 
-import unittest
 import os
 import sys
+import unittest
+
 from appium import webdriver
 from sauceclient import SauceClient
 

appium/webdriver/appium_service.py

@@ -17,6 +17,7 @@
 import subprocess
 import sys
 import time
+
 import urllib3
 
 DEFAULT_HOST = '127.0.0.1'

appium/webdriver/errorhandler.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from selenium.webdriver.remote import errorhandler
 from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.remote import errorhandler
 
 from appium.common.exceptions import NoSuchContextException
 

appium/webdriver/extensions/android/activities.py

@@ -15,6 +15,7 @@
 from selenium import webdriver
 from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.support.ui import WebDriverWait
+
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/android/gsm.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 from selenium import webdriver
-from appium.webdriver.mobilecommand import MobileCommand as Command
 
-from appium.common.logger import logger
 from appium.common.helper import extract_const_attributes
+from appium.common.logger import logger
+from appium.webdriver.mobilecommand import MobileCommand as Command
 
 
 class GsmCallActions(object):

appium/webdriver/extensions/android/network.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/android/performance.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/android/power.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/android/sms.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/android/system_bars.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/applications.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/clipboard.py

@@ -15,11 +15,12 @@
 import base64
 
 from selenium import webdriver
-from ..mobilecommand import MobileCommand as Command
 
 from appium.common.helper import appium_bytes
 from appium.webdriver.clipboard_content_type import ClipboardContentType
 
+from ..mobilecommand import MobileCommand as Command
+
 
 class Clipboard(webdriver.Remote):
 

appium/webdriver/extensions/context.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/device_time.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/hw_actions.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/images_comparison.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/ime.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/keyboard.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/location.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/remote_fs.py

@@ -16,6 +16,7 @@
 
 from selenium import webdriver
 from selenium.common.exceptions import InvalidArgumentException
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/screen_record.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/extensions/search_context.py

@@ -17,7 +17,8 @@
 import json
 
 from selenium import webdriver
-from selenium.webdriver.remote.webelement import WebElement as SeleniumWebElement
+from selenium.webdriver.remote.webelement import \
+    WebElement as SeleniumWebElement
 
 from appium.webdriver.common.mobileby import MobileBy
 

appium/webdriver/extensions/settings.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from selenium import webdriver
+
 from ..mobilecommand import MobileCommand as Command
 
 

appium/webdriver/webdriver.py

@@ -22,8 +22,9 @@
 from selenium.webdriver.remote.command import Command as RemoteCommand
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 
-
+from appium.common.logger import logger
 from appium.webdriver.common.mobileby import MobileBy
+
 from .appium_connection import AppiumConnection
 from .errorhandler import MobileErrorHandler
 from .extensions.action_helpers import ActionHelpers
@@ -38,10 +39,10 @@
 from .extensions.clipboard import Clipboard
 from .extensions.context import Context
 from .extensions.device_time import DeviceTime
+from .extensions.hw_actions import HardwareActions
 from .extensions.images_comparison import ImagesComparison
 from .extensions.ime import IME
 from .extensions.keyboard import Keyboard
-from .extensions.hw_actions import HardwareActions
 from .extensions.location import Location
 from .extensions.remote_fs import RemoteFS
 from .extensions.screen_record import ScreenRecord
@@ -51,8 +52,6 @@
 from .switch_to import MobileSwitchTo
 from .webelement import WebElement as MobileWebElement
 
-from appium.common.logger import logger
-
 # From remote/webdriver.py
 _W3C_CAPABILITY_NAMES = frozenset([
     'acceptInsecureCerts',

ci.sh

@@ -1,11 +1,15 @@
 #!/bin/bash
 
-result=$(python -m autopep8 -r --global-config .config-pep8 -d .)
-if [[ $result ]] ; then
-  echo $result
+
+if ! python -m autopep8 -r --global-config .config-pep8 -i . ; then
   echo "Please run command 'python -m autopep8 -r --global-config .config-pep8 -i .' on your local and commit the result"
   exit 1
 fi
 
+if ! python -m isort --check-only -rc . ; then
+  echo "Please run command 'python -m isort -rc .' on your local and commit the result"
+  exit 1
+fi
+
 python -m pylint --rcfile .pylintrc appium test --errors-only
 python -m pytest test/unit/

script/release.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 """Release script to publish release module to pipy."""
 
+import io
 import os
 import sys
-import io
 
 VERSION_FILE_PATH = os.path.join(os.path.dirname('__file__'), 'appium', 'version.py')
 CHANGELOG_PATH = os.path.join(os.path.dirname('__file__'), 'CHANGELOG.rst')

setup.py

@@ -15,6 +15,7 @@
 import os
 
 from setuptools import find_packages, setup
+
 from appium.common.helper import library_version
 
 setup(

test/functional/android/activities_tests.py

@@ -16,7 +16,6 @@
 import unittest
 
 from appium import webdriver
-
 from helper import desired_capabilities
 
 

test/functional/android/applications_tests.py

@@ -18,7 +18,6 @@
 
 from appium import webdriver
 from appium.webdriver.applicationstate import ApplicationState
-
 from helper import desired_capabilities
 
 

test/functional/android/context_switching_tests.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
 import unittest
 
+import pytest
+
 from appium import webdriver
 from appium.common.exceptions import NoSuchContextException
 from helper import desired_capabilities

test/functional/android/device_time_tests.py

@@ -14,10 +14,10 @@
 # limitations under the License.
 
 import unittest
+
 from dateutil.parser import parse
 
 from appium import webdriver
-
 from helper import desired_capabilities
 
 

test/functional/android/find_by_image_tests.py

@@ -12,17 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
+import base64
 import unittest
 
-from appium import webdriver
+import pytest
 from selenium.common.exceptions import NoSuchElementException, TimeoutException
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
-from helper import desired_capabilities
+from selenium.webdriver.support.ui import WebDriverWait
 
-import base64
+from appium import webdriver
+from helper import desired_capabilities
 
 
 @pytest.mark.skip(reason="Need to fix broken test")

test/functional/android/hw_actions.py

@@ -16,7 +16,6 @@
 import unittest
 
 from appium import webdriver
-
 from helper import desired_capabilities
 
 

test/functional/android/ime_tests.py

@@ -19,7 +19,6 @@
 from appium import webdriver
 from helper import desired_capabilities
 
-
 ANDROID_LATIN = 'com.android.inputmethod.latin/.LatinIME'  # Android L/M/N
 GOOGLE_LATIN = 'com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME'  # Android O/P
 

test/functional/android/keyboard_tests.py

@@ -16,7 +16,6 @@
 import unittest
 
 from appium import webdriver
-
 from helper import desired_capabilities
 
 

test/functional/android/location_tests.py

@@ -16,7 +16,6 @@
 import unittest
 
 from appium import webdriver
-
 from helper import desired_capabilities