From c2644dd15d0a99136098c28ca8b4529a09ed8af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Thu, 5 May 2016 11:13:42 +0200
Subject: [PATCH] Python 3 compatibility (while retaining 2.6)
---
flowmon-ads/warden3_flowmon_ads_filer.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flowmon-ads/warden3_flowmon_ads_filer.py b/flowmon-ads/warden3_flowmon_ads_filer.py
index c878601..1ab1c2a 100644
--- a/flowmon-ads/warden3_flowmon_ads_filer.py
+++ b/flowmon-ads/warden3_flowmon_ads_filer.py
@@ -219,7 +219,7 @@ def main():
add_orig_data = True
sdir = SafeDir("/data/warden/var/feeds-out")
- ads_fields = [it[0] for it in sorted(ads_fieldnames.items(), key=lambda(it): it[1]["order"])]
+ ads_fields = [it[0] for it in sorted(ads_fieldnames.items(), key=lambda it: it[1]["order"])]
for row in csv.reader(sys.stdin, dialect="excel-tab"):
if not row:
continue
@@ -232,8 +232,8 @@ def main():
nf = sdir.newfile()
try:
data = json.dumps(event)
- nf.f.write(data)
- except Exception, e:
+ nf.f.write(data.encode("utf-8"))
+ except Exception as e:
sys.stderr.write("Error: %s\n" % str(e))
sys.stderr.write("Error source line: %s\n" % row)
sys.stderr.write("Error event data: %s\n" % str(event))
--
GitLab