Remove redundant py2 if clauses

Author: mpsonntag

odml/dtypes.py

@@ -147,14 +147,13 @@ def set(value, dtype=None):
     """
     if not dtype:
         return str_set(value)
+
     if dtype.endswith("-tuple"):
         return tuple_set(value)
-    if sys.version_info > (3, 0):
-        if isinstance(value, str):
-            return str_set(value)
-    else:
-        if isinstance(value, str):
-            return str_set(value)
+
+    if isinstance(value, str):
+        return str_set(value)
+
     return self.get(dtype + "_set", str_set)(value)
 
 

odml/tools/xmlparser.py

@@ -449,11 +449,7 @@ def parse_tag(self, root, fmt, insert_children=True):
                 self.error("Invalid element <%s> in odML document section <%s> "
                            % (node.tag, root.tag), node)
 
-        if sys.version_info > (3,):
-            check_args = dict(list(arguments.items()) + list(extra_args.items()))
-        else:
-            check_args = dict(arguments.items() + extra_args.items())
-
+        check_args = dict(list(arguments.items()) + list(extra_args.items()))
         self.check_mandatory_arguments(check_args, fmt, root.tag, root)
 
         # Instantiate the current odML object with the parsed attributes.