diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2017-09-06 10:16:17 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-09-13 09:33:30 +0200 |
| commit | 53f74f54209120060cd020d65646b3a471d90988 (patch) | |
| tree | 690dd462f33460d9f5388e69d094c00b9370c6b4 /src/python | |
| parent | 51c4da6e4941dfc5fca40bffa2248b9a77f139b2 (diff) | |
| download | sssd-53f74f54209120060cd020d65646b3a471d90988.tar.gz sssd-53f74f54209120060cd020d65646b3a471d90988.tar.xz sssd-53f74f54209120060cd020d65646b3a471d90988.zip | |
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>
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/pysss_nss_idmap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/python/pysss_nss_idmap.c b/src/python/pysss_nss_idmap.c index be7fa297e..2e5851c7a 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; |