Skip to content

Commit e30e901

Browse files
chenjingen-janechenjingen-jane
committed
refactor: apply reviewer suggestions and fix logic regression
1 parent 3402c0b commit e30e901

File tree

13 files changed

+28
-33
lines changed

13 files changed

+28
-33
lines changed

‎intelmq/bin/intelmqctl.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ def upgrade_conf(self, previous=None, dry_run=None, function=None,
11151115
result['traceback'] = traceback.format_exc()
11161116
result['success'] = False
11171117
else:
1118-
if type(retval) is str:
1118+
if isinstance(retval, str):
11191119
self._logger.error('Upgrade %r failed: %s', function, retval)
11201120
result['message'] = retval
11211121
result['success'] = False
@@ -1207,7 +1207,7 @@ def upgrade_conf(self, previous=None, dry_run=None, function=None,
12071207
result['traceback'] = traceback.format_exc()
12081208
result['success'] = False
12091209
else:
1210-
if type(retval) is str:
1210+
if isinstance(retval, str):
12111211
self._logger.error('%s: Upgrade failed: %s', docstring, retval)
12121212
result['message'] = retval
12131213
result['success'] = False

‎intelmq/bots/experts/filter/expert.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,21 @@ def process(self):
8282
except ValueError:
8383
self.logger.error("Could not parse time.source %s.", event.get('time.source'))
8484
else:
85-
if type(self.not_after) is datetime and event_time > self.not_after:
85+
if isinstance(self.not_after, datetime) and event_time > self.not_after:
8686
self.acknowledge_message()
8787
self.logger.debug("Filtered out event with time.source %s.", event.get('time.source'))
8888
return
89-
if type(self.not_before) is datetime and event_time < self.not_before:
89+
if isinstance(self.not_before, datetime) and event_time < self.not_before:
9090
self.acknowledge_message()
9191
self.logger.debug("Filtered out event with time.source %r.", event.get('time.source'))
9292
return
9393

9494
now = datetime.now(tz=timezone.utc)
95-
if type(self.not_after) is timedelta and event_time > (now - self.not_after):
95+
if isinstance(self.not_after, timedelta) and event_time > (now - self.not_after):
9696
self.acknowledge_message()
9797
self.logger.debug("Filtered out event with time.source %r.", event.get('time.source'))
9898
return
99-
if type(self.not_before) is timedelta and event_time < (now - self.not_before):
99+
if isinstance(self.not_before, timedelta) and event_time < (now - self.not_before):
100100
self.acknowledge_message()
101101
self.logger.debug("Filtered out event with time.source %r.", event.get('time.source'))
102102
return

‎intelmq/bots/experts/format_field/expert.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FormatFieldExpertBot(ExpertBot):
1818
split_column = None
1919

2020
def init(self):
21-
if type(self.strip_columns) is str:
21+
if isinstance(self.strip_columns, str):
2222
self.strip_columns = [column.strip() for column in self.strip_columns.split(",")]
2323

2424
def process(self):

‎intelmq/bots/experts/rdap/expert.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ def init(self):
4646

4747
# get bootstrapped servers
4848
for service in self.rdap_bootstrapped_servers:
49-
if type(self.rdap_bootstrapped_servers[service]) is str:
49+
if isinstance(self.rdap_bootstrapped_servers[service], str):
5050
self.__rdap_directory[service] = {"url": self.rdap_bootstrapped_servers[service]}
51-
elif type(self.rdap_bootstrapped_servers) is dict:
51+
elif isinstance(self.rdap_bootstrapped_servers, dict):
5252
self.__rdap_directory[service] = self.rdap_bootstrapped_servers[service]
5353

5454
def parse_entities(self, vcardArray) -> list:
5555
vcard = []
5656
for vcardentry in vcardArray:
57-
if type(vcardentry) is str:
57+
if isinstance(vcardentry, str):
5858
continue
5959

6060
for vcarddata in vcardentry:

‎intelmq/bots/parsers/generic/parser_csv.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class GenericCsvParserBot(ParserBot):
5050

5151
def init(self):
5252
# convert columns to an array
53-
if type(self.columns) is str:
53+
if isinstance(self.columns, str):
5454
self.columns = [column.strip() for column in self.columns.split(",")]
5555

5656
if self.type_translation and isinstance(self.type_translation, str): # not-empty string

‎intelmq/bots/parsers/html_table/parser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ def init(self):
5555
raise MissingDependencyError("beautifulsoup4")
5656

5757
# convert columns to an array
58-
if type(self.columns) is str:
58+
if isinstance(self.columns, str):
5959
self.columns = [column.strip() for column in self.columns.split(",")]
6060
if self.ignore_values is None:
6161
self.ignore_values = len(self.columns) * ['']
62-
if type(self.ignore_values) is str:
62+
if isinstance(self.ignore_values, str):
6363
self.ignore_values = [value.strip() for value in self.ignore_values.split(",")]
6464

6565
if len(self.columns) != len(self.ignore_values):

‎intelmq/lib/bot.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,7 @@ def __reset_total_path_stats(self):
532532
"""Initially set destination paths to 0 to reset them in stats cache"""
533533
if not self.destination_queues:
534534
return
535-
queues_type = type(self.destination_queues)
536-
if queues_type is dict:
535+
if isinstance(self.destination_queues, dict):
537536
for path in self.destination_queues.keys():
538537
self.__message_counter["path_total"][path] = 0
539538
else:
@@ -1244,7 +1243,7 @@ def process(self):
12441243
value = self.parse_line(line, report)
12451244
if value is None:
12461245
continue
1247-
elif type(value) is list or isinstance(value, types.GeneratorType):
1246+
elif isinstance(value, list) or isinstance(value, types.GeneratorType):
12481247
# filter out None
12491248
events: list[libmessage.Event] = list(filter(bool, value))
12501249
else:

‎intelmq/lib/harmonization.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def is_valid(value: str, sanitize: bool = False) -> bool:
101101
if not GenericType.is_valid(value):
102102
return False
103103

104-
if type(value) is not str:
104+
if not isinstance(value, str):
105105
return False
106106

107107
if len(value) == 0:

‎intelmq/lib/pipeline.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,9 @@ def set_queues(self, queues: Optional[str], queues_type: str):
116116
self.internal_queue = None if queues is None else f'{queues}-internal'
117117

118118
elif queues_type == "destination":
119-
type_ = type(queues)
120-
if type_ is list:
119+
if isinstance(queues, list):
121120
q = {"_default": queues}
122-
elif type_ is str:
121+
elif isinstance(queues, str):
123122
q = {"_default": queues.split()}
124123
elif isinstance(queues, dict):
125124
q = queues

‎intelmq/lib/test.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def setUpClass(cls):
171171
'time.observation': '2016-01-01T00:00:00+00:00'}
172172
elif cls.bot_type != 'collector' and cls.default_input_message == '':
173173
cls.default_input_message = {'__type': 'Event'}
174-
if type(cls.default_input_message) is dict:
174+
if isinstance(cls.default_input_message, dict):
175175
cls.default_input_message = \
176176
utils.decode(json.dumps(cls.default_input_message))
177177

@@ -268,9 +268,9 @@ def prepare_source_queue(self):
268268
self.input_message = [self.input_message]
269269
self.input_queue = []
270270
for msg in self.input_message:
271-
if type(msg) is dict:
271+
if isinstance(msg, dict):
272272
self.input_queue.append(json.dumps(msg))
273-
elif issubclass(type(msg), message.Message):
273+
elif isinstance(msg, message.Message):
274274
self.input_queue.append(msg.serialize())
275275
else:
276276
self.input_queue.append(msg)

0 commit comments

Comments
 (0)