diff --git a/warden3/warden_client/warden_client.py b/warden3/warden_client/warden_client.py index 0136660409f1693f2cde9f4243c6b2f1c2d1e40b..c4d93c6efb522d9cc5ff3302231bc33562083930 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 909ee8f65cf950d5f4777416c5440af40ee9cd87..840509e165a40fbc3f5fc0cb7789dca160f021f2 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 = {