Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix pylint error
  • Loading branch information
yijxie committed Oct 3, 2019
commit 12318d95bd1408a1d25fc2f06d847a5737bbe59d
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,3 @@ def close(self):
self._handler.close() # this will close link if sharing connection. Otherwise close connection
self._running = False
self._closed = True

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import time

from uamqp import errors, constants, compat # type: ignore
from azure.eventhub.error import EventHubError, ConnectError
from azure.eventhub.error import EventHubError
from ..aio.error_async import _handle_exception

log = logging.getLogger(__name__)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ async def _management_request(self, mgmt_msg, op_type):
retried_times += 1
finally:
await mgmt_client.close_async()
log.info("%r returns an exception %r", self._container_id, last_exception)
log.info("%r returns an exception %r", self._container_id, last_exception) # pylint:disable=specify-parameter-names-in-call
raise last_exception

async def get_properties(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
import uamqp # type: ignore
from uamqp import errors, types, utils # type: ignore
from uamqp import ReceiveClientAsync, Source # type: ignore
import uamqp

from azure.eventhub import EventData, EventPosition
from azure.eventhub.error import EventHubError, ConnectError, _error_handler
from azure.eventhub.error import _error_handler
from ._consumer_producer_mixin_async import ConsumerProducerMixin

log = logging.getLogger(__name__)
Expand Down Expand Up @@ -133,11 +132,11 @@ def _create_handler(self):
if self._offset is not None:
source.set_filter(self._offset._selector()) # pylint:disable=protected-access

if StrictVersion(uamqp.__version__) < StrictVersion("1.2.3"): # backward compatible until uamqp 1.2.3 is released
if StrictVersion(uamqp.__version__) < StrictVersion("1.2.3"): # backward compatible until uamqp 1.2.3 released
desired_capabilities = {}
elif self._track_last_enqueued_event_properties:
symbol_array = [types.AMQPSymbol(self._receiver_runtime_metric_symbol)]
desired_capabilities = {"desired_capabilities": utils.data_factory(types.AMQPArray(symbol_array))}
symbol_array = [types.AMQPSymbol(self._receiver_runtime_metric_symbol)]
desired_capabilities = {"desired_capabilities": utils.data_factory(types.AMQPArray(symbol_array))}
else:
desired_capabilities = {"desired_capabilities": None}

Expand Down Expand Up @@ -186,7 +185,7 @@ async def _receive(self, timeout_time=None, max_batch_size=None, **kwargs):
if data_batch:
self._offset = EventPosition(data_batch[-1].offset)

if self._track_last_enqueued_event_properties and len(data_batch):
if self._track_last_enqueued_event_properties and data_batch:
self._last_enqueued_event_properties = data_batch[-1]._get_last_enqueued_event_properties() # pylint:disable=protected-access

return data_batch
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-eventhubs/azure/eventhub/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def _management_request(self, mgmt_msg, op_type):
retried_times += 1
finally:
mgmt_client.close()
log.info("%r returns an exception %r", self._container_id, last_exception)
log.info("%r returns an exception %r", self._container_id, last_exception) # pylint:disable=specify-parameter-names-in-call
raise last_exception


Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-eventhubs/azure/eventhub/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import six

from uamqp import BatchMessage, Message, types, constants # type: ignore
from uamqp.message import MessageHeader, MessageProperties # type: ignore
from uamqp.message import MessageHeader # type: ignore

from azure.core.settings import settings

Expand Down
15 changes: 7 additions & 8 deletions sdk/eventhub/azure-eventhubs/azure/eventhub/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
import logging
import time
from typing import List
from distutils.version import StrictVersion

import uamqp # type: ignore
import uamqp
from uamqp import types, errors, utils # type: ignore
from uamqp import ReceiveClient, Source # type: ignore
import uamqp
from distutils.version import StrictVersion

from azure.eventhub.common import EventData, EventPosition
from azure.eventhub.error import _error_handler
Expand Down Expand Up @@ -130,11 +129,11 @@ def _create_handler(self):
if self._offset is not None:
source.set_filter(self._offset._selector()) # pylint:disable=protected-access

if StrictVersion(uamqp.__version__) < StrictVersion("1.2.3"): # backward compatible until uamqp 1.2.3 is released
if StrictVersion(uamqp.__version__) < StrictVersion("1.2.3"): # backward compatible until uamqp 1.2.3 released
desired_capabilities = {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same to suggestion of logging a warning above

elif self._track_last_enqueued_event_properties:
symbol_array = [types.AMQPSymbol(self._receiver_runtime_metric_symbol)]
desired_capabilities = {"desired_capabilities": utils.data_factory(types.AMQPArray(symbol_array))}
symbol_array = [types.AMQPSymbol(self._receiver_runtime_metric_symbol)]
desired_capabilities = {"desired_capabilities": utils.data_factory(types.AMQPArray(symbol_array))}
else:
desired_capabilities = {"desired_capabilities": None}

Expand Down Expand Up @@ -181,7 +180,7 @@ def _receive(self, timeout_time=None, max_batch_size=None, **kwargs):
if data_batch:
self._offset = EventPosition(data_batch[-1].offset)

if self._track_last_enqueued_event_properties and len(data_batch):
if self._track_last_enqueued_event_properties and data_batch:
self._last_enqueued_event_properties = data_batch[-1]._get_last_enqueued_event_properties() # pylint:disable=protected-access

return data_batch
Expand Down Expand Up @@ -253,7 +252,7 @@ def receive(self, max_batch_size=None, timeout=None):

return self._receive_with_retry(timeout=timeout, max_batch_size=max_batch_size)

def close(self):
def close(self): # pylint:disable=useless-super-delegation
# type:() -> None
"""
Close down the handler. If the handler has already closed,
Expand Down