From 75c86f4bae7c9fa5cafaaf03467549906d3f8d42 Mon Sep 17 00:00:00 2001 From: Pieter Verberne Date: Mon, 21 Jun 2021 13:29:52 +0200 Subject: [PATCH 1/2] run 2to3-2.7 --- README.md | 4 ++-- lock-acquire.py | 2 +- lock-get.py | 22 +++++++++++----------- lock-list-locks.py | 4 ++-- lock-list-resources.py | 2 +- pip-requirements.txt | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 1ff2071..d8e8df6 100644 --- a/README.md +++ b/README.md @@ -49,12 +49,12 @@ try: lock_url2 = client.lock_acquire("foo", wait=3) except RDLMException: - print "Can't acquire the lock" + print("Can't acquire the lock") # Release the lock result = client.lock_release(lock_url) if not(result): - print "Can't release the lock" + print("Can't release the lock")))) ### Context Manager API diff --git a/lock-acquire.py b/lock-acquire.py index dd5a0f4..f38e289 100755 --- a/lock-acquire.py +++ b/lock-acquire.py @@ -26,7 +26,7 @@ try: lock_url = client.lock_acquire(args.resource_name, lifetime=args.timeout, wait=args.wait) - print lock_url + print(lock_url) return_code = 0 except RDLMLockWaitExceededException: sys.stderr.write("Can't acquire the lock on %s resource in %i second(s)\n" % diff --git a/lock-get.py b/lock-get.py index 491f11a..b92694d 100755 --- a/lock-get.py +++ b/lock-get.py @@ -7,7 +7,7 @@ import argparse import sys from rdlmpy import RDLMClient -from urlparse import urlparse +from urllib.parse import urlparse parser = argparse.ArgumentParser(description='Get some informations about a lock') parser.add_argument("lock_url", type=str, help="Lock Url (returned by lock-acquire.py)") @@ -26,18 +26,18 @@ return_code = 3 lock = client.lock_get(args.lock_url) if lock: - print "url: %s" % lock.url - print "timeout: %s (seconds)" % lock.lifetime - print "wait: %s (seconds)" % lock.wait - print "title: %s" % lock.title + print("url: %s" % lock.url) + print("timeout: %s (seconds)" % lock.lifetime) + print("wait: %s (seconds)" % lock.wait) + print("title: %s" % lock.title) if lock.active: - print "state: active" - print "active_since: %s" % lock.active_since - print "active_expires: %s" % lock.active_expires + print("state: active") + print("active_since: %s" % lock.active_since) + print("active_expires: %s" % lock.active_expires) else: - print "state: waiting" - print "wait_since: %s" % lock.wait_since - print "wait_expires: %s" % lock.wait_expires + print("state: waiting") + print("wait_since: %s" % lock.wait_since) + print("wait_expires: %s" % lock.wait_expires) return_code = 0 else: sys.stderr.write("Can't find the lock\n") diff --git a/lock-list-locks.py b/lock-list-locks.py index e6a4071..dde1d1d 100755 --- a/lock-list-locks.py +++ b/lock-list-locks.py @@ -21,6 +21,6 @@ password=args.password) for lock in locks: if lock.active: - print "active: %s since %s [%s]" % (lock.url, lock.active_since, lock.title) + print("active: %s since %s [%s]" % (lock.url, lock.active_since, lock.title)) else: - print "waiting: %s since %s [%s]" % (lock.url, lock.wait_since, lock.title) + print("waiting: %s since %s [%s]" % (lock.url, lock.wait_since, lock.title)) diff --git a/lock-list-resources.py b/lock-list-resources.py index 5f391ae..4c86d3d 100755 --- a/lock-list-resources.py +++ b/lock-list-resources.py @@ -18,4 +18,4 @@ names = client.resource_get_all(args.username, args.password) for name in names: - print name + print(name) diff --git a/pip-requirements.txt b/pip-requirements.txt index 134975b..3e801e7 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -1 +1 @@ -requests==1.2.3 +requests>=1.2.3 From 1bebf261663a4d3e4b8cd248ea238d3ce0faf146 Mon Sep 17 00:00:00 2001 From: Pieter Verberne Date: Thu, 21 Apr 2022 15:16:24 +0200 Subject: [PATCH 2/2] update pip requirements --- pip-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip-requirements.txt b/pip-requirements.txt index 3e801e7..111f18b 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -1 +1 @@ -requests>=1.2.3 +requests>=2.20.0