Skip to content

Commit 28047a7

Browse files
committed
remove file opening and closing for ODBs
1 parent 37e173e commit 28047a7

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

adafruit_turtle.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,7 @@ def clearstamp(self, stampid):
691691
if isinstance(self._stamps[stampid], tuple):
692692
self._fg_addon_group.remove(self._stamps[stampid][0])
693693
self._turtle_odb_use -= 1
694-
if self._turtle_odb_use == 0:
695-
self._stamps[stampid][1].close()
694+
696695
else:
697696
self._fg_addon_group.remove(self._stamps[stampid])
698697
self._stamps[stampid] = None
@@ -960,7 +959,6 @@ def bgpic(self, picname=None):
960959
if self._bg_pic is not None:
961960
self._bg_addon_group.remove(self._odb_tilegrid)
962961
self._odb_tilegrid = None
963-
self._bg_pic.close()
964962
self._bg_pic = None
965963
self._bg_pic_filename = ""
966964
else:
@@ -1057,8 +1055,6 @@ def changeturtle(self, source=None, dimensions=(12, 12)):
10571055
self._turtle_odb_use -= 1
10581056
self._turtle_odb = None
10591057
if self._turtle_odb_file is not None:
1060-
if self._turtle_odb_use == 0:
1061-
self._turtle_odb_file.close()
10621058
self._turtle_odb_file = None
10631059
self._turtle_pic = None
10641060
self._drawturtle()
@@ -1071,17 +1067,13 @@ def changeturtle(self, source=None, dimensions=(12, 12)):
10711067
self._turtle_alt_sprite = None
10721068
self._turtle_odb = None
10731069
if not isinstance(self._turtle_pic, tuple):
1074-
self._turtle_odb_file.close()
10751070
self._turtle_odb_file = None
10761071
self._turtle_odb_use -= 1
10771072
self._turtle_pic = None
1078-
self._turtle_odb_file = open( # pylint: disable=consider-using-with
1079-
source, "rb"
1080-
)
1073+
10811074
try:
1082-
self._turtle_odb = displayio.OnDiskBitmap(self._turtle_odb_file)
1075+
self._turtle_odb = displayio.OnDiskBitmap(source)
10831076
except:
1084-
self._turtle_odb_file.close()
10851077
self._turtle_odb_file = None
10861078
self._turtle_pic = None
10871079
if visible:
@@ -1103,8 +1095,6 @@ def changeturtle(self, source=None, dimensions=(12, 12)):
11031095
if self._turtle_pic is not None:
11041096
if self._turtle_odb_file is not None:
11051097
self._turtle_odb_use -= 1
1106-
if self._turtle_odb_use == 0:
1107-
self._turtle_odb_file.close()
11081098
self._turtle_pic = dimensions
11091099
self._turtle_alt_sprite = source
11101100
if self._turtle_group:

0 commit comments

Comments
 (0)