Remove Python 2 support

AppiumLibrary/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 from AppiumLibrary.keywords import *
 from AppiumLibrary.version import VERSION

AppiumLibrary/keywords/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from ._logging import _LoggingKeywords
 from ._runonfailure import _RunOnFailureKeywords
 from ._element import _ElementKeywords

AppiumLibrary/keywords/_android_utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import base64
 
 from .keywordgroup import KeywordGroup

AppiumLibrary/keywords/_applicationmanagement.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import robot
 import inspect

AppiumLibrary/keywords/_element.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from AppiumLibrary.locators import ElementFinder
 from appium.webdriver.common.appiumby import AppiumBy
 from .keywordgroup import KeywordGroup

AppiumLibrary/keywords/_keyevent.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from .keywordgroup import KeywordGroup
 
 

AppiumLibrary/keywords/_logging.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 from robot.libraries.BuiltIn import BuiltIn
 from robot.libraries.BuiltIn import RobotNotRunningError

AppiumLibrary/keywords/_runonfailure.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from robot.libraries import BuiltIn
 from .keywordgroup import KeywordGroup
 
@@ -36,8 +34,8 @@ def register_keyword_to_run_on_failure(self, keyword):
         | ${previous kw}= | Register Keyword To Run On Failure  | Nothing    | # Disables run-on-failure functionality and stores the previous kw name in a variable. |
         | Register Keyword To Run On Failure  | ${previous kw} | # Restore to the previous keyword. |
 
-        This run-on-failure functionality only works when running tests on Python/Jython 2.4
-        or newer and it does not work on IronPython at all.
+        This run-on-failure functionality only works when running tests on Python 3.9
+        or newer.
         """
         old_keyword = self._run_on_failure_keyword
         old_keyword_text = old_keyword if old_keyword is not None else "Nothing"

AppiumLibrary/keywords/_screenrecord.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import robot
 import base64

AppiumLibrary/keywords/_screenshot.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import robot
 from .keywordgroup import KeywordGroup

AppiumLibrary/keywords/_touch.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import time
 
 from appium.webdriver.extensions.action_helpers import ActionHelpers

AppiumLibrary/keywords/keywordgroup.py

@@ -1,14 +1,7 @@
-# -*- coding: utf-8 -*-
-
-import sys
 import inspect
-from six import with_metaclass
-try:
-    from decorator import decorator
-except SyntaxError:  # decorator module requires Python/Jython 2.4+
-    decorator = None
-if sys.platform == 'cli':
-    decorator = None  # decorator module doesn't work with IronPython 2.6
+
+from decorator import decorator
+
 
 def _run_on_failure_decorator(method, *args, **kwargs):
     try:
@@ -22,12 +15,11 @@ def _run_on_failure_decorator(method, *args, **kwargs):
 
 class KeywordGroupMetaClass(type):
     def __new__(cls, clsname, bases, dict):
-        if decorator:
-            for name, method in dict.items():
-                if not name.startswith('_') and inspect.isroutine(method):
-                    dict[name] = decorator(_run_on_failure_decorator, method)
+        for name, method in dict.items():
+            if not name.startswith('_') and inspect.isroutine(method):
+                dict[name] = decorator(_run_on_failure_decorator, method)
         return type.__new__(cls, clsname, bases, dict)
 
 
-class KeywordGroup(with_metaclass(KeywordGroupMetaClass, object)):
+class KeywordGroup(object, metaclass=KeywordGroupMetaClass):
     pass

AppiumLibrary/locators/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from .elementfinder import ElementFinder
 
 __all__ = [

AppiumLibrary/locators/elementfinder.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from AppiumLibrary import utils
 from appium.webdriver.common.appiumby import AppiumBy
 from robot.api import logger

AppiumLibrary/utils/__init__.py

@@ -1,12 +1,8 @@
-import six
-
 from .applicationcache import ApplicationCache
 
-if six.PY3:
-    unicode = str
 
 def escape_xpath_value(value):
-    value = unicode(value)
+    value = str(value)
     if '"' in value and '\'' in value:
         parts_wo_apos = value.split('\'')
         return "concat('%s')" % "', \"'\", '".join(parts_wo_apos)

AppiumLibrary/version.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 VERSION = '3.2.1'

pyproject.toml

@@ -11,7 +11,6 @@ dependencies = [
     "docutils >= 0.8.1",
     "selenium >=4.26.0",
     "Appium-Python-Client >= 5.1.1",
-    "six >= 1.10.0",
     "geopy >= 2.4.1",
 ]
 description = "Robot Framework Mobile app testing library for Appium Client Android & iOS & Web"

test_require.txt

@@ -1,5 +1,4 @@
 mock >= 2.0.0
 pytest-cov >= 2.5.1
 pytest-xdist >= 1.16.0
-pytest >= 3.1.0
-six >= 1.10.0
+pytest >= 3.1.0

tests/keywords/test_androidUtils.py

@@ -18,11 +18,6 @@
 
 
 class AndroidUtilsTests(unittest.TestCase):
-    import six
-    if six.PY2:
-        assertRegex = unittest.TestCase.assertRegexpMatches
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
     am = None
     au = None
 

tests/keywords/test_multipleAppiumConnections.py

@@ -15,12 +15,7 @@
 logger.addHandler(stream_handler)
 
 class MultipleAppiumConnectionTests(unittest.TestCase):
-    import six
-    if six.PY2:
-        assertRegex = unittest.TestCase.assertRegexpMatches
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-    am=None
+    am = None
 
     def setUp(self):
         #appium.webdriver.Remote = mock.Mock()

tests/utils/test_applicationcache.py

@@ -4,11 +4,6 @@
 
 
 class ApplicationCacheTests(unittest.TestCase):
-    import six
-    if six.PY2:
-        assertRegex = unittest.TestCase.assertRegexpMatches
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
     def test_no_current_message(self):
         cache = ApplicationCache()
         with self.assertRaisesRegex(RuntimeError, "No current application"):