From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 28 Oct 2021 15:41:58 +0000 (+0800)
Subject: mgr: do not handle Python2
X-Git-Tag: v17.1.0~503^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d15a3ce1801a83092eb14a628c606659d59611ec;p=ceph.git

mgr: do not handle Python2

this change should have been a part of
48c4bc445fcacd7980e84b4f135a3115b88b05f1

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---

diff --git a/src/mgr/BaseMgrModule.cc b/src/mgr/BaseMgrModule.cc
index 6386265fc7e9..2d851d46b2ac 100644
--- a/src/mgr/BaseMgrModule.cc
+++ b/src/mgr/BaseMgrModule.cc
@@ -1263,11 +1263,7 @@ ceph_add_mds_perf_query(BaseMgrModule *self, PyObject *args)
           }
           limit->order_by = it->second;
         } else if (limit_param_name == NAME_LIMIT_MAX_COUNT) {
-#if PY_MAJOR_VERSION <= 2
-          if (!PyInt_Check(limit_param_val) && !PyLong_Check(limit_param_val)) {
-#else
           if (!PyLong_Check(limit_param_val)) {
-#endif
             derr << __func__ << " " << limit_param_name << " not an int"
                  << dendl;
             Py_RETURN_NONE;