From 53f74f54209120060cd020d65646b3a471d90988 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Sep 13 2017 07:33:30 +0000
Subject: Revert "PYTHON: Define constants as bytes instead of strings"


This reverts commit 9375eae59550437c85ada9212be430a4242b25a4.

Patch introduced difference between python2 and python3.
constant should be strings in both versions.

sh$ python2
Python 2.7.13 (default, Aug 16 2017, 12:56:26)
[GCC 7.1.1 20170802 (Red Hat 7.1.1-7)] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import pysss_nss_idmap
>>> type(pysss_nss_idmap.SID_KEY)
<type 'str'>

sh$ python3
Python 3.6.2 (default, Sep  1 2017, 12:03:48)
[GCC 7.1.1 20170802 (Red Hat 7.1.1-7)] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import pysss_nss_idmap
>>> type(pysss_nss_idmap.SID_KEY)
<class 'bytes'>

Reviewed-by: Sumit Bose <sbose@redhat.com>

---

diff --git a/src/python/pysss_nss_idmap.c b/src/python/pysss_nss_idmap.c
index be7fa29..2e5851c 100644
--- a/src/python/pysss_nss_idmap.c
+++ b/src/python/pysss_nss_idmap.c
@@ -533,17 +533,10 @@ initpysss_nss_idmap(void)
     PyModule_AddIntConstant(module, "ID_GROUP", SSS_ID_TYPE_GID);
     PyModule_AddIntConstant(module, "ID_BOTH", SSS_ID_TYPE_BOTH);
 
-#ifdef IS_PY3K
-    PyModule_AddObject(module, "SID_KEY", PyBytes_FromString(SSS_SID_KEY));
-    PyModule_AddObject(module, "NAME_KEY", PyBytes_FromString(SSS_NAME_KEY));
-    PyModule_AddObject(module, "ID_KEY", PyBytes_FromString(SSS_ID_KEY));
-    PyModule_AddObject(module, "TYPE_KEY", PyBytes_FromString(SSS_TYPE_KEY));
-#else
     PyModule_AddStringConstant(module, "SID_KEY", SSS_SID_KEY);
     PyModule_AddStringConstant(module, "NAME_KEY", SSS_NAME_KEY);
     PyModule_AddStringConstant(module, "ID_KEY", SSS_ID_KEY);
     PyModule_AddStringConstant(module, "TYPE_KEY", SSS_TYPE_KEY);
-#endif
 
 #ifdef IS_PY3K
     return module;