[PATCH v2 0/4] Fix python style issues

[Nir Soffer]

Fix python style issues and add flake8 style check to the build to keep
the code in good shape.

Changes since v1:
- Add flake8 to travis build
- Replace star imports with explicit imports to allow flake8 detection
  of undefined names (Pavel)
- Convert example.py to python3 - breaks flake8 on python 3 builds.

v1 was here:
https://lists.fedorahosted.org/archives/list/[e-mail]...

Nir Soffer (4):
  python: Add flak8 env
  python: Avoid star imports
  python: Fix style issues
  python: Convert example.py to python 3

 .travis.yml          |  4 ++++
 README.dev           |  4 ++++
 python/example.py    | 56 +++++++++++++++++++++++++++-----------------
 tests/conftest.py    |  8 +++----
 tests/daemon_test.py | 15 ++++++++----
 tests/direct_test.py |  2 +-
 tests/python_test.py | 48 +++++++++++++++++++++++++------------
 tests/util.py        |  2 +-
 tox.ini              |  9 ++++++-
 9 files changed, 101 insertions(+), 47 deletions(-)

-- 
2.17.2

[PATCH v2 1/4] python: Add flak8 env

[Nir Soffer]

Flake8 provides basic linting and style checks for python code, helping
to keep the source in good shape.

Running tox will run flake8 automatically, showing errors in the source
and statistics for current issues. To run only flake8 tests use:

    $ tox -e flake8

Running tox will fail now with these errors:

1     E203 whitespace before ','
1     E265 block comment should start with '# '
7     E302 expected 2 blank lines, found 1
1     E305 expected 2 blank lines after class or function definition, found 1
14    E501 line too long (82 > 79 characters)
1     F401 'stat' imported but unused
5     F403 'from .constants import *' used; unable to detect undefined names
44    F405 'MiB' may be undefined, or defined from star imports: .constants,
.units
1     W391 blank line at end of file

Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 .travis.yml | 4 ++++
 README.dev  | 4 ++++
 tox.ini     | 9 ++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7b3fbe5..89fb52a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,13 @@ addons:
     - gcc
     - libaio-dev
     - libblkid-dev
     - make
 
+install:
+    - pip install flake8
+
 script:
     - make BUILDARGS="--build-lib=."
     - source tests/env.sh
     - pytest
+    - flake8 --statistics tests python
diff --git a/README.dev b/README.dev
index cc2c613..8ade5e6 100644
--- a/README.dev
+++ b/README.dev
@@ -35,10 +35,14 @@ To run only test from some modules:
 
 To run only tests matching the substring "foo":
 
     $ tox -- -k foo
 
+To run basic lint and style check:
+
+    $ tox -e flake8
+
 
 Testing 4K support
 ==================
 
 To enable the 4k tests, you need to setup 4k stroage for the tests:
diff --git a/tox.ini b/tox.ini
index 5a48b23..0e337ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,11 +2,11 @@
 # in multiple virtualenvs. This configuration file will run the
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27,py36
+envlist = py27,py36,flake8
 skipsdist = True
 skip_missing_interpreters = True
 
 [testenv]
 passenv = *
@@ -20,12 +20,19 @@ deps =
 commands =
     py27: make PY_VERSION=2.7 BUILDARGS="--build-lib={envsitepackagesdir}"
     py36: make PY_VERSION=3.6 BUILDARGS="--build-lib={envsitepackagesdir}"
     pytest {posargs}
 
+[testenv:flake8]
+deps = flake8
+commands = flake8 --statistics tests python
+
 [pytest]
 # Notes:
 # --basetemp: we must use /var/tmp as sanlock uses direct I/O.
 # -vv: increasing verbosify twice shows more detailed failures tracebacks.
 # -rxs: show extra test summary: (s)skipped, (x)failed
 # --durations: show slowest test duration
 addopts = -rxs -vv --basetemp=/var/tmp/sanlock --durations=10
+
+[flake8]
+show_source = True
-- 
2.17.2

[PATCH v2 2/4] python: Avoid star imports

[Nir Soffer]

Star Imports (from module import *) are very convenient but flake8 is
not smart enough to tell which names are imported. Replace the star
imports with specific imports.

This changes fixes these flake8 errors:

    5     F403 'from .constants import *' used; unable to detect undefined names
    44    F405 'MiB' may be undefined, or defined from star imports: .constants,
.units

Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 tests/daemon_test.py | 15 +++++++++++----
 tests/direct_test.py |  2 +-
 tests/python_test.py |  2 +-
 tests/util.py        |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index 36648e3..413ce95 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -7,13 +7,21 @@ import io
 import signal
 import struct
 
 import pytest
 
-from . constants import *
+from . constants import (
+    DELTA_DISK_MAGIC,
+    PAXOS_DISK_MAGIC,
+    PAXOS_DISK_CLEAR,
+    RINDEX_DISK_MAGIC,
+    RINDEX_ENTRIES_SECTORS,
+    RINDEX_ENTRY_SIZE
+)
+
 from . import util
-from . units import *
+from . units import MiB
 
 
 def test_single_instance(sanlock_daemon):
     # Starting another instance while the daemon must fail.
     p = util.start_daemon()
@@ -124,12 +132,11 @@ def test_create(tmpdir, sanlock_daemon):
 
     with io.open(str(path), "rb") as f:
         # New entry should be created at the first slot
         # The first rindex sector is used by the rindex header.
         f.seek(MiB + 512)
-        util.check_rindex_entry(f.read(RINDEX_ENTRY_SIZE),
-                                b"res", 3 * MiB, 0)
+        util.check_rindex_entry(f.read(RINDEX_ENTRY_SIZE), b"res", 3 * MiB, 0)
 
         # The rest of the entries should not be modified.
         rest = 512 * RINDEX_ENTRIES_SECTORS - RINDEX_ENTRY_SIZE
         assert f.read(rest) == b"\0" * rest
 
diff --git a/tests/direct_test.py b/tests/direct_test.py
index a157bc4..339ef51 100644
--- a/tests/direct_test.py
+++ b/tests/direct_test.py
@@ -6,11 +6,11 @@ from __future__ import absolute_import
 import io
 import struct
 
 from . import constants
 from . import util
-from . units import *
+from . units import MiB
 
 
 def test_init_lockspace(tmpdir):
     path = tmpdir.join("lockspace")
     size = MiB
diff --git a/tests/python_test.py b/tests/python_test.py
index 3242f57..a179254 100644
--- a/tests/python_test.py
+++ b/tests/python_test.py
@@ -15,11 +15,11 @@ import six
 
 import sanlock
 
 from . import constants
 from . import util
-from . units import *
+from . units import KiB, MiB, GiB, TiB
 
 
 # Largest file size on ext4 is 16TiB, and on xfs 500 TiB. Use 1 TiB as it is
 # large enough to test large offsets, and less likely to fail on developer
 # machine or CI slave.
diff --git a/tests/util.py b/tests/util.py
index 08db236..55e2a49 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -9,11 +9,11 @@ import os
 import socket
 import struct
 import subprocess
 import time
 
-from . units import *
+from . units import KiB
 
 TESTDIR = os.path.dirname(__file__)
 SANLOCK = os.path.join(TESTDIR, os.pardir, "src", "sanlock")
 
 GUARD = b"X"
-- 
2.17.2

[PATCH v2 3/4] python: Fix style issues

[Nir Soffer]

Fix style issues:

- 2 blank lines around functions and classes
- classes at the top of the module
- reformat to avoid long hard to read lines
- whitespace before ','
- whitespace after #
- unused imports
- remove blank line at end of file

Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 python/example.py    | 28 +++++++++++++++++++--------
 tests/conftest.py    |  8 ++++----
 tests/python_test.py | 46 ++++++++++++++++++++++++++++++--------------
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/python/example.py b/python/example.py
index 6ef9f7d..1be7e66 100644
--- a/python/example.py
+++ b/python/example.py
@@ -8,41 +8,46 @@ import sanlock
 
 HOST_ID = 1
 LOCKSPACE_NAME = "lockspace1"
 RESOURCE_NAME = "resource1"
 
+
 def sigTermHandler():
     print "SIGTERM signal received"
 
+
 def main():
     signal.signal(signal.SIGTERM, sigTermHandler)
 
     print "Creating the sanlock disk"
     fd, disk = tempfile.mkstemp()
     os.close(fd)
 
-    os.chown(disk, pwd.getpwnam("sanlock").pw_uid,
grp.getgrnam("sanlock").gr_gid)
+    os.chown(
+        disk, pwd.getpwnam("sanlock").pw_uid,
grp.getgrnam("sanlock").gr_gid)
     offset = sanlock.get_alignment(disk)
 
     SNLK_DISKS = [(disk, offset)]
 
     print "Registering to sanlock"
     fd = sanlock.register()
 
     print "Initializing '%s'" % (LOCKSPACE_NAME,)
-    sanlock.write_lockspace(LOCKSPACE_NAME, disk, max_hosts=0, iotimeout=0,
align=1048576, sector=512)
+    sanlock.write_lockspace(LOCKSPACE_NAME, disk, align=1048576, sector=512)
 
     print "Initializing '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME)
-    sanlock.write_resource(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=1048576,
sector=512)
+    sanlock.write_resource(
+        LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=1048576, sector=512)
 
     print "Acquiring the id '%i' on '%s'" % (HOST_ID,
LOCKSPACE_NAME)
     sanlock.add_lockspace(LOCKSPACE_NAME, HOST_ID, disk)
 
     try:
         print "Acquiring '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME)
-        sanlock.acquire(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, slkfd=fd,
-                        version=0)
+        sanlock.acquire(
+            LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, slkfd=fd, version=0)
+
         while True:
             print "Trying to get lockspace '%s' hosts" %
LOCKSPACE_NAME
             try:
                 hosts_list = sanlock.get_hosts(LOCKSPACE_NAME)
             except sanlock.SanlockException as e:
@@ -50,13 +55,19 @@ def main():
                     raise
             else:
                 print "Lockspace '%s' hosts: " % LOCKSPACE_NAME,
hosts_list
                 break
             time.sleep(5)
-        print "Resource '%s' owners: " % RESOURCE_NAME, \
-            sanlock.read_resource_owners(
-                LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=1048576, sector=512)
+
+        owners = sanlock.read_resource_owners(
+            LOCKSPACE_NAME,
+            RESOURCE_NAME,
+            SNLK_DISKS,
+            align=1048576,
+            sector=512)
+        print "Resource '%s' owners: %s" % (RESOURCE_NAME, owners)
+
         print "Releasing '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME)
         sanlock.release(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, slkfd=fd)
     except Exception as e:
         print "Exception: ", e
     finally:
@@ -64,7 +75,8 @@ def main():
         sanlock.rem_lockspace(LOCKSPACE_NAME, HOST_ID, disk)
 
     print "Removing the sanlock disk"
     os.remove(disk)
 
+
 if __name__ == '__main__':
     main()
diff --git a/tests/conftest.py b/tests/conftest.py
index 70e83d4..868ae46 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,18 +2,21 @@
 Fixtures for sanlock testing.
 """
 from __future__ import absolute_import
 
 import os
-import stat
 
 import pytest
 
 from . import storage
 from . import util
 
 
+class SanlockIsRunning(Exception):
+    """ Raised if sanlock running when it should not """
+
+
 @pytest.fixture
 def sanlock_daemon():
     """
     Run sanlock daemon during a test.
     """
@@ -48,8 +51,5 @@ def user_4k_path(request):
 
 @pytest.fixture
 def no_sanlock_daemon():
     if util.sanlock_is_running():
         raise SanlockIsRunning
-
-class SanlockIsRunning(Exception):
-    pass
diff --git a/tests/python_test.py b/tests/python_test.py
index a179254..c6bb038 100644
--- a/tests/python_test.py
+++ b/tests/python_test.py
@@ -34,11 +34,11 @@ ALIGNMENT_2M = 2 * MiB
 SECTOR_SIZE_512 = 512
 SECTOR_SIZE_4K = 4 * KiB
 
 
 FILE_NAMES = [
-    #name, encoding
+    # name, encoding
     ("ascii", None),
     (u"ascii", None),
     (u"\u05d0", None),
     (u"\u05d0", "utf-8"),
 ]
@@ -47,25 +47,31 @@ LOCKSPACE_OR_RESOURCE_NAMES = [
     # Bytes are supported with python 2 and 3.
     pytest.param(b"\xd7\x90"),
     # Python 2 also supports str.
     pytest.param(
         "\xd7\x90",
-        marks=pytest.mark.skipif(six.PY3, reason="python 3 supports only
bytes")),
+        marks=pytest.mark.skipif(
+            six.PY3,
+            reason="python 3 supports only bytes")),
     # Python 2 also supports unicode with ascii content.
     pytest.param(
         u"ascii",
-        marks=pytest.mark.skipif(six.PY3, reason="python 3 supports only
bytes")),
+        marks=pytest.mark.skipif(
+            six.PY3,
+            reason="python 3 supports only bytes")),
 ]
 
-(a)pytest.mark.parametrize(&quot;filename, encoding" , FILE_NAMES)
-(a)pytest.mark.parametrize(&quot;size,offset&quot;, [
+
+(a)pytest.mark.parametrize(&quot;filename, encoding", FILE_NAMES)
+(a)pytest.mark.parametrize(&quot;size, offset", [
     # Smallest offset.
     (LOCKSPACE_SIZE, 0),
     # Large offset.
     (LARGE_FILE_SIZE, LARGE_FILE_SIZE - LOCKSPACE_SIZE),
 ])
-def test_write_lockspace(tmpdir, sanlock_daemon, filename, encoding, size, offset):
+def test_write_lockspace(
+        tmpdir, sanlock_daemon, filename, encoding, size, offset):
     path = util.generate_path(tmpdir, filename, encoding)
     util.create_file(path, size)
 
     # Test read and write with default alignment and sector size values.
     sanlock.write_lockspace(b"ls_name", path, offset=offset, iotimeout=1)
@@ -104,11 +110,15 @@ def test_write_lockspace_4k(user_4k_path, sanlock_daemon, align):
     with io.open(user_4k_path, "rb+") as f:
         f.write(align * b"x")
     util.write_guard(user_4k_path, align)
 
     sanlock.write_lockspace(
-        b"ls_name", user_4k_path, iotimeout=1, align=align,
sector=SECTOR_SIZE_4K)
+        b"ls_name",
+        user_4k_path,
+        iotimeout=1,
+        align=align,
+        sector=SECTOR_SIZE_4K)
 
     ls = sanlock.read_lockspace(
         user_4k_path, align=align, sector=SECTOR_SIZE_4K)
 
     assert ls == {"iotimeout": 1, "lockspace": b"ls_name"}
@@ -146,11 +156,12 @@ def test_read_lockspace_4k_invalid_sector_size(sanlock_daemon,
user_4k_path):
     # Smallest offset.
     (MIN_RES_SIZE, 0),
     # Large offset.
     (LARGE_FILE_SIZE, LARGE_FILE_SIZE - MIN_RES_SIZE),
 ])
-def test_write_resource(tmpdir, sanlock_daemon, filename, encoding, size, offset):
+def test_write_resource(
+        tmpdir, sanlock_daemon, filename, encoding, size, offset):
     path = util.generate_path(tmpdir, filename, encoding)
     util.create_file(path, size)
     disks = [(path, offset)]
 
     # Test read and write with default alignment and sector size values.
@@ -525,19 +536,21 @@ def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename,
encoding):
         sanlock.add_lockspace(name, 1, path, 0, wait=False)
 
 
 @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
-def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
+def test_write_lockspace_parse_args(
+        no_sanlock_daemon, name, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     with raises_sanlock_errno():
         sanlock.write_lockspace(name, path)
 
 
 @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
-def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding):
+def test_write_resource_parse_args(
+        no_sanlock_daemon, name, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     disks = [(path, 0)]
     with raises_sanlock_errno():
         sanlock.write_resource(name, b"res_name", disks)
 
@@ -545,11 +558,12 @@ def test_write_resource_parse_args(no_sanlock_daemon, name,
filename, encoding):
         sanlock.write_resource(b"ls_name", name, disks)
 
 
 @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
-def test_release_resource_parse_args(no_sanlock_daemon, name, filename, encoding):
+def test_release_resource_parse_args(
+        no_sanlock_daemon, name, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     disks = [(path, 0)]
     with raises_sanlock_errno():
         sanlock.release(name, b"res_name", disks)
 
@@ -557,11 +571,12 @@ def test_release_resource_parse_args(no_sanlock_daemon, name,
filename, encoding
         sanlock.release(b"ls_name", name, disks)
 
 
 @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
-def test_read_resource_owners_parse_args(no_sanlock_daemon, name, filename, encoding):
+def test_read_resource_owners_parse_args(
+        no_sanlock_daemon, name, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     disks = [(path, 0)]
     with raises_sanlock_errno():
         sanlock.read_resource_owners(name, b"res_name", disks)
 
@@ -601,11 +616,12 @@ def test_set_event_parse_args(no_sanlock_daemon, name):
         sanlock.set_event(name, 1, 1, 1)
 
 
 @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
-def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
+def test_init_lockspace_parse_args(
+        no_sanlock_daemon, name, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     with raises_sanlock_errno(errno.ENODEV):
         sanlock.init_lockspace(name, path)
 
 
@@ -617,23 +633,25 @@ def test_init_resource_parse_args(no_sanlock_daemon, name, filename,
encoding):
     with raises_sanlock_errno(errno.ENOENT):
         sanlock.init_resource(b"ls_name", name, disks)
     with raises_sanlock_errno(errno.ENOENT):
         sanlock.init_resource(name, b"res_name", disks)
 
+
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
 def test_get_alignment_parse_args(no_sanlock_daemon, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     with raises_sanlock_errno(errno.ENOENT):
         sanlock.get_alignment(path)
 
+
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
 def test_read_lockspace_parse_args(no_sanlock_daemon, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     with raises_sanlock_errno():
         sanlock.read_lockspace(path)
 
+
 @pytest.mark.parametrize("filename,encoding", FILE_NAMES)
 def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding):
     path = util.generate_path("/tmp/", filename, encoding)
     with raises_sanlock_errno():
         sanlock.read_resource(path)
-
-- 
2.17.2

[PATCH v2 4/4] python: Convert example.py to python 3

[Nir Soffer]

Use print function instead of print statement to make the example
compatible with both python 2 and 3. Tested only by flake8, may not
actually work with python 3.

Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 python/example.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/python/example.py b/python/example.py
index 1be7e66..35d39f5 100644
--- a/python/example.py
+++ b/python/example.py
@@ -1,5 +1,7 @@
+from __future__ import print_function
+
 import pwd
 import grp
 import os
 import time
 import signal
@@ -10,73 +12,73 @@ HOST_ID = 1
 LOCKSPACE_NAME = "lockspace1"
 RESOURCE_NAME = "resource1"
 
 
 def sigTermHandler():
-    print "SIGTERM signal received"
+    print("SIGTERM signal received")
 
 
 def main():
     signal.signal(signal.SIGTERM, sigTermHandler)
 
-    print "Creating the sanlock disk"
+    print("Creating the sanlock disk")
     fd, disk = tempfile.mkstemp()
     os.close(fd)
 
     os.chown(
         disk, pwd.getpwnam("sanlock").pw_uid,
grp.getgrnam("sanlock").gr_gid)
     offset = sanlock.get_alignment(disk)
 
     SNLK_DISKS = [(disk, offset)]
 
-    print "Registering to sanlock"
+    print("Registering to sanlock")
     fd = sanlock.register()
 
-    print "Initializing '%s'" % (LOCKSPACE_NAME,)
+    print("Initializing '%s'" % (LOCKSPACE_NAME,))
     sanlock.write_lockspace(LOCKSPACE_NAME, disk, align=1048576, sector=512)
 
-    print "Initializing '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME)
+    print("Initializing '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME))
     sanlock.write_resource(
         LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=1048576, sector=512)
 
-    print "Acquiring the id '%i' on '%s'" % (HOST_ID,
LOCKSPACE_NAME)
+    print("Acquiring the id '%i' on '%s'" % (HOST_ID,
LOCKSPACE_NAME))
     sanlock.add_lockspace(LOCKSPACE_NAME, HOST_ID, disk)
 
     try:
-        print "Acquiring '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME)
+        print("Acquiring '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME))
         sanlock.acquire(
             LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, slkfd=fd, version=0)
 
         while True:
-            print "Trying to get lockspace '%s' hosts" %
LOCKSPACE_NAME
+            print("Trying to get lockspace '%s' hosts" %
LOCKSPACE_NAME)
             try:
                 hosts_list = sanlock.get_hosts(LOCKSPACE_NAME)
             except sanlock.SanlockException as e:
                 if e.errno != os.errno.EAGAIN:
                     raise
             else:
-                print "Lockspace '%s' hosts: " % LOCKSPACE_NAME,
hosts_list
+                print("Lockspace '%s' hosts: " % LOCKSPACE_NAME,
hosts_list)
                 break
             time.sleep(5)
 
         owners = sanlock.read_resource_owners(
             LOCKSPACE_NAME,
             RESOURCE_NAME,
             SNLK_DISKS,
             align=1048576,
             sector=512)
-        print "Resource '%s' owners: %s" % (RESOURCE_NAME, owners)
+        print("Resource '%s' owners: %s" % (RESOURCE_NAME, owners))
 
-        print "Releasing '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME)
+        print("Releasing '%s' on '%s'" % (RESOURCE_NAME,
LOCKSPACE_NAME))
         sanlock.release(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, slkfd=fd)
     except Exception as e:
-        print "Exception: ", e
+        print("Exception: ", e)
     finally:
-        print "Releasing the id '%i' on '%s'" % (HOST_ID,
LOCKSPACE_NAME)
+        print("Releasing the id '%i' on '%s'" % (HOST_ID,
LOCKSPACE_NAME))
         sanlock.rem_lockspace(LOCKSPACE_NAME, HOST_ID, disk)
 
-    print "Removing the sanlock disk"
+    print("Removing the sanlock disk")
     os.remove(disk)
 
 
 if __name__ == '__main__':
     main()
-- 
2.17.2