From 0c7cf3cdaa1285d17a89e1d12dbe9a8a75fff14c Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sun, 22 Aug 2021 22:47:09 -0400 Subject: [PATCH] protect against use with Python 2.x, use full absolute directory path internally --- tools/coding_standard/homepage.py | 14 ++++++++++---- tools/coding_standard/permissions.py | 10 ++++++++-- tools/coding_standard/whitespace.py | 10 ++++++++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tools/coding_standard/homepage.py b/tools/coding_standard/homepage.py index 444befec36..7c5975a03f 100644 --- a/tools/coding_standard/homepage.py +++ b/tools/coding_standard/homepage.py @@ -2,8 +2,13 @@ # Utility for detecting incorrect LAMMPS homepage URLs # # Written by Richard Berger (Temple University) -import os +from __future__ import print_function import sys + +if sys.version_info.major < 3: + sys.exit('This script must be run with Python 3.x') + +import os import glob import re import yaml @@ -119,6 +124,7 @@ def main(): parser.add_argument('-v', '--verbose', action='store_true', help='verbose output') parser.add_argument('DIRECTORY', help='directory (or file) that should be checked') args = parser.parse_args() + lammpsdir = os.path.abspath(os.path.expanduser(args.DIRECTORY)) if args.config: with open(args.config, 'r') as cfile: @@ -126,12 +132,12 @@ def main(): else: config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader) - if os.path.isdir(args.DIRECTORY): - if not check_folder(args.DIRECTORY, config, args.fix, args.verbose): + if os.path.isdir(lammpsdir): + if not check_folder(lammpsdir, config, args.fix, args.verbose): sys.exit(1) else: success = True - path = os.path.normpath(args.DIRECTORY) + path = os.path.normpath(lammpsdir) if args.verbose: print("Checking file:", path) diff --git a/tools/coding_standard/permissions.py b/tools/coding_standard/permissions.py index 266e92d30c..57ea3c90a5 100644 --- a/tools/coding_standard/permissions.py +++ b/tools/coding_standard/permissions.py @@ -2,8 +2,13 @@ # Utility for detecting and fixing file permission issues in LAMMPS # # Written by Richard Berger (Temple University) -import os +from __future__ import print_function import sys + +if sys.version_info.major < 3: + sys.exit('This script must be run with Python 3.x') + +import os import glob import yaml import argparse @@ -82,6 +87,7 @@ def main(): parser.add_argument('-v', '--verbose', action='store_true', help='verbose output') parser.add_argument('DIRECTORY', help='directory that should be checked') args = parser.parse_args() + lammpsdir = os.path.abspath(os.path.expanduser(args.DIRECTORY)) if args.config: with open(args.config, 'r') as cfile: @@ -89,7 +95,7 @@ def main(): else: config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader) - if not check_folder(args.DIRECTORY, config, args.fix, args.verbose): + if not check_folder(lammpsdir, config, args.fix, args.verbose): sys.exit(1) if __name__ == "__main__": diff --git a/tools/coding_standard/whitespace.py b/tools/coding_standard/whitespace.py index bad1ebd295..081aa6ca94 100644 --- a/tools/coding_standard/whitespace.py +++ b/tools/coding_standard/whitespace.py @@ -2,8 +2,13 @@ # Utility for detecting and fixing whitespace issues in LAMMPS # # Written by Richard Berger (Temple University) -import os +from __future__ import print_function import sys + +if sys.version_info.major < 3: + sys.exit('This script must be run with Python 3.x') + +import os import glob import re import yaml @@ -170,6 +175,7 @@ def main(): parser.add_argument('-v', '--verbose', action='store_true', help='verbose output') parser.add_argument('DIRECTORY', help='directory that should be checked') args = parser.parse_args() + lammpsdir = os.path.abspath(os.path.expanduser(args.DIRECTORY)) if args.config: with open(args.config, 'r') as cfile: @@ -177,7 +183,7 @@ def main(): else: config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader) - if not check_folder(args.DIRECTORY, config, args.fix, args.verbose): + if not check_folder(lammpsdir, config, args.fix, args.verbose): sys.exit(1) if __name__ == "__main__":