Dropping Python 2.7 support

closes #91

Author: pseewald

fprettify/__init__.py

@@ -65,28 +65,17 @@
   whitespaces
 - open files only when needed
 """
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
 import re
 import sys
 import logging
 import os
 import io
 
-# allow for unicode for stdin / stdout, it's a mess
-try:
-    # python 3
-    sys.stdin = io.TextIOWrapper(
-        sys.stdin.detach(), encoding='UTF-8', line_buffering=True)
-    sys.stdout = io.TextIOWrapper(
-        sys.stdout.detach(), encoding='UTF-8', line_buffering=True)
-except AttributeError: # pragma: no cover
-    # python 2
-    import codecs
-    utf8_reader = codecs.getreader('UTF-8')
-    utf8_writer = codecs.getwriter('UTF-8')
-    sys.stdin = utf8_reader(sys.stdin)
-    sys.stdout = utf8_writer(sys.stdout)
+sys.stdin = io.TextIOWrapper(
+    sys.stdin.detach(), encoding='UTF-8', line_buffering=True)
+sys.stdout = io.TextIOWrapper(
+    sys.stdout.detach(), encoding='UTF-8', line_buffering=True)
+
 
 from .fparse_utils import (VAR_DECL_RE, OMP_COND_RE,
                            InputStream, CharFilter,

fprettify/fparse_utils.py

@@ -19,8 +19,6 @@
 
 """This is a collection of Fortran parsing utilities."""
 
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
 import re
 from collections import deque
 
@@ -123,10 +121,6 @@ def update(self, string, filter_comments=True, filter_strings=True,
     def __iter__(self):
         return self
 
-    def next(self): # pragma: no cover
-        """ Python 2 compatibility """
-        return self.__next__()
-
     def __next__(self):
 
         pos, char = next(self._it)

fprettify/tests/__init__.py

@@ -33,17 +33,8 @@
 import subprocess
 import inspect
 
-# allow unicode for stdin / stdout, it's a mess
-try:
-    # python 3
-    sys.stderr = io.TextIOWrapper(
-        sys.stderr.detach(), encoding='UTF-8', line_buffering=True)
-
-except AttributeError: # pragma: no cover
-    # python 2
-    import codecs
-    utf8_writer = codecs.getwriter('UTF-8')
-    sys.stderr = utf8_writer(sys.stderr)
+sys.stderr = io.TextIOWrapper(
+    sys.stderr.detach(), encoding='UTF-8', line_buffering=True)
 
 import fprettify
 from fprettify.fparse_utils import FprettifyParseException, FprettifyInternalException
@@ -76,9 +67,7 @@ def eprint(*args, **kwargs):
     Print to stderr - to print output compatible with default unittest output.
     """
 
-    print(*args, file=sys.stderr, **kwargs)
-    sys.stderr.flush()  # python 2 print does not have flush argument
-
+    print(*args, file=sys.stderr, flush=True, **kwargs)
 
 class FPrettifyTestCase(unittest.TestCase):
     """
@@ -943,12 +932,7 @@ def test_result(path, info):
 
     # not sure why this even works, using "test something" (with a space) as function name...
     # however it gives optimal test output
-    try:
-        testmethod.__name__ = ("test " + joinpath(fpath, ffile))
-    except TypeError: # pragma: no cover
-        # need to encode in python 2 since we are using unicode strings
-        testmethod.__name__ = (
-            "test " + joinpath(fpath, ffile)).encode('utf-8')
+    testmethod.__name__ = ("test " + joinpath(fpath, ffile))
 
     setattr(testcase, testmethod.__name__, testmethod)