Merge pull request #32 from adafruit/revert-30-join_paths_instead_of_concat

ladyada · web-flow · commit 8e17f6ed63b5 · 2020-12-27T12:34:14.000-05:00
Revert "Use `os.path.join` to concatenate paths"
diff --git a/adafruit_slideshow.py b/adafruit_slideshow.py
@@ -244,11 +244,11 @@ def _check_json_file(file):
         # Load the image names before setting order so they can be reordered.
         self._img_start = None
         self._file_list = [
-            os.path.join(folder, f)
+            folder + f
             for f in os.listdir(folder)
             if (
                 not f.startswith(".")
-                and (f.endswith(".bmp") or _check_json_file(os.path.join(folder, f)))
+                and (f.endswith(".bmp") or _check_json_file(folder + f))
             )
         ]
 

Original file line number	Diff line number	Diff line change
`@@ -244,11 +244,11 @@ def _check_json_file(file):`
`244`	`244`	`# Load the image names before setting order so they can be reordered.`
`245`	`245`	`self._img_start = None`
`246`	`246`	`self._file_list = [`
`247`		`- os.path.join(folder, f)`
	`247`	`+ folder + f`
`248`	`248`	`for f in os.listdir(folder)`
`249`	`249`	`if (`
`250`	`250`	`not f.startswith(".")`
`251`		`- and (f.endswith(".bmp") or _check_json_file(os.path.join(folder, f)))`
	`251`	`+ and (f.endswith(".bmp") or _check_json_file(folder + f))`
`252`	`252`	`)`
`253`	`253`	`]`
`254`	`254`