Merge pull request #81 from jodal/fix-deprecations

Fix warnings about deprecated stdlib methods
pull/8/head
Nicolas 2017-08-05 21:25:29 +02:00 zatwierdzone przez GitHub
commit 144d84a4b8
10 zmienionych plików z 91 dodań i 91 usunięć

Wyświetl plik

@ -217,7 +217,7 @@ class Broker:
self.transitions.start()
self.logger.debug("Broker starting")
except MachineError as me:
self.logger.warn("[WARN-0001] Invalid method call at this moment: %s" % me)
self.logger.warning("[WARN-0001] Invalid method call at this moment: %s" % me)
raise BrokerException("Broker instance can't be started: %s" % me)
yield from self.plugins_manager.fire_event(EVENT_BROKER_PRE_START)
@ -350,7 +350,7 @@ class Broker:
try:
handler, client_session = yield from BrokerProtocolHandler.init_from_connect(reader, writer, self.plugins_manager, loop=self._loop)
except HBMQTTException as exc:
self.logger.warn("[MQTT-3.1.0-1] %s: Can't read first packet an CONNECT: %s" %
self.logger.warning("[MQTT-3.1.0-1] %s: Can't read first packet an CONNECT: %s" %
(format_client_message(address=remote_address, port=remote_port), exc))
#yield from writer.close()
self.logger.debug("Connection closed")
@ -474,10 +474,10 @@ class Broker:
self.logger.debug("%s handling message delivery" % client_session.client_id)
app_message = wait_deliver.result()
if not app_message.topic:
self.logger.warn("[MQTT-4.7.3-1] - %s invalid TOPIC sent in PUBLISH message, closing connection" % client_session.client_id)
self.logger.warning("[MQTT-4.7.3-1] - %s invalid TOPIC sent in PUBLISH message, closing connection" % client_session.client_id)
break
if "#" in app_message.topic or "+" in app_message.topic:
self.logger.warn("[MQTT-3.3.2-2] - %s invalid TOPIC sent in PUBLISH message, closing connection" % client_session.client_id)
self.logger.warning("[MQTT-3.3.2-2] - %s invalid TOPIC sent in PUBLISH message, closing connection" % client_session.client_id)
break
yield from self.plugins_manager.fire_event(EVENT_BROKER_MESSAGE_RECEIVED,
client_id=client_session.client_id,

Wyświetl plik

@ -167,7 +167,7 @@ class MQTTClient:
yield from self._handler.stop()
self.session.transitions.disconnect()
else:
self.logger.warn("Client session is not currently connected, ignoring call")
self.logger.warning("Client session is not currently connected, ignoring call")
@asyncio.coroutine
def reconnect(self, cleansession=None):
@ -185,7 +185,7 @@ class MQTTClient:
"""
if self.session.transitions.is_connected():
self.logger.warn("Client already connected")
self.logger.warning("Client already connected")
return CONNECTION_ACCEPTED
if cleansession:
@ -231,7 +231,7 @@ class MQTTClient:
if self.session.transitions.is_connected():
yield from self._handler.mqtt_ping()
else:
self.logger.warn("MQTT PING request incompatible with current session state '%s'" %
self.logger.warning("MQTT PING request incompatible with current session state '%s'" %
self.session.transitions.state)
@mqtt_connected
@ -366,7 +366,7 @@ class MQTTClient:
if secure:
if self.session.cafile is None or self.session.cafile == '':
self.logger.warn("TLS connection can't be estabilshed, no certificate file (.cert) given")
self.logger.warning("TLS connection can't be estabilshed, no certificate file (.cert) given")
raise ClientException("TLS connection can't be estabilshed, no certificate file (.cert) given")
sc = ssl.create_default_context(
ssl.Purpose.SERVER_AUTH,
@ -416,15 +416,15 @@ class MQTTClient:
self.logger.debug("connected to %s:%s" % (self.session.remote_address, self.session.remote_port))
return return_code
except InvalidURI as iuri:
self.logger.warn("connection failed: invalid URI '%s'" % self.session.broker_uri)
self.logger.warning("connection failed: invalid URI '%s'" % self.session.broker_uri)
self.session.transitions.disconnect()
raise ConnectException("connection failed: invalid URI '%s'" % self.session.broker_uri, iuri)
except InvalidHandshake as ihs:
self.logger.warn("connection failed: invalid websocket handshake")
self.logger.warning("connection failed: invalid websocket handshake")
self.session.transitions.disconnect()
raise ConnectException("connection failed: invalid websocket handshake", ihs)
except (ProtocolHandlerException, ConnectionError, OSError) as e:
self.logger.warn("MQTT connection failed: %r" % e)
self.logger.warning("MQTT connection failed: %r" % e)
self.session.transitions.disconnect()
raise ConnectException(e)

Wyświetl plik

@ -12,12 +12,12 @@ class BaseAuthPlugin:
try:
self.auth_config = self.context.config['auth']
except KeyError:
self.context.logger.warn("'auth' section not found in context configuration")
self.context.logger.warning("'auth' section not found in context configuration")
def authenticate(self, *args, **kwargs):
if not self.auth_config:
# auth config section not found
self.context.logger.warn("'auth' section not found in context configuration")
self.context.logger.warning("'auth' section not found in context configuration")
return False
return True
@ -44,7 +44,7 @@ class AnonymousAuthPlugin(BaseAuthPlugin):
else:
self.context.logger.debug("Authentication failure: session has an empty username")
except KeyError:
self.context.logger.warn("Session informations not available")
self.context.logger.warning("Session informations not available")
authenticated = False
return authenticated
@ -70,7 +70,7 @@ class FileAuthPlugin(BaseAuthPlugin):
self.context.logger.debug("user %s , hash=%s" % (username, pwd_hash))
self.context.logger.debug("%d user(s) read from file %s" % (len(self._users), password_file))
except FileNotFoundError:
self.context.logger.warn("Password file %s not found" % password_file)
self.context.logger.warning("Password file %s not found" % password_file)
else:
self.context.logger.debug("Configuration parameter 'password_file' not found")

Wyświetl plik

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

Wyświetl plik

@ -16,12 +16,12 @@ class SQLitePlugin:
self.persistence_config = self.context.config['persistence']
self.init_db()
except KeyError:
self.context.logger.warn("'persistence' section not found in context configuration")
self.context.logger.warning("'persistence' section not found in context configuration")
def init_db(self):
self.db_file = self.persistence_config.get('file', None)
if not self.db_file:
self.context.logger.warn("'file' persistence parameter not found")
self.context.logger.warning("'file' persistence parameter not found")
else:
try:
self.conn = sqlite3.connect(self.db_file)

Wyświetl plik

@ -78,8 +78,8 @@ class ProtocolHandlerTest(unittest.TestCase):
def server_mock(reader, writer):
try:
packet = yield from PublishPacket.from_stream(reader)
self.assertEquals(packet.variable_header.topic_name, '/topic')
self.assertEquals(packet.qos, QOS_0)
self.assertEqual(packet.variable_header.topic_name, '/topic')
self.assertEqual(packet.qos, QOS_0)
self.assertIsNone(packet.packet_id)
except Exception as ae:
future.set_exception(ae)
@ -119,8 +119,8 @@ class ProtocolHandlerTest(unittest.TestCase):
def server_mock(reader, writer):
packet = yield from PublishPacket.from_stream(reader)
try:
self.assertEquals(packet.variable_header.topic_name, '/topic')
self.assertEquals(packet.qos, QOS_1)
self.assertEqual(packet.variable_header.topic_name, '/topic')
self.assertEqual(packet.qos, QOS_1)
self.assertIsNotNone(packet.packet_id)
self.assertIn(packet.packet_id, self.session.inflight_out)
self.assertIn(packet.packet_id, self.handler._puback_waiters)
@ -166,8 +166,8 @@ class ProtocolHandlerTest(unittest.TestCase):
def server_mock(reader, writer):
try:
packet = yield from PublishPacket.from_stream(reader)
self.assertEquals(packet.topic_name, '/topic')
self.assertEquals(packet.qos, QOS_2)
self.assertEqual(packet.topic_name, '/topic')
self.assertEqual(packet.qos, QOS_2)
self.assertIsNotNone(packet.packet_id)
self.assertIn(packet.packet_id, self.session.inflight_out)
self.assertIn(packet.packet_id, self.handler._pubrec_waiters)
@ -373,8 +373,8 @@ class ProtocolHandlerTest(unittest.TestCase):
def server_mock(reader, writer):
packet = yield from PublishPacket.from_stream(reader)
try:
self.assertEquals(packet.topic_name, '/topic')
self.assertEquals(packet.qos, QOS_1)
self.assertEqual(packet.topic_name, '/topic')
self.assertEqual(packet.qos, QOS_1)
self.assertIsNotNone(packet.packet_id)
self.assertIn(packet.packet_id, self.session.inflight_out)
self.assertIn(packet.packet_id, self.handler._puback_waiters)
@ -416,8 +416,8 @@ class ProtocolHandlerTest(unittest.TestCase):
def server_mock(reader, writer):
try:
packet = yield from PublishPacket.from_stream(reader)
self.assertEquals(packet.topic_name, '/topic')
self.assertEquals(packet.qos, QOS_2)
self.assertEqual(packet.topic_name, '/topic')
self.assertEqual(packet.qos, QOS_2)
self.assertIsNotNone(packet.packet_id)
self.assertIn(packet.packet_id, self.session.inflight_out)
self.assertIn(packet.packet_id, self.handler._pubrec_waiters)

Wyświetl plik

@ -49,73 +49,73 @@ class PublishPacketTest(unittest.TestCase):
def test_build(self):
packet = PublishPacket.build('/topic', b'data', 1, False, QOS_0, False)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertFalse(packet.dup_flag)
self.assertEquals(packet.qos, QOS_0)
self.assertEqual(packet.qos, QOS_0)
self.assertFalse(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, False, QOS_1, False)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertFalse(packet.dup_flag)
self.assertEquals(packet.qos, QOS_1)
self.assertEqual(packet.qos, QOS_1)
self.assertFalse(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, False, QOS_2, False)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertFalse(packet.dup_flag)
self.assertEquals(packet.qos, QOS_2)
self.assertEqual(packet.qos, QOS_2)
self.assertFalse(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, True, QOS_0, False)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertTrue(packet.dup_flag)
self.assertEquals(packet.qos, QOS_0)
self.assertEqual(packet.qos, QOS_0)
self.assertFalse(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, True, QOS_1, False)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertTrue(packet.dup_flag)
self.assertEquals(packet.qos, QOS_1)
self.assertEqual(packet.qos, QOS_1)
self.assertFalse(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, True, QOS_2, False)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertTrue(packet.dup_flag)
self.assertEquals(packet.qos, QOS_2)
self.assertEqual(packet.qos, QOS_2)
self.assertFalse(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, False, QOS_0, True)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertFalse(packet.dup_flag)
self.assertEquals(packet.qos, QOS_0)
self.assertEqual(packet.qos, QOS_0)
self.assertTrue(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, False, QOS_1, True)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertFalse(packet.dup_flag)
self.assertEquals(packet.qos, QOS_1)
self.assertEqual(packet.qos, QOS_1)
self.assertTrue(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, False, QOS_2, True)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertFalse(packet.dup_flag)
self.assertEquals(packet.qos, QOS_2)
self.assertEqual(packet.qos, QOS_2)
self.assertTrue(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, True, QOS_0, True)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertTrue(packet.dup_flag)
self.assertEquals(packet.qos, QOS_0)
self.assertEqual(packet.qos, QOS_0)
self.assertTrue(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, True, QOS_1, True)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertTrue(packet.dup_flag)
self.assertEquals(packet.qos, QOS_1)
self.assertEqual(packet.qos, QOS_1)
self.assertTrue(packet.retain_flag)
packet = PublishPacket.build('/topic', b'data', 1, True, QOS_2, True)
self.assertEquals(packet.packet_id, 1)
self.assertEqual(packet.packet_id, 1)
self.assertTrue(packet.dup_flag)
self.assertEquals(packet.qos, QOS_2)
self.assertEqual(packet.qos, QOS_2)
self.assertTrue(packet.retain_flag)

Wyświetl plik

@ -56,4 +56,4 @@ class TestSQLitePlugin(unittest.TestCase):
# cursor = conn.cursor()
# row = cursor.execute("SELECT client_id FROM session where client_id = 'test_save_session'").fetchone()
# self.assertTrue(len(row) == 1)
# self.assertEquals(row[0], s.client_id)
# self.assertEqual(row[0], s.client_id)

Wyświetl plik

@ -193,10 +193,10 @@ class BrokerTest(unittest.TestCase):
# Test if the client test client subscription is registered
self.assertIn('/topic', broker._subscriptions)
subs = broker._subscriptions['/topic']
self.assertEquals(len(subs), 1)
self.assertEqual(len(subs), 1)
(s, qos) = subs[0]
self.assertEquals(s, client.session)
self.assertEquals(qos, QOS_0)
self.assertEqual(s, client.session)
self.assertEqual(qos, QOS_0)
yield from client.disconnect()
yield from asyncio.sleep(0.1)
@ -231,16 +231,16 @@ class BrokerTest(unittest.TestCase):
# Test if the client test client subscription is registered
self.assertIn('/topic', broker._subscriptions)
subs = broker._subscriptions['/topic']
self.assertEquals(len(subs), 1)
self.assertEqual(len(subs), 1)
(s, qos) = subs[0]
self.assertEquals(s, client.session)
self.assertEquals(qos, QOS_0)
self.assertEqual(s, client.session)
self.assertEqual(qos, QOS_0)
yield from client.subscribe([('/topic', QOS_0)])
self.assertEquals(len(subs), 1)
self.assertEqual(len(subs), 1)
(s, qos) = subs[0]
self.assertEquals(s, client.session)
self.assertEquals(qos, QOS_0)
self.assertEqual(s, client.session)
self.assertEqual(qos, QOS_0)
yield from client.disconnect()
yield from asyncio.sleep(0.1)
@ -275,14 +275,14 @@ class BrokerTest(unittest.TestCase):
# Test if the client test client subscription is registered
self.assertIn('/topic', broker._subscriptions)
subs = broker._subscriptions['/topic']
self.assertEquals(len(subs), 1)
self.assertEqual(len(subs), 1)
(s, qos) = subs[0]
self.assertEquals(s, client.session)
self.assertEquals(qos, QOS_0)
self.assertEqual(s, client.session)
self.assertEqual(qos, QOS_0)
yield from client.unsubscribe(['/topic'])
yield from asyncio.sleep(0.1)
self.assertEquals(broker._subscriptions['/topic'], [])
self.assertEqual(broker._subscriptions['/topic'], [])
yield from client.disconnect()
yield from asyncio.sleep(0.1)
yield from broker.shutdown()
@ -318,7 +318,7 @@ class BrokerTest(unittest.TestCase):
ret_message = yield from pub_client.publish('/topic', b'data', QOS_0)
yield from pub_client.disconnect()
self.assertEquals(broker._retained_messages, {})
self.assertEqual(broker._retained_messages, {})
yield from asyncio.sleep(0.1)
yield from broker.shutdown()
@ -431,7 +431,7 @@ class BrokerTest(unittest.TestCase):
ret_message = yield from pub_client.publish('/topic', bytearray(b'\x99' * 256 * 1024), QOS_2)
yield from pub_client.disconnect()
self.assertEquals(broker._retained_messages, {})
self.assertEqual(broker._retained_messages, {})
yield from asyncio.sleep(0.1)
yield from broker.shutdown()
@ -467,10 +467,10 @@ class BrokerTest(unittest.TestCase):
yield from asyncio.sleep(0.1)
self.assertIn('/topic', broker._retained_messages)
retained_message = broker._retained_messages['/topic']
self.assertEquals(retained_message.source_session, pub_client.session)
self.assertEquals(retained_message.topic, '/topic')
self.assertEquals(retained_message.data, b'data')
self.assertEquals(retained_message.qos, QOS_0)
self.assertEqual(retained_message.source_session, pub_client.session)
self.assertEqual(retained_message.topic, '/topic')
self.assertEqual(retained_message.data, b'data')
self.assertEqual(retained_message.qos, QOS_0)
yield from broker.shutdown()
self.assertTrue(broker.transitions.is_stopped())
future.set_result(True)
@ -520,7 +520,7 @@ class BrokerTest(unittest.TestCase):
sub_client = MQTTClient()
yield from sub_client.connect('mqtt://localhost')
ret = yield from sub_client.subscribe([('/qos0', QOS_0), ('/qos1', QOS_1), ('/qos2', QOS_2)])
self.assertEquals(ret, [QOS_0, QOS_1, QOS_2])
self.assertEqual(ret, [QOS_0, QOS_1, QOS_2])
yield from self._client_publish('/qos0', b'data', QOS_0)
yield from self._client_publish('/qos1', b'data', QOS_1)
@ -529,9 +529,9 @@ class BrokerTest(unittest.TestCase):
for qos in [QOS_0, QOS_1, QOS_2]:
message = yield from sub_client.deliver_message()
self.assertIsNotNone(message)
self.assertEquals(message.topic, '/qos%s' % qos)
self.assertEquals(message.data, b'data')
self.assertEquals(message.qos, qos)
self.assertEqual(message.topic, '/qos%s' % qos)
self.assertEqual(message.data, b'data')
self.assertEqual(message.qos, qos)
yield from sub_client.disconnect()
yield from asyncio.sleep(0.1)
yield from broker.shutdown()
@ -557,7 +557,7 @@ class BrokerTest(unittest.TestCase):
yield from sub_client.connect('mqtt://localhost')
ret = yield from sub_client.subscribe(
[('+', QOS_0), ('+/tennis/#', QOS_0), ('sport+', QOS_0), ('sport/+/player1', QOS_0)])
self.assertEquals(ret, [QOS_0, QOS_0, 0x80, QOS_0])
self.assertEqual(ret, [QOS_0, QOS_0, 0x80, QOS_0])
yield from asyncio.sleep(0.1)
yield from sub_client.disconnect()
@ -584,7 +584,7 @@ class BrokerTest(unittest.TestCase):
sub_client = MQTTClient()
yield from sub_client.connect('mqtt://localhost')
ret = yield from sub_client.subscribe([('#', QOS_0)])
self.assertEquals(ret, [QOS_0])
self.assertEqual(ret, [QOS_0])
yield from self._client_publish('/topic', b'data', QOS_0)
message = yield from sub_client.deliver_message()
@ -622,7 +622,7 @@ class BrokerTest(unittest.TestCase):
sub_client = MQTTClient()
yield from sub_client.connect('mqtt://localhost')
ret = yield from sub_client.subscribe([('+/monitor/Clients', QOS_0)])
self.assertEquals(ret, [QOS_0])
self.assertEqual(ret, [QOS_0])
yield from self._client_publish('/test/monitor/Clients', b'data', QOS_0)
message = yield from sub_client.deliver_message()
@ -660,7 +660,7 @@ class BrokerTest(unittest.TestCase):
sub_client = MQTTClient()
yield from sub_client.connect('mqtt://localhost', cleansession=False)
ret = yield from sub_client.subscribe([('/qos0', QOS_0), ('/qos1', QOS_1), ('/qos2', QOS_2)])
self.assertEquals(ret, [QOS_0, QOS_1, QOS_2])
self.assertEqual(ret, [QOS_0, QOS_1, QOS_2])
yield from sub_client.disconnect()
yield from asyncio.sleep(0.1)
@ -673,9 +673,9 @@ class BrokerTest(unittest.TestCase):
message = yield from sub_client.deliver_message()
log.debug("Message: " + repr(message.publish_packet))
self.assertIsNotNone(message)
self.assertEquals(message.topic, '/qos%s' % qos)
self.assertEquals(message.data, b'data')
self.assertEquals(message.qos, qos)
self.assertEqual(message.topic, '/qos%s' % qos)
self.assertEqual(message.data, b'data')
self.assertEqual(message.qos, qos)
yield from sub_client.disconnect()
yield from asyncio.sleep(0.1)
yield from broker.shutdown()

Wyświetl plik

@ -173,9 +173,9 @@ class MQTTClientTest(unittest.TestCase):
('$SYS/broker/uptime', QOS_1),
('$SYS/broker/uptime', QOS_2),
])
self.assertEquals(ret[0], QOS_0)
self.assertEquals(ret[1], QOS_1)
self.assertEquals(ret[2], QOS_2)
self.assertEqual(ret[0], QOS_0)
self.assertEqual(ret[1], QOS_1)
self.assertEqual(ret[2], QOS_2)
yield from client.disconnect()
yield from broker.shutdown()
future.set_result(True)
@ -199,7 +199,7 @@ class MQTTClientTest(unittest.TestCase):
ret = yield from client.subscribe([
('$SYS/broker/uptime', QOS_0),
])
self.assertEquals(ret[0], QOS_0)
self.assertEqual(ret[0], QOS_0)
yield from client.unsubscribe(['$SYS/broker/uptime'])
yield from client.disconnect()
yield from broker.shutdown()
@ -225,7 +225,7 @@ class MQTTClientTest(unittest.TestCase):
ret = yield from client.subscribe([
('test_topic', QOS_0),
])
self.assertEquals(ret[0], QOS_0)
self.assertEqual(ret[0], QOS_0)
client_pub = MQTTClient()
yield from client_pub.connect('mqtt://localhost/')
yield from client_pub.publish('test_topic', data, QOS_0)
@ -233,7 +233,7 @@ class MQTTClientTest(unittest.TestCase):
message = yield from client.deliver_message()
self.assertIsNotNone(message)
self.assertIsNotNone(message.publish_packet)
self.assertEquals(message.data, data)
self.assertEqual(message.data, data)
yield from client.unsubscribe(['$SYS/broker/uptime'])
yield from client.disconnect()
yield from broker.shutdown()
@ -258,7 +258,7 @@ class MQTTClientTest(unittest.TestCase):
ret = yield from client.subscribe([
('test_topic', QOS_0),
])
self.assertEquals(ret[0], QOS_0)
self.assertEqual(ret[0], QOS_0)
with self.assertRaises(asyncio.TimeoutError):
message = yield from client.deliver_message(timeout=2)
yield from client.unsubscribe(['$SYS/broker/uptime'])