You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2018/09/18 13:27:17 UTC
qpid-proton git commit: NO-JIRA: [Python] Trivial pylint fixes
Repository: qpid-proton
Updated Branches:
refs/heads/master 57f5ec14a -> 348e9da89
NO-JIRA: [Python] Trivial pylint fixes
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/348e9da8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/348e9da8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/348e9da8
Branch: refs/heads/master
Commit: 348e9da8923f590c67a9fd01e91011987f238038
Parents: 57f5ec1
Author: Andrew Stitcher <as...@apache.org>
Authored: Thu Sep 13 17:23:26 2018 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Tue Sep 18 09:16:00 2018 -0400
----------------------------------------------------------------------
python/proton/_reactor.py | 22 +++++++++++-----------
python/proton/_reactor_impl.py | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/348e9da8/python/proton/_reactor.py
----------------------------------------------------------------------
diff --git a/python/proton/_reactor.py b/python/proton/_reactor.py
index 1d09b18..63e89c8 100644
--- a/python/proton/_reactor.py
+++ b/python/proton/_reactor.py
@@ -51,10 +51,10 @@ from ._handlers import OutgoingMessageHandler
from . import _compat
from ._compat import queue
-log = logging.getLogger("proton")
+Logger = logging.getLogger("proton")
-def generate_uuid():
+def _generate_uuid():
return uuid.uuid4()
@@ -428,7 +428,7 @@ class Transaction(object):
elif event.delivery.remote_state == Delivery.REJECTED:
self.handler.on_transaction_declare_failed(event)
else:
- log.warning("Unexpected outcome for declare: %s" % event.delivery.remote_state)
+ Logger.warning("Unexpected outcome for declare: %s" % event.delivery.remote_state)
self.handler.on_transaction_declare_failed(event)
elif event.delivery == self._discharge:
if event.delivery.remote_state == Delivery.REJECTED:
@@ -614,7 +614,7 @@ class Connector(Handler):
# if virtual-host not set, use host from address as default
if self.virtual_host is None:
connection.hostname = url.host
- log.debug("connecting to %r..." % url)
+ Logger.debug("connecting to %r..." % url)
transport = Transport()
if self.sasl_enabled:
@@ -645,7 +645,7 @@ class Connector(Handler):
self._connect(event.connection, event.reactor)
def on_connection_remote_open(self, event):
- log.debug("connected to %s" % event.connection.hostname)
+ Logger.debug("connected to %s" % event.connection.hostname)
if self.reconnect:
self.reconnect.reset()
self.transport = None
@@ -660,15 +660,15 @@ class Connector(Handler):
event.transport.unbind()
delay = self.reconnect.next()
if delay == 0:
- log.info("Disconnected, reconnecting...")
+ Logger.info("Disconnected, reconnecting...")
self._connect(self.connection, event.reactor)
return
else:
- log.info("Disconnected will try to reconnect after %s seconds" % delay)
+ Logger.info("Disconnected will try to reconnect after %s seconds" % delay)
event.reactor.schedule(delay, self)
return
else:
- log.debug("Disconnected")
+ Logger.debug("Disconnected")
# See connector.cpp: conn.free()/pn_connection_release() here?
self.connection = None
@@ -744,7 +744,7 @@ class Container(Reactor):
self.ssl = None
self.global_handler = GlobalOverrides(kwargs.get('global_handler', self.global_handler))
self.trigger = None
- self.container_id = str(generate_uuid())
+ self.container_id = str(_generate_uuid())
self.allow_insecure_mechs = True
self.allowed_mechs = None
self.sasl_enabled = True
@@ -802,7 +802,7 @@ class Container(Reactor):
"""
conn = self.connection(handler)
- conn.container = self.container_id or str(generate_uuid())
+ conn.container = self.container_id or str(_generate_uuid())
conn.offered_capabilities = kwargs.get('offered_capabilities')
conn.desired_capabilities = kwargs.get('desired_capabilities')
conn.properties = kwargs.get('properties')
@@ -850,7 +850,7 @@ class Container(Reactor):
elif remote:
return "%s-%s" % (container, remote)
else:
- return "%s-%s" % (container, str(generate_uuid()))
+ return "%s-%s" % (container, str(_generate_uuid()))
def _get_session(self, context):
if isinstance(context, Url):
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/348e9da8/python/proton/_reactor_impl.py
----------------------------------------------------------------------
diff --git a/python/proton/_reactor_impl.py b/python/proton/_reactor_impl.py
index 175a650..4ffebcd 100644
--- a/python/proton/_reactor_impl.py
+++ b/python/proton/_reactor_impl.py
@@ -35,7 +35,7 @@ from ._wrapper import Wrapper
from . import _compat
-_DEFAULT = object()
+_DEFAULT = False
class Selectable(Wrapper):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org