From 95b418a35fb09177b803b08b31aecbba15e86389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Thu, 14 Apr 2016 14:40:33 +0200
Subject: [PATCH] Syntax compatibility with Python 3 (thx to Radko Krkos)
---
warden3/warden_client/warden_client.py | 2 +-
.../warden_client/warden_client_examples.py | 23 ++++++++++---------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/warden3/warden_client/warden_client.py b/warden3/warden_client/warden_client.py
index f03c5f9..0136660 100644
--- a/warden3/warden_client/warden_client.py
+++ b/warden3/warden_client/warden_client.py
@@ -14,7 +14,7 @@ from os import path
from operator import itemgetter
from sys import version_info
-fix_logging_filename = str if version_info<(2, 7) else lambda(x): x
+fix_logging_filename = str if version_info<(2, 7) else lambda x: x
VERSION = "3.0-beta2"
diff --git a/warden3/warden_client/warden_client_examples.py b/warden3/warden_client/warden_client_examples.py
index a66262b..909ee8f 100755
--- a/warden3/warden_client/warden_client_examples.py
+++ b/warden3/warden_client/warden_client_examples.py
@@ -106,7 +106,7 @@ def gen_random_idea(client_name="cz.example.warden.test"):
"Size": 46,
"Ref": ["cve:CVE-%s-%s" % (randstr(string.digits, 4), randstr())],
"ContentEncoding": "base64",
- "Content": b64encode(randstr())
+ "Content": b64encode(randstr(maxlen=128*1024))
}
],
"Node": [
@@ -139,7 +139,7 @@ def main():
# idstore="MyClient.id",
# name="cz.example.warden.test")
- print "=== Debug ==="
+ print("=== Debug ===")
info = wclient.getDebug()
pprint(info)
@@ -150,18 +150,18 @@ def main():
# If you want just to be informed, this is not necessary, just
# configure logging correctly and check logs.
if isinstance(info, Error):
- print info
+ print(info)
- print "=== Server info ==="
+ print("=== Server info ===")
info = wclient.getInfo()
- print "=== Sending 10 event(s) ==="
+ print("=== Sending 10 event(s) ===")
start = time()
ret = wclient.sendEvents([gen_random_idea(client_name=wclient.name) for i in range(10)])
- print ret
- print "Time: %f" % (time()-start)
+ print(ret)
+ print("Time: %f" % (time()-start))
- print "=== Getting 10 events ==="
+ print("=== Getting 10 events ===")
start = time()
# cat = ['Availability', 'Abusive.Spam','Attempt.Login']
@@ -181,11 +181,12 @@ def main():
group = []
nogroup = []
+ ret = wclient.getEvents(count=0, id=0, cat=cat, nocat=nocat, tag=tag, notag=notag, group=group, nogroup=nogroup)
ret = wclient.getEvents(count=10, cat=cat, nocat=nocat, tag=tag, notag=notag, group=group, nogroup=nogroup)
- print "Time: %f" % (time()-start)
- print "Got %i events" % len(ret)
+ print("Time: %f" % (time()-start))
+ print("Got %i events" % len(ret))
for e in ret:
- print e.get("Category"), e.get("Node")[0].get("Type"), e.get("Node")[0].get("Name")
+ print(e.get("Category"), e.get("Node")[0].get("Type"), e.get("Node")[0].get("Name"))
if __name__ == "__main__":
main()
--
GitLab