From 808cdaec9b26c8bcd9c9ee1032625fd17d39def7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Thu, 14 Apr 2016 14:47:20 +0200
Subject: [PATCH] Python3 compatibility - iterator/sequence context, less
unicode (thx to Radko Krkos)
---
warden3/warden_client/warden_client.py | 4 ++--
warden3/warden_client/warden_client_examples.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/warden3/warden_client/warden_client.py b/warden3/warden_client/warden_client.py
index 0136660..c4d93c6 100644
--- a/warden3/warden_client/warden_client.py
+++ b/warden3/warden_client/warden_client.py
@@ -532,7 +532,7 @@ class Client(object):
""" Send out "events" list to server, retrying on server errors.
"""
ev = events
- idx_xlat = range(len(ev))
+ idx_xlat = list(range(len(ev)))
err = Error()
retry = retry or self.retry
attempt = retry
@@ -550,7 +550,7 @@ class Client(object):
res.errors.sort(key=itemgetter("error"))
for e in res.errors:
errno = e["error"]
- evlist = e.get("events", range(len(ev))) # none means all
+ evlist = e.get("events", list(range(len(ev)))) # none means all
if errno < 500 or not attempt:
# Fatal error or last try, translate indices
# to original and prepare for returning to caller
diff --git a/warden3/warden_client/warden_client_examples.py b/warden3/warden_client/warden_client_examples.py
index 909ee8f..840509e 100755
--- a/warden3/warden_client/warden_client_examples.py
+++ b/warden3/warden_client/warden_client_examples.py
@@ -56,7 +56,7 @@ def gen_random_idea(client_name="cz.example.warden.test"):
def randip6():
return [rand6ip, geniprange(rand6ip), rand6cidr][randint(0, 2)]()
- def randstr(charlist=string.letters, maxlen=32, minlen=1):
+ def randstr(charlist=string.ascii_letters, maxlen=32, minlen=1):
return ''.join(choice(charlist) for i in range(randint(minlen, maxlen)))
event = {
--
GitLab