Use enumerate instead of range(len()), indent code

Author: iMichka

pygccxml/declarations/matchers.py

@@ -449,13 +449,11 @@ def __str__(self):
         if self.return_type is not None:
             msg.append('(return type==%s)' % str(self.return_type))
         if self.arg_types:
-            for i in range(len(self.arg_types)):
-                if self.arg_types[i] is None:
+            for i, arg_type in enumerate(self.arg_types):
+                if arg_type is None:
                     msg.append('(arg %d type==any)' % i)
                 else:
-                    msg.append(
-                        '(arg %d type==%s)' %
-                        (i, str(self.arg_types[i])))
+                    msg.append('(arg %d type==%s)' % (i, str(arg_type)))
         if not msg:
             msg.append('any')
         return ' and '.join(msg)

pygccxml/parser/linker.py

@@ -87,13 +87,11 @@ def __link_calldef(self):
         else:
             for arg in self.__inst.arguments:
                 arg.type = self.__link_type(arg.type)
-            for index in range(len(self.__inst.exceptions)):
+            for i, exception in enumerate(self.__inst.exceptions):
                 try:
-                    self.__inst.exceptions[index] = self.__decls[
-                        self.__inst.exceptions[index]]
+                    self.__inst.exceptions[i] = self.__decls[exception]
                 except KeyError:
-                    self.__inst.exceptions[index] = self.__link_type(
-                        self.__inst.exceptions[index])
+                    self.__inst.exceptions[i] = self.__link_type(exception)
 
     def visit_member_function(self):
         self.__link_calldef()

unittests/parser_test_case.py

@@ -47,18 +47,15 @@ def _test_calldef_args(self, calldef, expected_args):
             len(calldef.arguments) == len(expected_args),
             ("the function's '%s' expected number of arguments is '%d' and " +
                 "in reality it is different('%d')") %
-            (calldef.name,
-             len(expected_args),
-             len(calldef.arguments)))
-        for ordinal in range(len(expected_args)):
-            arg = calldef.arguments[ordinal]
-            expected_arg = expected_args[ordinal]
+            (calldef.name, len(expected_args), len(calldef.arguments)))
+
+        for i, expected_arg in enumerate(expected_args):
+            arg = calldef.arguments[i]
             self.failUnless(
                 arg == expected_arg,
                 ("the function's '%s' expected %d's argument is '%s' and in " +
                     "reality it is different('%s')") %
-                (calldef.name,
-                 ordinal, pprint.pformat(expected_arg.__dict__),
+                (calldef.name, i, pprint.pformat(expected_arg.__dict__),
                  pprint.pformat(arg.__dict__)))
 
     def _test_calldef_exceptions(self, calldef, exceptions):