Refactoring / code cleanup.

See:

* https://en.wikipedia.org/wiki/Code_refactoring

* https://www.refactoring.com/

* https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/

Some small optimisations may have slipped in as well.

pysollib/configobj/configobj.py

@@ -1172,10 +1172,7 @@ class ConfigObj(Section):
         if isinstance(infile, string_types):
             self.filename = infile
             if os.path.isfile(infile):
-                if sys.version_info > (3,):
-                    infile = six.text_type(open(infile).read()) or []
-                else:
-                    infile = open(infile).read() or []
+                infile = six.text_type(open(infile).read()) or []
             elif self.file_error:
                 # raise an error if the file doesn't exist
                 raise IOError('Config file not found: "%s".' % self.filename)

pysollib/hint.py

@@ -27,7 +27,6 @@ import os
 import time
 import subprocess
 import re
-import sys
 import six
 from io import BytesIO
 
@@ -819,9 +818,7 @@ class Base_Solver_Hint:
         if os.name != 'nt':
             kw['close_fds'] = True
         p = subprocess.Popen(command, **kw)
-        bytes_board = board
-        if sys.version_info > (3,):
-            bytes_board = bytes(board, 'utf-8')
+        bytes_board = six.binary_type(board, 'utf-8')
         pout, perr = p.communicate(bytes_board)
         if p.returncode in (127, 1):
             # Linux and Windows return codes for "command not found" error
@@ -910,8 +907,6 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
 
         # Based on https://stackoverflow.com/questions/8898294 - thanks!
         def mydecode(s):
-            if sys.version_info < (3,):
-                pass  # return s
             for encoding in "utf-8-sig", "utf-8":
                 try:
                     return s.decode(encoding)