From 0ca53b861a4aaf00f65c9aeb054a3a5db05cd71b Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Fri, 19 Feb 2021 17:36:06 +0100 Subject: [PATCH] Fix script global state for Python 3 again --- src/DIRAC/Core/scripts/dirac_platform.py | 13 ++++++------- src/DIRAC/Core/scripts/dirac_version.py | 11 ++++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/DIRAC/Core/scripts/dirac_platform.py b/src/DIRAC/Core/scripts/dirac_platform.py index 613f45f7234..cc0e8a42526 100755 --- a/src/DIRAC/Core/scripts/dirac_platform.py +++ b/src/DIRAC/Core/scripts/dirac_platform.py @@ -26,23 +26,22 @@ __RCSID__ = "$Id$" -import sys -import argparse - -parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) -parser.parse_known_args() try: from DIRAC.Core.Utilities.Platform import getPlatformString except Exception: + import argparse import platform import os import sys import re import subprocess + parser = argparse.ArgumentParser( + description=__doc__, + formatter_class=argparse.RawDescriptionHelpFormatter) + parser.parse_known_args() + # We need to patch python platform module. It does a string comparison for the libc versions. # it fails when going from 2.9 to 2.10, # the fix converts the version to a tuple and attempts a numeric comparison diff --git a/src/DIRAC/Core/scripts/dirac_version.py b/src/DIRAC/Core/scripts/dirac_version.py index 9b7a7797db4..3cb0af19cc3 100755 --- a/src/DIRAC/Core/scripts/dirac_version.py +++ b/src/DIRAC/Core/scripts/dirac_version.py @@ -21,17 +21,18 @@ import argparse -parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) -parser.parse_known_args() - import DIRAC from DIRAC.Core.Utilities.DIRACScript import DIRACScript @DIRACScript() def main(): + parser = argparse.ArgumentParser( + description=__doc__, + formatter_class=argparse.RawDescriptionHelpFormatter, + ) + parser.parse_known_args() + print(DIRAC.version)