Update use of pathclass.glob_files, directories.

voussoir · voussoir · commit c5829081aa43 · 2021-11-08T11:38:10.000-08:00
diff --git a/adb_install.py b/adb_install.py
@@ -12,7 +12,7 @@
 
 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
@@ -21,7 +21,7 @@
 
 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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 
 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
@@ -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
@@ -7,7 +7,7 @@
 
 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
@@ -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
@@ -6,7 +6,7 @@
 
 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
@@ -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
@@ -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
@@ -14,7 +14,7 @@
 
 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
