apply non-automatic ruff fixes

Author: Mic92

examples/errorhandling.py

@@ -131,7 +131,7 @@ def main():
         sys.exit(1)
 
     # Catch the remaining exit errors
-    except:
+    except Exception:
         sys.exit(0)
 
 

examples/stickers.py

@@ -25,18 +25,17 @@
 
 #! /usr/bin/env python
 
-# Edit these
-HOST = "localhost"
-PORT = 6600
-PASS = None
-
-
 from optparse import OptionParser
 from socket import error as SocketError
 from sys import stderr
 
 from mpd import MPDClient, MPDError
 
+# Edit these
+HOST = "localhost"
+PORT = 6600
+PASS = None
+
 
 ACTIONS = ("get", "set", "delete", "list", "find")
 

mpd/__init__.py

@@ -17,16 +17,16 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with python-mpd2.  If not, see <http://www.gnu.org/licenses/>.
 
-from mpd.base import CommandError
-from mpd.base import CommandListError
-from mpd.base import ConnectionError
-from mpd.base import FailureResponseCode
-from mpd.base import IteratingError
-from mpd.base import MPDClient
-from mpd.base import MPDError
-from mpd.base import PendingCommandError
-from mpd.base import ProtocolError
-from mpd.base import VERSION
+from mpd.base import CommandError as CommandError
+from mpd.base import CommandListError as CommandListError
+from mpd.base import ConnectionError as ConnectionError
+from mpd.base import FailureResponseCode as FailureResponseCode
+from mpd.base import IteratingError as IteratingError
+from mpd.base import MPDClient as MPDClient
+from mpd.base import MPDError as MPDError
+from mpd.base import PendingCommandError as PendingCommandError
+from mpd.base import ProtocolError as ProtocolError
+from mpd.base import VERSION as VERSION
 
 try:
     from mpd.twisted import MPDProtocol

mpd/base.py

@@ -23,6 +23,7 @@
 import sys
 import warnings
 from enum import Enum
+from logging import NullHandler
 from typing import (
     IO,
     Any,
@@ -50,9 +51,6 @@
 def escape(text: str) -> str:
     return text.replace("\\", "\\\\").replace('"', '\\"')
 
-
-from logging import NullHandler
-
 logger = logging.getLogger(__name__)
 logger.addHandler(NullHandler())
 

mpd/tests.py

@@ -1285,8 +1285,8 @@ def error(self, message: str) -> None:
     def _feed(self) -> None:
         if len(self._expectations[0][0]) == 0:
             _, response_lines = self._expectations.pop(0)
-            for l in response_lines:
-                self._output.put_nowait(l)
+            for line in response_lines:
+                self._output.put_nowait(line)
 
     def expect_exchange(
         self, request_lines: List[bytes], response_lines: List[bytes]