From c5829081aa43cb836b3cd240e3e83c09ff5e898e Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Mon, 8 Nov 2021 11:38:10 -0800 Subject: [PATCH] Update use of pathclass.glob_files, directories. --- adb_install.py | 2 +- bitwise_or.py | 2 +- crc32.py | 2 +- crop.py | 2 +- empty_directories.py | 2 +- grayscale.py | 2 +- inodes.py | 2 +- lint_main_returns.py | 4 ++-- nonempty_directories.py | 2 +- resize.py | 2 +- rotate.py | 2 +- stitch.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/adb_install.py b/adb_install.py index e8227ce..cf99037 100644 --- a/adb_install.py +++ b/adb_install.py @@ -12,7 +12,7 @@ log = vlogging.getLogger(__name__, 'adbinstall') def adbinstall_argparse(args): patterns = pipeable.input_many(args.apks, skip_blank=True, strip=True) - apks = pathclass.glob_many(patterns, files=True) + apks = pathclass.glob_many_files(patterns) installs = [] for apk in apks: apk = pathclass.Path(apk) diff --git a/bitwise_or.py b/bitwise_or.py index 1614d5a..a505dc3 100644 --- a/bitwise_or.py +++ b/bitwise_or.py @@ -21,7 +21,7 @@ CHUNK_SIZE = 2**20 def bitwise_or_argparse(args): patterns = pipeable.input_many(args.files, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) if len(files) < 2: log.fatal('Need at least two input files.') diff --git a/crc32.py b/crc32.py index b96a9be..9553724 100644 --- a/crc32.py +++ b/crc32.py @@ -12,7 +12,7 @@ def crc32_argparse(args): return_status = 0 patterns = pipeable.input_many(args.patterns, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) for file in files: try: diff --git a/crop.py b/crop.py index 93e77f3..2c89312 100644 --- a/crop.py +++ b/crop.py @@ -31,7 +31,7 @@ def crop(file, crops, *, inplace=False): def crop_argparse(args): patterns = pipeable.input(args.pattern, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) for file in files: crop( diff --git a/empty_directories.py b/empty_directories.py index 53e8b54..9c73fbc 100644 --- a/empty_directories.py +++ b/empty_directories.py @@ -6,7 +6,7 @@ from voussoirkit import pipeable def empty_directories_argparse(args): patterns = pipeable.input_many(args.patterns, skip_blank=True, strip=True) - directories = pathclass.glob_many(patterns, directories=True) + directories = pathclass.glob_many_directories(patterns) for directory in directories: if len(directory.listdir()) == 0: diff --git a/grayscale.py b/grayscale.py index dd8b63a..ff0d977 100644 --- a/grayscale.py +++ b/grayscale.py @@ -25,7 +25,7 @@ def grayscale(filename, *, inplace=False): def grayscale_argparse(args): patterns = pipeable.input_many(args.patterns, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) for file in files: new_filename = grayscale(file, inplace=args.inplace) if new_filename: diff --git a/inodes.py b/inodes.py index 7ae58d2..ae7803e 100644 --- a/inodes.py +++ b/inodes.py @@ -7,7 +7,7 @@ from voussoirkit import pipeable def inodes_argparse(args): patterns = pipeable.input_many(args.patterns, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) for file in files: pipeable.stdout(f'{file.stat.st_dev} {file.stat.st_ino} {file.relative_path}') return 0 diff --git a/lint_main_returns.py b/lint_main_returns.py index 7844adc..aa3f9dc 100644 --- a/lint_main_returns.py +++ b/lint_main_returns.py @@ -16,9 +16,9 @@ def main(argv): patterns = argv[:] if patterns: - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) else: - files = pathclass.glob('*.py', files=True) + files = pathclass.glob_files('*.py') for file in files: no_py = file.replace_extension('').basename diff --git a/nonempty_directories.py b/nonempty_directories.py index 6e4ce6c..4efdf03 100644 --- a/nonempty_directories.py +++ b/nonempty_directories.py @@ -6,7 +6,7 @@ from voussoirkit import pipeable def nonempty_directories_argparse(args): patterns = pipeable.input_many(args.patterns, skip_blank=True, strip=True) - directories = pathclass.glob_many(patterns, directories=True) + directories = pathclass.glob_many_directories(patterns) for directory in directories: if len(directory.listdir()) != 0: diff --git a/resize.py b/resize.py index 3046daa..7e6a91b 100644 --- a/resize.py +++ b/resize.py @@ -102,7 +102,7 @@ def resize( def resize_argparse(args): patterns = pipeable.input(args.pattern, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) for file in files: resize( file, diff --git a/rotate.py b/rotate.py index 104ef48..310e887 100644 --- a/rotate.py +++ b/rotate.py @@ -15,7 +15,7 @@ def rotate_argparse(args): return 1 patterns = pipeable.input(args.pattern, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) for file in files: image = PIL.Image.open(file.absolute_path) diff --git a/stitch.py b/stitch.py index 9190514..9028dcf 100644 --- a/stitch.py +++ b/stitch.py @@ -14,7 +14,7 @@ HORIZONTAL = sentinel.Sentinel('horizontal') def stitch_argparse(args): patterns = pipeable.input_many(args.image_files, skip_blank=True, strip=True) - files = pathclass.glob_many(patterns, files=True) + files = pathclass.glob_many_files(patterns) images = [PIL.Image.open(file.absolute_path) for file in files] if args.vertical: direction = VERTICAL