From a7bdee40a25687b3ebfcba0610a5407859e1bfdc Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 9 Jul 2021 14:33:10 +0200 Subject: [PATCH 1/3] Fix forgotten renaming of 'l' to 'char' --- easybuild/tools/include.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/tools/include.py b/easybuild/tools/include.py index 58464a4d25..9f0939be24 100644 --- a/easybuild/tools/include.py +++ b/easybuild/tools/include.py @@ -72,7 +72,7 @@ for subdir in subdirs: __path__ = pkgutil.extend_path(__path__, '%s.%s' % (__name__, subdir)) -del l, subdir, subdirs +del char, subdir, subdirs __path__ = __import__('pkgutil').extend_path(__path__, __name__) """ From 0677bc210cf92fde37d5da0838e1635c3ae3f14c Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 9 Jul 2021 14:52:52 +0200 Subject: [PATCH 2/3] Conditionally delete --- easybuild/tools/include.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/easybuild/tools/include.py b/easybuild/tools/include.py index 9f0939be24..1b5ba26d13 100644 --- a/easybuild/tools/include.py +++ b/easybuild/tools/include.py @@ -72,7 +72,9 @@ for subdir in subdirs: __path__ = pkgutil.extend_path(__path__, '%s.%s' % (__name__, subdir)) -del char, subdir, subdirs +del subdir, subdirs +if 'char' in dir(): + del char __path__ = __import__('pkgutil').extend_path(__path__, __name__) """ From f598c2e90c8cd6080db7971fa73d647dc7bcb9de Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 9 Jul 2021 14:54:29 +0200 Subject: [PATCH 3/3] Remove superflous import --- easybuild/tools/include.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/tools/include.py b/easybuild/tools/include.py index 1b5ba26d13..34390d632a 100644 --- a/easybuild/tools/include.py +++ b/easybuild/tools/include.py @@ -76,7 +76,7 @@ if 'char' in dir(): del char -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = pkgutil.extend_path(__path__, __name__) """