2to3.py -f dict

Author: eino-makitalo

doc/buildhtml.py

@@ -141,7 +141,7 @@ def setup_publishers(self):
         config file settings and command-line options by
         `self.get_settings()`.
         """
-        for name, publisher in self.publishers.items():
+        for name, publisher in list(self.publishers.items()):
             option_parser = OptionParser(
                 components=publisher.components, read_config_files=1,
                 usage=usage, description=description)

src/Selenium2Library/keywords/keywordgroup.py

@@ -28,7 +28,7 @@ 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():
+            for name, method in list(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)

src/Selenium2Library/locators/elementfinder.py

@@ -22,7 +22,7 @@ def __init__(self):
             'default': self._find_by_default
         }
         self._strategies = NormalizedDict(initial=strategies, caseless=True, spaceless=True)
-        self._default_strategies = strategies.keys()
+        self._default_strategies = list(strategies.keys())
 
     def find(self, browser, locator, tag=None):
         assert browser is not None
@@ -190,9 +190,7 @@ def _element_matches(self, element, tag, constraints):
     def _filter_elements(self, elements, tag, constraints):
         elements = self._normalize_result(elements)
         if tag is None: return elements
-        return filter(
-            lambda element: self._element_matches(element, tag, constraints),
-            elements)
+        return [element for element in elements if self._element_matches(element, tag, constraints)]
 
     def _get_attrs_with_url(self, key_attrs, criteria, browser):
         attrs = []

test/lib/mockito/invocation.py

@@ -47,14 +47,14 @@ def matches(self, invocation):
       return False
     if len(self.named_params) != len(invocation.named_params):
       return False
-    if self.named_params.keys() != invocation.named_params.keys():
+    if list(self.named_params.keys()) != list(invocation.named_params.keys()):
       return False
 
     for x, p1 in enumerate(self.params):
       if not self.compare(p1, invocation.params[x]):
           return False
 
-    for x, p1 in self.named_params.iteritems():
+    for x, p1 in self.named_params.items():
       if not self.compare(p1, invocation.named_params[x]):
           return False
 

test/lib/mockito/mock_registry.py

@@ -12,7 +12,7 @@ def mock_for(self, cls):
     return self.mocks.get(cls, None)
 
   def unstub_all(self):
-    for mock in self.mocks.itervalues():    
+    for mock in self.mocks.values():    
       mock.unstub()
     self.mocks.clear()  
 

test/lib/mockito/mockito.py

@@ -15,7 +15,7 @@ class ArgumentError(Exception):
   pass
 
 def _multiple_arguments_in_use(*args):
-  return len(filter(lambda x: x, args)) > 1    
+  return len([x for x in args if x]) > 1    
 
 def _invalid_argument(value):
   return (value is not None and value < 1) or value == 0