core/various: python3 compat, prepare for python2 -> python3

see https://review.gluster.org/#/c/19788/,
    https://review.gluster.org/#/c/19871/,
    https://review.gluster.org/#/c/19952/,
    https://review.gluster.org/#/c/20104/,
    https://review.gluster.org/#/c/20162/,
    https://review.gluster.org/#/c/20185/,
    https://review.gluster.org/#/c/20207/,
    https://review.gluster.org/#/c/20227/,
    https://review.gluster.org/#/c/20307/,
    https://review.gluster.org/#/c/20320/,
    https://review.gluster.org/#/c/20332/, and
    https://review.gluster.org/#/c/20364/

Fixes glupy.py python2isms, iteritems -> items, and some overlooked 
print() in georep/peer_mountbroker.in

Note: Fedora packaging guidelines and SUSE rpmlint require explicit
shebangs; popular practices like #!/usr/bin/env python and #!/usr/bin/python
are not allowed; they must be #!/usr/bin/python2 or #!/usr/bin/python3

Note: Selected small fixes from 2to3 utility. Specifically apply,
basestring, funcattrs, has_key, idioms, map, numliterals, raise,
set_literal, types, urllib, and zip have already been applied. Also
version agnostic imports for urllib, cpickle, socketserver, _thread,
queue, etc., suggested by Aravinda in https://review.gluster.org/#/c/19767/1

Note: these 2to3 fixes report no changes are necessary: asserts, buffer,
exec, execfile, exitfunc, filter, getcwdu, imports2, input, intern,
itertools, metaclass, methodattrs, ne, next, nonzero, operator, paren,
raw_input, reduce, reload, renames, repr, standarderror, sys_exc, throw,
tuple_params, xreadlines.

Change-Id: Idda031c1ec975417c79323aea33e7b694e752b2a
updates: #411
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

1 files changed, 42 insertions, 12 deletions

diff --git a/xlators/features/glupy/src/glupy.c b/xlators/features/glupy/src/glupy.c
index 46d1af5533a..bacccfef686 100644
--- a/xlators/features/glupy/src/glupy.c
+++ b/xlators/features/glupy/src/glupy.c
@@ -2317,6 +2317,41 @@ mem_acct_init (xlator_t *this)
         return ret;
 }
 
+static void
+py_error_log(const char *name, PyObject *pystr)
+{
+#if PY_MAJOR_VERSION > 2
+        char            scr[256];
+        if (PyUnicode_Check(pystr)) {
+                PyObject *tmp =
+                        PyUnicode_AsEncodedString(pystr, "UTF-8", "strict");
+                if (tmp != NULL) {
+                        strncpy(scr, PyBytes_AS_STRING(pystr), sizeof(scr));
+                        Py_DECREF(tmp);
+                } else {
+                        strncpy(scr, "string encoding error", sizeof(scr));
+                }
+        } else if (PyBytes_Check(pystr)) {
+                strncpy(scr, PyBytes_AS_STRING(pystr), sizeof(scr));
+        } else {
+                strncpy(scr, "string encoding error", sizeof(scr));
+        }
+        gf_log (name, GF_LOG_ERROR, "Python error: %s", scr);
+#else
+        gf_log (name, GF_LOG_ERROR, "Python error: %s", PyString_AsString(pystr));
+#endif
+}
+
+static PyObject *
+encode (const char *str)
+{
+#if PY_MAJOR_VERSION > 2
+        return PyUnicode_FromString(str);
+#else
+        return PyString_FromString(str);
+#endif
+}
+
 int32_t
 init (xlator_t *this)
 {
@@ -2385,17 +2420,16 @@ init (xlator_t *this)
 
 	/* Adjust python's path */
 	syspath = PySys_GetObject("path");
-	path = PyString_FromString(GLUSTER_PYTHON_PATH);
+	path = encode(GLUSTER_PYTHON_PATH);
 	PyList_Append(syspath, path);
 	Py_DECREF(path);
 
-	py_mod_name = PyString_FromString(module_name);
+	py_mod_name = encode(module_name);
         if (!py_mod_name) {
                 gf_log (this->name, GF_LOG_ERROR, "could not create name");
                 if (PyErr_Occurred()) {
                         PyErr_Fetch (&error_type, &error_msg, &error_bt);
-                        gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
-                                PyString_AsString(error_msg));
+                        py_error_log(this->name, error_msg);
                 }
                 goto *err_cleanup;
         }
@@ -2408,8 +2442,7 @@ init (xlator_t *this)
                         module_name);
                 if (PyErr_Occurred()) {
                         PyErr_Fetch (&error_type, &error_msg, &error_bt);
-                        gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
-                                PyString_AsString(error_msg));
+                        py_error_log (this->name, error_msg);
                 }
                 goto *err_cleanup;
         }
@@ -2421,8 +2454,7 @@ init (xlator_t *this)
                 gf_log (this->name, GF_LOG_ERROR, "missing init func");
                 if (PyErr_Occurred()) {
                         PyErr_Fetch (&error_type, &error_msg, &error_bt);
-                        gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
-                                PyString_AsString(error_msg));
+                        py_error_log (this->name, error_msg);
                 }
                 goto *err_cleanup;
         }
@@ -2433,8 +2465,7 @@ init (xlator_t *this)
                 gf_log (this->name, GF_LOG_ERROR, "could not create args");
                 if (PyErr_Occurred()) {
                         PyErr_Fetch (&error_type, &error_msg, &error_bt);
-                        gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
-                                PyString_AsString(error_msg));
+                        py_error_log (this->name, error_msg);
                 }
                 goto *err_cleanup;
         }
@@ -2447,8 +2478,7 @@ init (xlator_t *this)
                 gf_log (this->name, GF_LOG_ERROR, "Python init failed");
                 if (PyErr_Occurred()) {
                         PyErr_Fetch (&error_type, &error_msg, &error_bt);
-                        gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
-                                PyString_AsString(error_msg));
+                        py_error_log (this->name, error_msg);
                 }
                 goto *err_cleanup;
         }