chore: Applied some py3 formats (#486)

* Removed unused import

* Removed unnecessary codes

* Applied f'' format instead ''.format()

* Fixes

* tweak

Author: ki4070ma

appium/saucetestcase.py

@@ -19,7 +19,7 @@
 import os
 import sys
 import unittest
-from typing import Any, Callable, List
+from typing import Callable, List
 
 from sauceclient import SauceClient
 

appium/webdriver/appium_service.py

@@ -50,8 +50,7 @@ def poll_url(host: str, port: int, path: str, timeout_ms: int) -> bool:
     while time.time() < time_started_sec + timeout_ms / 1000.0:
         try:
             conn = urllib3.PoolManager(timeout=1.0)
-            resp = conn.request('HEAD', 'http://{host}:{port}{path}'.format(
-                host=host, port=port, path=path))
+            resp = conn.request('HEAD', f'http://{host}:{port}{path}')
             if resp.status < 400:
                 return True
         except Exception:
@@ -67,7 +66,7 @@ class AppiumServiceError(RuntimeError):
 T = TypeVar('T', bound='AppiumService')
 
 
-class AppiumService(object):
+class AppiumService:
     def __init__(self) -> None:
         self._process: Optional[sp.Popen] = None
         self._cmd: Optional[List] = None
@@ -169,13 +168,12 @@ def start(self, **kwargs: Any) -> sp.Popen:
         port = self._parse_port(args)
         error_msg: Optional[str] = None
         if not self.is_running or (timeout_ms > 0 and not poll_url(host, port, STATUS_URL, timeout_ms)):
-            error_msg = 'Appium has failed to start on {}:{} within {}ms timeout'\
-                        .format(host, port, timeout_ms)
+            error_msg = f'Appium has failed to start on {host}:{port} within {timeout_ms}ms timeout'
         if error_msg is not None:
             if stderr == sp.PIPE:
                 err_output = self._process.stderr.read()
                 if err_output:
-                    error_msg += '\nOriginal error: {}'.format(str(err_output))
+                    error_msg += f'\nOriginal error: {str(err_output)}'
             self.stop()
             raise AppiumServiceError(error_msg)
         return self._process

appium/webdriver/applicationstate.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-class ApplicationState(object):
+class ApplicationState:
     NOT_INSTALLED = 0
     NOT_RUNNING = 1
     RUNNING_IN_BACKGROUND_SUSPENDED = 2

appium/webdriver/clipboard_content_type.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-class ClipboardContentType(object):
+class ClipboardContentType:
     PLAINTEXT = 'plaintext'
     IMAGE = 'image'
     URL = 'url'

appium/webdriver/common/multi_action.py

@@ -31,7 +31,7 @@
 T = TypeVar('T', bound='MultiAction')
 
 
-class MultiAction(object):
+class MultiAction:
     def __init__(self, driver: 'WebDriver', element: Optional['WebElement'] = None) -> None:
         self._driver = driver
         self._element = element

appium/webdriver/common/touch_action.py

@@ -35,7 +35,7 @@
 T = TypeVar('T', bound='TouchAction')
 
 
-class TouchAction(object):
+class TouchAction:
 
     def __init__(self, driver: Optional['WebDriver'] = None):
         self._driver = driver

appium/webdriver/connectiontype.py

@@ -26,7 +26,7 @@
 """
 
 
-class ConnectionType(object):
+class ConnectionType:
     NO_CONNECTION = 0
     AIRPLANE_MODE = 1
     WIFI_ONLY = 2

appium/webdriver/extensions/android/display.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TypeVar
-
 from selenium import webdriver
 
 from appium.webdriver.mobilecommand import MobileCommand as Command

appium/webdriver/extensions/android/gsm.py

@@ -21,22 +21,22 @@
 from appium.webdriver.mobilecommand import MobileCommand as Command
 
 
-class GsmCallActions(object):
+class GsmCallActions:
     CALL = 'call'
     ACCEPT = 'accept'
     CANCEL = 'cancel'
     HOLD = 'hold'
 
 
-class GsmSignalStrength(object):
+class GsmSignalStrength:
     NONE_OR_UNKNOWN = 0
     POOR = 1
     MODERATE = 2
     GOOD = 3
     GREAT = 4
 
 
-class GsmVoiceState(object):
+class GsmVoiceState:
     UNREGISTERED = 'unregistered'
     HOME = 'home'
     ROAMING = 'roaming'
@@ -66,8 +66,8 @@ def make_gsm_call(self, phone_number: str, action: str) -> T:
         """
         constants = extract_const_attributes(GsmCallActions)
         if action not in constants.values():
-            logger.warning('{} is unknown. Consider using one of {} constants. (e.g. {}.CALL)'.format(
-                action, list(constants.keys()), GsmCallActions.__name__))
+            logger.warning(
+                f'{action} is unknown. Consider using one of {list(constants.keys())} constants. (e.g. {GsmCallActions.__name__}.CALL)')
         self.execute(Command.MAKE_GSM_CALL, {'phoneNumber': phone_number, 'action': action})
         return self
 
@@ -85,8 +85,8 @@ def set_gsm_signal(self, strength: int) -> T:
         """
         constants = extract_const_attributes(GsmSignalStrength)
         if strength not in constants.values():
-            logger.warning('{} is out of range. Consider using one of {} constants. (e.g. {}.GOOD)'.format(
-                strength, list(constants.keys()), GsmSignalStrength.__name__))
+            logger.warning(
+                f'{strength} is out of range. Consider using one of {list(constants.keys())} constants. (e.g. {GsmSignalStrength.__name__}.GOOD)')
         self.execute(Command.SET_GSM_SIGNAL, {'signalStrength': strength, 'signalStrengh': strength})
         return self
 
@@ -104,8 +104,8 @@ def set_gsm_voice(self, state: str) -> T:
         """
         constants = extract_const_attributes(GsmVoiceState)
         if state not in constants.values():
-            logger.warning('{} is unknown. Consider using one of {} constants. (e.g. {}.HOME)'.format(
-                state, list(constants.keys()), GsmVoiceState.__name__))
+            logger.warning(
+                f'{state} is unknown. Consider using one of {list(constants.keys())} constants. (e.g. {GsmVoiceState.__name__}.HOME)')
         self.execute(Command.SET_GSM_VOICE, {'state': state})
         return self
 

appium/webdriver/extensions/android/network.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, TypeVar
+from typing import TypeVar
 
 from selenium import webdriver
 
@@ -23,7 +23,7 @@
 T = TypeVar('T', bound='Network')
 
 
-class NetSpeed(object):
+class NetSpeed:
     GSM = 'gsm'  # GSM/CSD (up: 14.4(kbps), down: 14.4(kbps))
     SCSD = 'scsd'  # HSCSD (up: 14.4, down: 57.6)
     GPRS = 'gprs'  # GPRS (up: 28.8, down: 57.6)
@@ -98,8 +98,8 @@ def set_network_speed(self, speed_type: str) -> T:
         """
         constants = extract_const_attributes(NetSpeed)
         if speed_type not in constants.values():
-            logger.warning('{} is unknown. Consider using one of {} constants. (e.g. {}.LTE)'.format(
-                speed_type, list(constants.keys()), NetSpeed.__name__))
+            logger.warning(
+                f'{speed_type} is unknown. Consider using one of {list(constants.keys())} constants. (e.g. {NetSpeed.__name__}.LTE)')
 
         self.execute(Command.SET_NETWORK_SPEED, {'netspeed': speed_type})
         return self