From 07ae8164cd57daf9a8185b554311e6c81c2358e7 Mon Sep 17 00:00:00 2001 From: Yves G Date: Wed, 31 Jan 2018 13:05:42 +0100 Subject: [PATCH] fix None handling in filters --- pyruse/filters/filter_equals.py | 4 ++-- pyruse/filters/filter_greaterOrEquals.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyruse/filters/filter_equals.py b/pyruse/filters/filter_equals.py index cca83a5..844b066 100644 --- a/pyruse/filters/filter_equals.py +++ b/pyruse/filters/filter_equals.py @@ -1,5 +1,5 @@ # pyruse is intended as a replacement to both fail2ban and epylog -# Copyright © 2017 Y. Gablin +# Copyright © 2017–2018 Y. Gablin # Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing. from pyruse import base @@ -10,4 +10,4 @@ class Filter(base.Filter): self.value = args["value"] def filter(self, entry): - return entry.get(self.field, None) == self.value + return entry[self.field] == self.value if self.field in entry else False diff --git a/pyruse/filters/filter_greaterOrEquals.py b/pyruse/filters/filter_greaterOrEquals.py index 46f8d8c..30ff85c 100644 --- a/pyruse/filters/filter_greaterOrEquals.py +++ b/pyruse/filters/filter_greaterOrEquals.py @@ -1,5 +1,5 @@ # pyruse is intended as a replacement to both fail2ban and epylog -# Copyright © 2017 Y. Gablin +# Copyright © 2017–2018 Y. Gablin # Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing. from pyruse import base @@ -10,4 +10,4 @@ class Filter(base.Filter): self.value = args["value"] def filter(self, entry): - return entry.get(self.field, None) >= self.value + return entry[self.field] >= self.value if self.field in entry else False