code cleanup with pyupgrade

amqtt/mqtt/connack.py

@@ -43,7 +43,7 @@ class ConnackVariableHeader(MQTTVariableHeader):
         return out
 
     def __repr__(self):
-        return type(self).__name__ + "(session_parent={0}, return_code={1})".format(
+        return type(self).__name__ + "(session_parent={}, return_code={})".format(
             hex(self.session_parent), hex(self.return_code)
         )
 

amqtt/mqtt/connect.py

@@ -45,7 +45,7 @@ class ConnectVariableHeader(MQTTVariableHeader):
         self.keep_alive = keep_alive
 
     def __repr__(self):
-        return "ConnectVariableHeader(proto_name={0}, proto_level={1}, flags={2}, keepalive={3})".format(
+        return "ConnectVariableHeader(proto_name={}, proto_level={}, flags={}, keepalive={})".format(
             self.proto_name, self.proto_level, hex(self.flags), self.keep_alive
         )
 
@@ -176,7 +176,7 @@ class ConnectPayload(MQTTPayload):
         self.password = password
 
     def __repr__(self):
-        return "ConnectVariableHeader(client_id={0}, will_topic={1}, will_message={2}, username={3}, password={4})".format(
+        return "ConnectVariableHeader(client_id={}, will_topic={}, will_message={}, username={}, password={})".format(
             self.client_id,
             self.will_topic,
             self.will_message,

amqtt/mqtt/packet.py

@@ -120,7 +120,7 @@ class MQTTFixedHeader:
             return None
 
     def __repr__(self):
-        return type(self).__name__ + "(length={0}, flags={1})".format(
+        return type(self).__name__ + "(length={}, flags={})".format(
             self.remaining_length, hex(self.flags)
         )
 
@@ -169,7 +169,7 @@ class PacketIdVariableHeader(MQTTVariableHeader):
         return cls(packet_id)
 
     def __repr__(self):
-        return type(self).__name__ + "(packet_id={0})".format(self.packet_id)
+        return type(self).__name__ + f"(packet_id={self.packet_id})"
 
 
 class MQTTPayload:
@@ -274,6 +274,6 @@ class MQTTPacket:
     def __repr__(self):
         return type(
             self
-        ).__name__ + "(ts={0!s}, fixed={1!r}, variable={2!r}, payload={3!r})".format(
+        ).__name__ + "(ts={!s}, fixed={!r}, variable={!r}, payload={!r})".format(
             self.protocol_ts, self.fixed_header, self.variable_header, self.payload
         )

amqtt/mqtt/publish.py

@@ -28,7 +28,7 @@ class PublishVariableHeader(MQTTVariableHeader):
         self.packet_id = packet_id
 
     def __repr__(self):
-        return type(self).__name__ + "(topic={0}, packet_id={1})".format(
+        return type(self).__name__ + "(topic={}, packet_id={})".format(
             self.topic_name, self.packet_id
         )
 
@@ -82,7 +82,7 @@ class PublishPayload(MQTTPayload):
         return cls(data)
 
     def __repr__(self):
-        return type(self).__name__ + "(data={0!r})".format(repr(self.data))
+        return type(self).__name__ + "(data={!r})".format(repr(self.data))
 
 
 class PublishPacket(MQTTPacket):

amqtt/mqtt/suback.py

@@ -28,9 +28,7 @@ class SubackPayload(MQTTPayload):
         self.return_codes = return_codes or []
 
     def __repr__(self):
-        return type(self).__name__ + "(return_codes={0})".format(
-            repr(self.return_codes)
-        )
+        return type(self).__name__ + "(return_codes={})".format(repr(self.return_codes))
 
     def to_bytes(
         self, fixed_header: MQTTFixedHeader, variable_header: MQTTVariableHeader

amqtt/mqtt/subscribe.py

@@ -60,7 +60,7 @@ class SubscribePayload(MQTTPayload):
         return cls(topics)
 
     def __repr__(self):
-        return type(self).__name__ + "(topics={0!r})".format(self.topics)
+        return type(self).__name__ + f"(topics={self.topics!r})"
 
 
 class SubscribePacket(MQTTPacket):

amqtt/plugins/logging.py

@@ -31,7 +31,7 @@ class PacketLoggerPlugin:
         if self.context.logger.isEnabledFor(logging.DEBUG):
             if session:
                 self.context.logger.debug(
-                    "%s <-in-- %s" % (session.client_id, repr(packet))
+                    "{} <-in-- {}".format(session.client_id, repr(packet))
                 )
             else:
                 self.context.logger.debug("<-in-- %s" % repr(packet))
@@ -42,7 +42,7 @@ class PacketLoggerPlugin:
         if self.context.logger.isEnabledFor(logging.DEBUG):
             if session:
                 self.context.logger.debug(
-                    "%s -out-> %s" % (session.client_id, repr(packet))
+                    "{} -out-> {}".format(session.client_id, repr(packet))
                 )
             else:
                 self.context.logger.debug("-out-> %s" % repr(packet))

amqtt/plugins/manager.py

@@ -77,11 +77,9 @@ class PluginManager:
             obj = plugin(plugin_context)
             return Plugin(ep.name, ep, obj)
         except ImportError as ie:
-            self.logger.warning("Plugin %r import failed: %s" % (ep, ie))
+            self.logger.warning(f"Plugin {ep!r} import failed: {ie}")
         except pkg_resources.UnknownExtra as ue:
-            self.logger.warning(
-                "Plugin %r dependencies resolution failed: %s" % (ep, ue)
-            )
+            self.logger.warning(f"Plugin {ep!r} dependencies resolution failed: {ue}")
 
     def get_plugin(self, name):
         """

amqtt/plugins/persistence.py

@@ -30,7 +30,7 @@ class SQLitePlugin:
                 self.context.logger.info("Database file '%s' opened" % self.db_file)
             except Exception as e:
                 self.context.logger.error(
-                    "Error while initializing database '%s' : %s" % (self.db_file, e)
+                    f"Error while initializing database '{self.db_file}' : {e}"
                 )
         if self.cursor:
             self.cursor.execute(
@@ -47,9 +47,7 @@ class SQLitePlugin:
                 )
                 self.conn.commit()
             except Exception as e:
-                self.context.logger.error(
-                    "Failed saving session '%s': %s" % (session, e)
-                )
+                self.context.logger.error(f"Failed saving session '{session}': {e}")
 
     async def find_session(self, client_id):
         if self.cursor:

amqtt/scripts/pub_script.py

@@ -79,7 +79,7 @@ def _get_message(arguments):
         yield arguments["-m"].encode(encoding="utf-8")
     if arguments["-f"]:
         try:
-            with open(arguments["-f"], "r") as f:
+            with open(arguments["-f"]) as f:
                 for line in f:
                     yield line.encode(encoding="utf-8")
         except:

amqtt/session.py

@@ -191,7 +191,7 @@ class Session:
         return self.retained_messages.qsize()
 
     def __repr__(self):
-        return type(self).__name__ + "(clientId={0}, state={1})".format(
+        return type(self).__name__ + "(clientId={}, state={})".format(
             self.client_id, self.transitions.state
         )
 

amqtt/utils.py

@@ -31,12 +31,12 @@ def gen_client_id() -> str:
 def read_yaml_config(config_file):
     config = None
     try:
-        with open(config_file, "r") as stream:
+        with open(config_file) as stream:
             config = (
                 yaml.full_load(stream)
                 if hasattr(yaml, "full_load")
                 else yaml.load(stream)
             )
     except yaml.YAMLError as exc:
-        logger.error("Invalid config_file %s: %s" % (config_file, exc))
+        logger.error(f"Invalid config_file {config_file}: {exc}")
     return config