Drop Python 2 workarounds

fkie · Sep 20, 2024 · 0d423df · 0d423df
1 parent 4351b1b
commit 0d423df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/src/catkin_lint/util.py b/src/catkin_lint/util.py
@@ -69,11 +69,7 @@ def word_split(s):
     return result
 
 
-try:
-    from itertools import zip_longest
-except ImportError:
-    def zip_longest(*args):
-        return map(None, *args)
+from itertools import zip_longest  # noqa
 
 
 def write_atomic(filepath, data):
@@ -123,8 +119,4 @@ def enumerate_package_files(rootdir, catkin_ignore=True, ignore_dot=True, ignore
                 yield dirpath, filename
 
 
-# Python 3 compatibility without sacrificing the speed gain of iteritems in Python 2
-try:
-    iteritems = dict.iteritems
-except AttributeError:
-    iteritems = dict.items
+iteritems = dict.items
diff --git a/test/helper.py b/test/helper.py
@@ -39,10 +39,7 @@
 from unittest import skip
 
 import os
-try:
-    from unittest.mock import patch, mock_open, DEFAULT  # noqa
-except ImportError:
-    from mock import patch, mock_open, DEFAULT  # noqa
+from unittest.mock import patch, mock_open, DEFAULT  # noqa
 
 import posixpath
 import ntpath