From f85c21ec1737e2c11cdcf51977b808ca2b38d8eb Mon Sep 17 00:00:00 2001
From: Kattni Rembor <kattni@adafruit.com>
Date: Fri, 5 Nov 2021 16:20:41 -0400
Subject: [PATCH 1/2] Linted.

---
 .pre-commit-config.yaml                               | 2 +-
 adafruit_circuitplayground/bluefruit.py               | 4 +++-
 adafruit_circuitplayground/circuit_playground_base.py | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1b9fadc..43d1385 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
         name: pylint (library code)
         types: [python]
         args:
-          - --disable=consider-using-f-string
+          - --disable=consider-using-f-string,duplicate-code
         exclude: "^(docs/|examples/|tests/|setup.py$)"
     -   id: pylint
         name: pylint (example code)
diff --git a/adafruit_circuitplayground/bluefruit.py b/adafruit_circuitplayground/bluefruit.py
index 93b13e2..3ec3161 100755
--- a/adafruit_circuitplayground/bluefruit.py
+++ b/adafruit_circuitplayground/bluefruit.py
@@ -161,7 +161,9 @@ def play_mp3(self, file_name):
             with self._audio_out(
                 board.SPEAKER
             ) as audio:  # pylint: disable=not-callable
-                mp3file = audiomp3.MP3Decoder(open(file_name, "rb"))
+                mp3file = audiomp3.MP3Decoder(
+                    open(file_name, "rb")  # pylint: disable=consider-using-with
+                )
                 audio.play(mp3file)
                 while audio.playing:
                     pass
diff --git a/adafruit_circuitplayground/circuit_playground_base.py b/adafruit_circuitplayground/circuit_playground_base.py
index f22bb41..2f37dba 100755
--- a/adafruit_circuitplayground/circuit_playground_base.py
+++ b/adafruit_circuitplayground/circuit_playground_base.py
@@ -802,7 +802,9 @@ def play_file(self, file_name):
         self.stop_tone()
         self._speaker_enable.value = True
         with self._audio_out(board.SPEAKER) as audio:  # pylint: disable=not-callable
-            wavefile = audiocore.WaveFile(open(file_name, "rb"))
+            wavefile = audiocore.WaveFile(
+                open(file_name, "rb")  # pylint: disable=consider-using-with
+            )
             audio.play(wavefile)
             while audio.playing:
                 pass

From 511f55ca17a742a5249540d92fa97e66a4226887 Mon Sep 17 00:00:00 2001
From: Kattni Rembor <kattni@adafruit.com>
Date: Fri, 5 Nov 2021 16:49:43 -0400
Subject: [PATCH 2/2] Considered using with!

---
 adafruit_circuitplayground/bluefruit.py               | 9 +++------
 adafruit_circuitplayground/circuit_playground_base.py | 7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/adafruit_circuitplayground/bluefruit.py b/adafruit_circuitplayground/bluefruit.py
index 3ec3161..d19fe60 100755
--- a/adafruit_circuitplayground/bluefruit.py
+++ b/adafruit_circuitplayground/bluefruit.py
@@ -158,12 +158,9 @@ def play_mp3(self, file_name):
             # Play a specified file.
             self.stop_tone()
             self._speaker_enable.value = True
-            with self._audio_out(
-                board.SPEAKER
-            ) as audio:  # pylint: disable=not-callable
-                mp3file = audiomp3.MP3Decoder(
-                    open(file_name, "rb")  # pylint: disable=consider-using-with
-                )
+            with self._audio_out(board.SPEAKER) as audio, audiomp3.MP3Decoder(
+                open(file_name, "rb")
+            ) as mp3file:  # pylint: disable=not-callable
                 audio.play(mp3file)
                 while audio.playing:
                     pass
diff --git a/adafruit_circuitplayground/circuit_playground_base.py b/adafruit_circuitplayground/circuit_playground_base.py
index 2f37dba..69b5188 100755
--- a/adafruit_circuitplayground/circuit_playground_base.py
+++ b/adafruit_circuitplayground/circuit_playground_base.py
@@ -801,10 +801,9 @@ def play_file(self, file_name):
         # Play a specified file.
         self.stop_tone()
         self._speaker_enable.value = True
-        with self._audio_out(board.SPEAKER) as audio:  # pylint: disable=not-callable
-            wavefile = audiocore.WaveFile(
-                open(file_name, "rb")  # pylint: disable=consider-using-with
-            )
+        with self._audio_out(  # pylint: disable=not-callable
+            board.SPEAKER
+        ) as audio, audiocore.WaveFile(open(file_name, "rb")) as wavefile:
             audio.play(wavefile)
             while audio.playing:
                 pass