removed Python 2 code from tests

Becksteinlab · Jun 15, 2024 · c914e00 · c914e00
1 parent 8db674a
commit c914e00
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 31 deletions.
diff --git a/tests/test_cbook.py b/tests/test_cbook.py
@@ -3,8 +3,6 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
 import os.path
 import re
 

diff --git a/tests/test_collections.py b/tests/test_collections.py
@@ -4,10 +4,6 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
-import six
-
 import pytest
 
 import gromacs

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -3,17 +3,12 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
 import contextlib
 import os
 import errno
 import sys
 
-if sys.version_info[0] < 3:
-    from ConfigParser import NoOptionError, NoSectionError
-else:
-    from configparser import NoOptionError, NoSectionError
+from configparser import NoOptionError, NoSectionError
 
 import pytest
 

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -4,10 +4,6 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
-import six
-
 import os.path
 import pytest
 
@@ -73,10 +69,7 @@ def test_run_with_input(self, command, inp):
     def test_Popen_with_input(self, command, inp):
         po = command.Popen(stdout=False, stderr=False, input=inp)
         inp_string = "\n".join(gromacs.utilities.asiterable(inp)) + "\n"
-        if six.PY2:
-            assert po.input == inp_string.encode("utf-8")
-        else:
-            assert po.input == inp_string
+        assert po.input == inp_string
 
     def test_help_short(self, command, capsys):
         command.help()

diff --git a/tests/test_run.py b/tests/test_run.py
@@ -3,8 +3,6 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
 import time
 import pytest
 import os

diff --git a/tests/test_setup.py b/tests/test_setup.py
@@ -3,8 +3,6 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
 import os.path
 import pytest
 

diff --git a/tests/test_tools.py b/tests/test_tools.py
@@ -3,8 +3,6 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
 import pytest
 
 import gromacs

diff --git a/tests/test_utilities.py b/tests/test_utilities.py
@@ -3,13 +3,11 @@
 # Released under the GNU Public License 3 (or higher, your choice)
 # See the file COPYING for details.
 
-from __future__ import division, absolute_import, print_function
-
 import os.path
 import pytest
-from six.moves import cPickle as pickle
-from six.moves import StringIO
-from six.moves.collections_abc import Iterable
+import pickle
+from io import StringIO
+from collections.abc import Iterable
 
 import numpy as np