Upgrade Python syntax with pyupgrade --py36-plus

Author: hugovk

atest/DynamicTypesAnnotationsLibrary.py

@@ -26,7 +26,7 @@ def wrapper(*args, **kwargs):
     return actual_decorator
 
 
-class CustomObject(object):
+class CustomObject:
 
     def __init__(self, x, y):
         self.x = x
@@ -75,19 +75,19 @@ def keyword_with_webdriver(self, arg: CustomObject):
 
     @keyword
     def keyword_default_and_annotation(self: 'DynamicTypesAnnotationsLibrary', arg1: int, arg2: Union[bool, str] = False) -> str:
-        return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
+        return '{}: {}, {}: {}'.format(arg1, type(arg1), arg2, type(arg2))
 
     @keyword(types={'arg': str})
     def keyword_robot_types_and_annotations(self: 'DynamicTypesAnnotationsLibrary', arg: int):
-        return '%s: %s' % (arg, type(arg))
+        return '{}: {}'.format(arg, type(arg))
 
     @keyword(types=None)
     def keyword_robot_types_disabled_and_annotations(self, arg: int):
-        return '%s: %s' % (arg, type(arg))
+        return '{}: {}'.format(arg, type(arg))
 
     @keyword(types={'arg1': str})
     def keyword_robot_types_and_bool_hint(self, arg1, arg2: bool):
-        return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
+        return '{}: {}, {}: {}'.format(arg1, type(arg1), arg2, type(arg2))
 
     @keyword
     def keyword_exception_annotations(self: 'DynamicTypesAnnotationsLibrary', arg: 'NotHere'):

atest/DynamicTypesLibrary.py

@@ -55,7 +55,7 @@ def keyword_many_default_types(self, arg1=1, arg2='Foobar'):
 
     @keyword
     def keyword_none(self, arg=None):
-        return '%s: %s' % (arg, type(arg))
+        return '{}: {}'.format(arg, type(arg))
 
     @keyword
     def is_python_3(self):
@@ -74,8 +74,8 @@ def keyword_wrapped(self, number=1, arg=''):
 
     @keyword
     def varargs_and_kwargs(self, *args, **kwargs):
-        return '%s, %s' % (args, kwargs)
+        return '{}, {}'.format(args, kwargs)
 
     @keyword
     def keyword_booleans(self, arg1=True, arg2=False):
-        return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
+        return '{}: {}, {}: {}'.format(arg1, type(arg1), arg2, type(arg2))

atest/ExtendExistingLibrary.py

@@ -8,7 +8,7 @@ def __init__(self):
         self.add_library_components([ExtendingComponent()])
 
 
-class ExtendingComponent(object):
+class ExtendingComponent:
 
     @keyword
     def keyword_in_extending_library(self):

atest/librarycomponents.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from robotlibcore import keyword
 
 
@@ -8,7 +6,7 @@ def function():
     return 1
 
 
-class Names(object):
+class Names:
     attribute = 'not keyword'
 
     @keyword
@@ -31,7 +29,7 @@ def dont_touch_property(self):
         raise RuntimeError('Should not touch property!!')
 
 
-class Arguments(object):
+class Arguments:
 
     @keyword
     def mandatory(self, arg1, arg2):
@@ -61,11 +59,11 @@ def format_args(self, *args, **kwargs):
         def ru(item):
             return repr(item).lstrip('u')
         args = [ru(a) for a in args]
-        kwargs = ['%s=%s' % (k, ru(kwargs[k])) for k in sorted(kwargs)]
+        kwargs = ['{}={}'.format(k, ru(kwargs[k])) for k in sorted(kwargs)]
         return ', '.join(args + kwargs)
 
 
-class DocsAndTags(object):
+class DocsAndTags:
 
     @keyword
     def one_line_doc(self):

atest/moc_library.py

@@ -1,7 +1,7 @@
 from robot.api.deco import keyword
 
 
-class MockLibrary(object):
+class MockLibrary:
 
     def no_args(self):
         pass

atest/run.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import platform
 from os.path import abspath, dirname, join
@@ -19,22 +18,22 @@
 sys.path.insert(0, join(curdir, '..', 'src'))
 python_version = platform.python_version()
 for variant in library_variants:
-    output = join(outdir, 'lib-%s-python-%s-robot-%s.xml' % (variant, python_version, rf_version))
+    output = join(outdir, 'lib-{}-python-{}-robot-{}.xml'.format(variant, python_version, rf_version))
     rc = run(tests, name=variant, variable='LIBRARY:%sLibrary' % variant,
              output=output, report=None, log=None, loglevel='debug')
     if rc > 250:
         sys.exit(rc)
     process_output(output, verbose=False)
-output = join(outdir, 'lib-DynamicTypesLibrary-python-%s-robot-%s.xml' % (python_version, rf_version))
+output = join(outdir, 'lib-DynamicTypesLibrary-python-{}-robot-{}.xml'.format(python_version, rf_version))
 rc = run(tests_types, name='Types', output=output, report=None, log=None, loglevel='debug')
 if rc > 250:
     sys.exit(rc)
 process_output(output, verbose=False)
 print('\nCombining results.')
 library_variants.append('DynamicTypesLibrary')
-rc = rebot(*(join(outdir, 'lib-%s-python-%s-robot-%s.xml' % (variant, python_version, rf_version)) for variant in library_variants),
-           **dict(name='Acceptance Tests', outputdir=outdir, log='log-python-%s-robot-%s.html' % (python_version, rf_version),
-                  report='report-python-%s-robot-%s.html' % (python_version, rf_version)))
+rc = rebot(*(join(outdir, 'lib-{}-python-{}-robot-{}.xml'.format(variant, python_version, rf_version)) for variant in library_variants),
+           **dict(name='Acceptance Tests', outputdir=outdir, log='log-python-{}-robot-{}.html'.format(python_version, rf_version),
+                  report='report-python-{}-robot-{}.html'.format(python_version, rf_version)))
 if rc == 0:
     print('\nAll tests passed/failed as expected.')
 else:

src/robotlibcore.py

@@ -37,7 +37,7 @@
 __version__ = '2.2.2.dev1'
 
 
-class HybridCore(object):
+class HybridCore:
 
     def __init__(self, library_components):
         self.keywords = {}
@@ -131,7 +131,7 @@ def get_keyword_source(self, keyword_name):
         path = self.__get_keyword_path(method)
         line_number = self.__get_keyword_line(method)
         if path and line_number:
-            return '%s:%s' % (path, line_number)
+            return '{}:{}'.format(path, line_number)
         if path:
             return path
         if line_number:
@@ -141,7 +141,7 @@ def get_keyword_source(self, keyword_name):
     def __get_keyword_line(self, method):
         try:
             lines, line_number = inspect.getsourcelines(method)
-        except (OSError, IOError, TypeError):
+        except (OSError, TypeError):
             return None
         for increment, line in enumerate(lines):
             if line.strip().startswith('def '):
@@ -155,7 +155,7 @@ def __get_keyword_path(self, method):
             return None
 
 
-class KeywordBuilder(object):
+class KeywordBuilder:
 
     @classmethod
     def build(cls, function):
@@ -231,7 +231,7 @@ def _get_kw_only(cls, arg_spec):
     @classmethod
     def _format_defaults(cls, arg, value):
         if RF31:
-            return '%s=%s' % (arg, value)
+            return '{}={}'.format(arg, value)
         return arg, value
 
     @classmethod
@@ -299,7 +299,7 @@ def _get_defaults(cls, arg_spec):
         return zip(names, arg_spec.defaults)
 
 
-class KeywordSpecification(object):
+class KeywordSpecification:
 
     def __init__(self, argument_specification=None, documentation=None, argument_types=None):
         self.argument_specification = argument_specification

utest/run.py

@@ -10,7 +10,7 @@
 curdir = dirname(abspath(__file__))
 atest_dir = join(curdir, '..', 'atest')
 python_version = platform.python_version()
-xunit_report = join(atest_dir, 'results', 'xunit-python-%s-robot%s.xml' % (python_version, rf_version))
+xunit_report = join(atest_dir, 'results', 'xunit-python-{}-robot{}.xml'.format(python_version, rf_version))
 src = join(curdir, '..', 'src')
 sys.path.insert(0, src)
 sys.path.insert(0, atest_dir)