Skip to content

Commit da94d06

Browse files
annatischannatisch
committed
Pylint fixes
1 parent b391045 commit da94d06

File tree

10 files changed

+40
-50
lines changed

10 files changed

+40
-50
lines changed

‎azure/eventhub/async_ops/receiver_async.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,11 @@ async def has_started(self):
173173
timeout, auth_in_progress = await self._handler._auth.handle_token_async()
174174
if timeout:
175175
raise EventHubError("Authorization timeout.")
176-
elif auth_in_progress:
176+
if auth_in_progress:
177177
return False
178-
elif not await self._handler._client_ready_async():
178+
if not await self._handler._client_ready_async():
179179
return False
180-
else:
181-
return True
180+
return True
182181

183182
async def close_async(self, exception=None):
184183
"""
@@ -193,7 +192,7 @@ async def close_async(self, exception=None):
193192
self.running = False
194193
if self.error:
195194
return
196-
elif isinstance(exception, errors.LinkRedirect):
195+
if isinstance(exception, errors.LinkRedirect):
197196
self.redirected = exception
198197
elif isinstance(exception, EventHubError):
199198
self.error = exception
@@ -237,21 +236,19 @@ async def receive(self, max_batch_size=None, timeout=None):
237236
log.info("AsyncReceiver detached. Attempting reconnect.")
238237
await self.reconnect_async()
239238
return data_batch
240-
else:
241-
log.info("AsyncReceiver detached. Shutting down.")
242-
error = EventHubError(str(shutdown), shutdown)
243-
await self.close_async(exception=error)
244-
raise error
239+
log.info("AsyncReceiver detached. Shutting down.")
240+
error = EventHubError(str(shutdown), shutdown)
241+
await self.close_async(exception=error)
242+
raise error
245243
except errors.MessageHandlerError as shutdown:
246244
if self.auto_reconnect:
247245
log.info("AsyncReceiver detached. Attempting reconnect.")
248246
await self.reconnect_async()
249247
return data_batch
250-
else:
251-
log.info("AsyncReceiver detached. Shutting down.")
252-
error = EventHubError(str(shutdown), shutdown)
253-
await self.close_async(exception=error)
254-
raise error
248+
log.info("AsyncReceiver detached. Shutting down.")
249+
error = EventHubError(str(shutdown), shutdown)
250+
await self.close_async(exception=error)
251+
raise error
255252
except Exception as e:
256253
log.info("Unexpected error occurred (%r). Shutting down.", e)
257254
error = EventHubError("Receive failed: {}".format(e))

‎azure/eventhub/async_ops/sender_async.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,11 @@ async def has_started(self):
158158
timeout, auth_in_progress = await self._handler._auth.handle_token_async()
159159
if timeout:
160160
raise EventHubError("Authorization timeout.")
161-
elif auth_in_progress:
161+
if auth_in_progress:
162162
return False
163-
elif not await self._handler._client_ready_async():
163+
if not await self._handler._client_ready_async():
164164
return False
165-
else:
166-
return True
165+
return True
167166

168167
async def close_async(self, exception=None):
169168
"""
@@ -178,7 +177,7 @@ async def close_async(self, exception=None):
178177
self.running = False
179178
if self.error:
180179
return
181-
elif isinstance(exception, errors.LinkRedirect):
180+
if isinstance(exception, errors.LinkRedirect):
182181
self.redirected = exception
183182
elif isinstance(exception, EventHubError):
184183
self.error = exception

‎azure/eventhub/client.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@ def get_eventhub_info(self):
330330
output['partition_count'] = eh_info[b'partition_count']
331331
output['partition_ids'] = [p.decode('utf-8') for p in eh_info[b'partition_ids']]
332332
return output
333-
except:
334-
raise
335333
finally:
336334
mgmt_client.close()
337335

‎azure/eventhub/common.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ def _error_handler(error):
3232
"""
3333
if error.condition == b'com.microsoft:server-busy':
3434
return errors.ErrorAction(retry=True, backoff=4)
35-
elif error.condition == b'com.microsoft:timeout':
35+
if error.condition == b'com.microsoft:timeout':
3636
return errors.ErrorAction(retry=True, backoff=2)
37-
elif error.condition == b'com.microsoft:operation-cancelled':
37+
if error.condition == b'com.microsoft:operation-cancelled':
3838
return errors.ErrorAction(retry=True)
39-
elif error.condition == b"com.microsoft:container-close":
39+
if error.condition == b"com.microsoft:container-close":
4040
return errors.ErrorAction(retry=True, backoff=4)
41-
elif error.condition in _NO_RETRY_ERRORS:
41+
if error.condition in _NO_RETRY_ERRORS:
4242
return errors.ErrorAction(retry=False)
4343
return errors.ErrorAction(retry=True)
4444

@@ -269,7 +269,7 @@ def selector(self):
269269
if isinstance(self.value, datetime.datetime):
270270
timestamp = (time.mktime(self.value.timetuple()) * 1000) + (self.value.microsecond/1000)
271271
return ("amqp.annotation.x-opt-enqueued-time {} '{}'".format(operator, int(timestamp))).encode('utf-8')
272-
elif isinstance(self.value, int):
272+
if isinstance(self.value, int):
273273
return ("amqp.annotation.x-opt-sequence-number {} '{}'".format(operator, self.value)).encode('utf-8')
274274
return ("amqp.annotation.x-opt-offset {} '{}'".format(operator, self.value)).encode('utf-8')
275275

‎azure/eventhub/receiver.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,11 @@ def has_started(self):
170170
timeout, auth_in_progress = self._handler._auth.handle_token()
171171
if timeout:
172172
raise EventHubError("Authorization timeout.")
173-
elif auth_in_progress:
173+
if auth_in_progress:
174174
return False
175-
elif not self._handler._client_ready():
175+
if not self._handler._client_ready():
176176
return False
177-
else:
178-
return True
177+
return True
179178

180179
def close(self, exception=None):
181180
"""
@@ -190,7 +189,7 @@ def close(self, exception=None):
190189
self.running = False
191190
if self.error:
192191
return
193-
elif isinstance(exception, errors.LinkRedirect):
192+
if isinstance(exception, errors.LinkRedirect):
194193
self.redirected = exception
195194
elif isinstance(exception, EventHubError):
196195
self.error = exception
@@ -243,18 +242,16 @@ def receive(self, max_batch_size=None, timeout=None):
243242
if shutdown.action.retry and self.auto_reconnect:
244243
self.reconnect()
245244
return data_batch
246-
else:
247-
error = EventHubError(str(shutdown), shutdown)
248-
self.close(exception=error)
249-
raise error
245+
error = EventHubError(str(shutdown), shutdown)
246+
self.close(exception=error)
247+
raise error
250248
except errors.MessageHandlerError as shutdown:
251249
if self.auto_reconnect:
252250
self.reconnect()
253251
return data_batch
254-
else:
255-
error = EventHubError(str(shutdown), shutdown)
256-
self.close(exception=error)
257-
raise error
252+
error = EventHubError(str(shutdown), shutdown)
253+
self.close(exception=error)
254+
raise error
258255
except Exception as e:
259256
error = EventHubError("Receive failed: {}".format(e))
260257
self.close(exception=error)

‎azure/eventhub/sender.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@ def has_started(self):
154154
timeout, auth_in_progress = self._handler._auth.handle_token()
155155
if timeout:
156156
raise EventHubError("Authorization timeout.")
157-
elif auth_in_progress:
157+
if auth_in_progress:
158158
return False
159-
elif not self._handler._client_ready():
159+
if not self._handler._client_ready():
160160
return False
161-
else:
162-
return True
161+
return True
163162

164163
def close(self, exception=None):
165164
"""
@@ -174,7 +173,7 @@ def close(self, exception=None):
174173
self.running = False
175174
if self.error:
176175
return
177-
elif isinstance(exception, errors.LinkRedirect):
176+
if isinstance(exception, errors.LinkRedirect):
178177
self.redirected = exception
179178
elif isinstance(exception, EventHubError):
180179
self.error = exception

‎azure/eventprocessorhost/eh_partition_pump.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ async def on_open_async(self):
3636
_opened_ok = True
3737
except Exception as err: # pylint: disable=broad-except
3838
_logger.warning(
39-
"%r,%r PartitionPumpWarning: Failure creating client or receiver, " +
40-
"retrying: %r", self.host.guid, self.partition_context.partition_id, err)
39+
"%r,%r PartitionPumpWarning: Failure creating client or receiver, retrying: %r",
40+
self.host.guid, self.partition_context.partition_id, err)
4141
last_exception = err
4242
_retry_count += 1
4343

‎azure/eventprocessorhost/partition_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ async def persist_checkpoint_async(self, checkpoint):
121121
self.lease.offset = checkpoint.offset
122122
self.lease.sequence_number = checkpoint.sequence_number
123123
else:
124-
_logger.error(
124+
_logger.error( # pylint: disable=logging-not-lazy
125125
"Ignoring out of date checkpoint with offset %r/sequence number %r because " +
126126
"current persisted checkpoint has higher offset %r/sequence number %r",
127127
checkpoint.offset,

‎azure/eventprocessorhost/partition_pump.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ async def process_events_async(self, events):
143143
# CloseAsync are protected by synchronizing too.
144144
try:
145145
last = events[-1]
146-
if last != None:
146+
if last is not None:
147147
self.partition_context.set_offset_and_sequence_number(last)
148148
await self.processor.process_events_async(self.partition_context, events)
149149
except Exception as err: # pylint: disable=broad-except

‎pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ reports=no
66
# For all codes, run 'pylint --list-msgs' or go to 'https://pylint.readthedocs.io/en/latest/reference_guide/features.html'
77
# locally-disabled: Warning locally suppressed using disable-msg
88
# cyclic-import: because of https://github.com/PyCQA/pylint/issues/850
9-
disable=raising-bad-type,missing-docstring,locally-disabled,fixme,cyclic-import,too-many-arguments,invalid-name,duplicate-code,logging-format-interpolation,too-many-instance-attributes,too-few-public-methods
9+
disable=useless-object-inheritance,raising-bad-type,missing-docstring,locally-disabled,fixme,cyclic-import,too-many-arguments,invalid-name,duplicate-code,logging-format-interpolation,too-many-instance-attributes,too-few-public-methods
1010

1111
[FORMAT]
1212
max-line-length=120

0 commit comments

Comments
 (0)