make python3 only and some cleanup

Author: wdpypere

Jenkinsfile

@@ -9,7 +9,6 @@ node {
         sh 'git clean -fxd'
     }
     stage('test') {
-        sh 'python2.7 -V'
         sh 'pip3 install --ignore-installed --prefix $PWD/.vsc-tox tox'
         sh 'export PATH=$PWD/.vsc-tox/bin:$PATH && export PYTHONPATH=$PWD/.vsc-tox/lib/python$(python3 -c "import sys; print(\\"%s.%s\\" % sys.version_info[:2])")/site-packages:$PYTHONPATH && tox -v -c tox.ini'
         sh 'rm -r $PWD/.vsc-tox'

README.md

@@ -1,9 +1,5 @@
 # vsc-utils
 
-### Build Status
-- Python 2.6 : [![Build Status](https://jenkins1.ugent.be/job/vsc-utils-python26/badge/icon)](https://jenkins1.ugent.be/job/vsc-utils-python26/)
-- Python 2.7 : [![Build Status](https://jenkins1.ugent.be/job/vsc-utils-python27/badge/icon)](https://jenkins1.ugent.be/job/vsc-utils-python27/)
-
 # Description
 Common tools used within our organization.
 These tools live in the vsc.utils namespace, toghether with the tools from
@@ -12,8 +8,5 @@ vsc-base.
 They have been split of from vsc-base because the tools here need aditional dependencies
 to work correctly whereas the tools in vsc-base do not.
 
-Originally created by the HPC team of Ghent University (http://ugent.be/hpc).
-
-# Documentation
-https://jenkins1.ugent.be/job/vsc-utils-python26/Documentation/
+Originally created by the HPC team of Ghent University (https://ugent.be/hpc).
 

lib/vsc/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/availability.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/cache.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -32,10 +32,9 @@
 import jsonpickle
 import os
 import time
+import pickle
 
 from vsc.utils import fancylogger
-from vsc.utils.py2vs3 import pickle, FileNotFoundErrorExc
-
 
 class FileCache(object):
     """File cache with a timestamp safety.
@@ -106,7 +105,7 @@ def __init__(self, filename, retain_old=True, raise_unpickable=False):
                 finally:
                     g.close()
 
-        except (OSError, IOError, ValueError, FileNotFoundErrorExc) as err:
+        except (OSError, IOError, ValueError, FileNotFoundError) as err:
             self.log.warning("Could not access the file cache at %s [%s]", self.filename, err)
             self.shelf = {}
             self.log.info("Cache in %s starts with an empty shelf", (self.filename,))
@@ -158,19 +157,17 @@ def close(self):
         dirname = os.path.dirname(self.filename)
         if not os.path.exists(dirname):
             os.makedirs(dirname)
-        f = open(self.filename, 'wb')
-        if not f:
-            self.log.error('cannot open the file cache at %s for writing', self.filename)
-        else:
-            if self.retain_old:
-                self.shelf.update(self.new_shelf)
-                self.new_shelf = self.shelf
-
-            g = gzip.GzipFile(mode='wb', fileobj=f)
-            pickled = jsonpickle.encode(self.new_shelf)
-            # .encode() is required in Python 3, since we need to pass a bytestring
-            g.write(pickled.encode())
-            g.close()
-            f.close()
-
-            self.log.info('closing the file cache at %s', self.filename)
+        with open(self.filename, 'wb') as fih:
+            if not fih:
+                self.log.error('cannot open the file cache at %s for writing', self.filename)
+            else:
+                if self.retain_old:
+                    self.shelf.update(self.new_shelf)
+                    self.new_shelf = self.shelf
+
+                with gzip.GzipFile(mode='wb', fileobj=fih) as zipf:
+                    pickled = jsonpickle.encode(self.new_shelf)
+                    # .encode() is required in Python 3, since we need to pass a bytestring
+                    zipf.write(pickled.encode())
+
+                self.log.info('closing the file cache at %s', self.filename)

lib/vsc/utils/fs_store.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/lock.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/nagios.py

@@ -1,7 +1,7 @@
 
 # -*- encoding: utf-8 -*-
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -40,7 +40,6 @@
 @author: Andy Georges (Ghent University)
 @author: Luis Fernando Muñoz Mejías (Ghent University)
 """
-from __future__ import print_function
 
 import operator
 import os
@@ -52,7 +51,6 @@
 
 from vsc.utils.cache import FileCache
 from vsc.utils.fancylogger import getLogger
-from vsc.utils.py2vs3 import is_string, FileNotFoundErrorExc
 
 log = getLogger(__name__)
 
@@ -155,7 +153,7 @@ def __init__(self, nrange):
         """
         self.log = getLogger(self.__class__.__name__, fname=False)
 
-        if not is_string(nrange):
+        if not isinstance(nrange, str):
             newnrange = str(nrange)
             self.log.debug("nrange %s of type %s, converting to string (%s)", str(nrange), type(nrange), newnrange)
             try:
@@ -316,7 +314,7 @@ def cache(self, nagios_exit, nagios_message):
             else:
                 self.log.warn("Not running as root: Cannot chown the nagios check file %s to %s",
                               self.filename, self.nagios_username)
-        except (OSError, FileNotFoundErrorExc):
+        except (OSError, FileNotFoundError):
             self.log.raiseException("Cannot chown the nagios check file %s to the nagios user" % (self.filename))
 
         return True

lib/vsc/utils/pickle_files.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -38,10 +38,7 @@
 import logging
 import os
 import stat
-
-
-from vsc.utils.py2vs3 import pickle, FileNotFoundErrorExc
-
+import pickle
 
 class TimestampPickle(object):
     """Stores a timestamp in some format in a file."""
@@ -60,8 +57,9 @@ def read(self):
         """
 
         try:
-            timestamp = pickle.load(open(self.filename, "rb"))
-        except (IOError, OSError, FileNotFoundErrorExc):
+            with open (self.filename, "rb") as fih:
+                timestamp = pickle.load(fih)
+        except (IOError, OSError, FileNotFoundError):
             logging.exception("Failed to load timestamp pickle from filename %s.", self.filename)
             return None
 
@@ -78,7 +76,8 @@ def write(self, timestamp):
         """
 
         try:
-            pickle.dump(timestamp, open(self.filename, "wb"))
+            with open(self.filename, "wb") as fih:
+                pickle.dump(timestamp, fih)
         except Exception:
             logging.exception("Failed to dump timestamp %s to pickle in filename %s", timestamp, self.filename)
             raise