pybind: use sys.version_info for checking py3

it's simpler and more consistent with other part of ceph.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx
index b7b406cd95e32e2c82db3faaf52828785bc3c8c4..746b9e8da5733b12037c5b59c88417a7cd1e4cf6 100644 (file)
--- a/src/pybind/cephfs/cephfs.pyx
+++ b/src/pybind/cephfs/cephfs.pyx
@@ -16,9 +16,7 @@ import os
 import sys
 
 # Are we running Python 2.x
-_python2 = sys.hexversion < 0x03000000
-
-if _python2:
+if sys.version_info[0] < 3:
     str_type = basestring
 else:
     str_type = str

diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
index 586dc7458d2db3e8b58d8a6bf864a1b37f7a6269..47d362e972ac91ad20f0e7d7451d76c08f37eb89 100644 (file)
--- a/src/pybind/rados/rados.pyx
+++ b/src/pybind/rados/rados.pyx
@@ -28,9 +28,7 @@ from functools import partial, wraps
 from itertools import chain
 
 # Are we running Python 2.x
-_python2 = sys.hexversion < 0x03000000
-
-if _python2:
+if sys.version_info[0] < 3:
     str_type = basestring
 else:
     str_type = str

diff --git a/src/test/pybind/test_rados.py b/src/test/pybind/test_rados.py
index 50b09053cdd006f041f33d562d5327846de5c889..a4e1efd852ee2652e042481b77f6f6b57e1ba0bf 100644 (file)
--- a/src/test/pybind/test_rados.py
+++ b/src/test/pybind/test_rados.py
@@ -11,7 +11,7 @@ import errno
 import sys
 
 # Are we running Python 2.x
-_python2 = sys.hexversion < 0x03000000
+_python2 = sys.version_info[0] < 3
 
 def test_rados_init_error():
     assert_raises(Error, Rados, conffile='', rados_id='admin',