From: Anirudha Bose <ani07nov@gmail.com>
Date: Sat, 20 Aug 2016 17:00:12 +0000 (+0530)
Subject: qa/workunits: Python 3 compat fixes for fs/misc/direct_io.py
X-Git-Tag: v11.0.1~182^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=922c977c8b410e683c9cfcee8b69558e84370dc7;p=ceph.git

qa/workunits: Python 3 compat fixes for fs/misc/direct_io.py

Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
---

diff --git a/qa/workunits/fs/misc/direct_io.py b/qa/workunits/fs/misc/direct_io.py
index 48be584ef71..b5c422654e2 100755
--- a/qa/workunits/fs/misc/direct_io.py
+++ b/qa/workunits/fs/misc/direct_io.py
@@ -1,9 +1,10 @@
 #!/usr/bin/python
 
-import os
+import json
 import mmap
+import os
 import subprocess
-import json
+
 
 def get_data_pool():
     cmd = ['ceph', 'fs', 'ls', '--format=json-pretty']
@@ -11,19 +12,20 @@ def get_data_pool():
     out = proc.communicate()[0]
     return json.loads(out)[0]['data_pools'][0]
 
+
 def main():
-    fd = os.open("testfile", os.O_RDWR | os.O_CREAT | os.O_TRUNC | os.O_DIRECT, 0644)
+    fd = os.open("testfile", os.O_RDWR | os.O_CREAT | os.O_TRUNC | os.O_DIRECT, 0o644)
 
     ino = os.fstat(fd).st_ino
     obj_name = "{ino:x}.00000000".format(ino=ino)
     pool_name = get_data_pool()
 
-    buf = mmap.mmap(-1, 1);
-    buf.write('1');
-    os.write(fd, buf);
+    buf = mmap.mmap(-1, 1)
+    buf.write('1')
+    os.write(fd, buf)
 
     proc = subprocess.Popen(['rados', '-p', pool_name, 'get', obj_name, 'tmpfile'])
-    proc.wait();
+    proc.wait()
 
     with open('tmpfile', 'r') as tmpf:
         out = tmpf.read()
@@ -34,14 +36,15 @@ def main():
         tmpf.write('2')
 
     proc = subprocess.Popen(['rados', '-p', pool_name, 'put', obj_name, 'tmpfile'])
-    proc.wait();
+    proc.wait()
 
     os.lseek(fd, 0, os.SEEK_SET)
-    out = os.read(fd, 1);
+    out = os.read(fd, 1)
     if out != '2':
         raise RuntimeError("data were not directly read from object store")
 
-    os.close(fd);
-    print 'ok'
+    os.close(fd)
+    print('ok')
+
 
 main()