Changeset 76ca5cb

Timestamp:

2013-03-27T20:31:46Z (12 years ago)

Author:

Nick Murdoch <nick@…>

Parents:

1dcfd1f

Message:

bpython.register_protocl() actually takes meaningful args and does something.

Location:

protocols/python

Files:

• examples/sampleplugin.py (modified) (1 diff)
• src/bpython.c (modified) (4 diffs)

protocols/python/examples/sampleplugin.py

@@ -7 +7 @@
 import sys
 import bpython
-print "hello, I'm a test plugin running on Python", sys.version_info
+print ("hello, I'm a test plugin running on Python {}.{}.{}".format(
+    sys.version_info.major, sys.version_info.minor, sys.version_info.micro))
 
-print bpython.Protocol
-print bpython.Protocol()
-print bpython.register_protocol
-
-try:
-    class MyProtocol(bpython.Protocol):
-        pass
-except Exception, e:
-    print "error:", e
+class MyProtocol(bpython.Protocol):
+    pass
 
 myproto = MyProtocol()
-print "myproto: ", myproto
 
-bpython.register_protocol('echo "hello"')
+bpython.register_protocol('myproto', myproto)
+

protocols/python/src/bpython.c

@@ -138 +138 @@
 static PyObject * bpython_register_protocol(PyObject *self, PyObject *args)
 {
-    const char *command;
-    int sts;
-
-    if (!PyArg_ParseTuple(args, "s", &command))
+    PyObject *protocol;
+    char * name;
+    struct prpl * ret;
+
+    if (!PyArg_ParseTuple(args, "sO", &name, &protocol))
         return NULL;
-    sts = system(command);
-    return Py_BuildValue("i", sts);
+    
+    /* Increase the reference count to stop garbage collection */
+    Py_INCREF(protocol);
+
+    ret = g_new0(struct prpl, 1);
+    ret->name = name;
+    ret->data = ret;
+
+    register_protocol(ret);
+
+    Py_RETURN_NONE;
 }
 
@@ -168 +178 @@
 }
 
-
-static void load_pyfile(char * path, PyObject * main_dict) {
-    PyObject * err;
-    struct prpl *ret;
-    ret = g_new0(struct prpl, 1);
-    
-    PyObject * pluginname = PyDict_GetItemString(main_dict, "name");
-    if ((err = PyErr_Occurred()) || !pluginname) {
-        printf("No plugin name\n");
-        PyErr_Print();
-        g_free(ret);
-        return;
-    }
-    PyObject * pluginname_unicode = PyObject_Unicode(pluginname);
-    PyObject * pluginname_encoded = PyUnicode_AsEncodedString(pluginname_unicode, "ascii", "ignore");
-    if ((err = PyErr_Occurred())) {
-        printf("Error encoding plugin name\n");
-        PyErr_Print();
-        g_free(ret);
-        return;
-    }
-    char * pluginname_tmp; /* reference, do not modify */
-    Py_ssize_t length;
-    PyBytes_AsStringAndSize(pluginname_encoded, &pluginname_tmp, &length);
-    if ((err = PyErr_Occurred())) {
-        printf("Bad plugin name\n");
-        PyErr_Print();
-        g_free(ret);
-        return;
-    }
-    ret->name = g_malloc0(length + 1);
-    memmove(ret->name, pluginname_tmp, length);
-
-    Py_DECREF(pluginname_encoded);
-    Py_DECREF(pluginname_unicode);
-
-    register_protocol(ret);
-}
 
 /* Bitlbee plugin functions: */
@@ -239 +211 @@
             if (g_str_has_suffix(path, ".py")) {
                 FILE * pyfile;
-                printf("Loading python file %s\n", path);
+                PyObject * result;
+                printf("Loading python file %s\n", path);
                 pyfile = fopen(path, "r");
                 
@@ -247 +220 @@
 
                 /* Run the python file */
-                PyRun_File(pyfile, path, Py_file_input, main_dict_copy, main_dict_copy);
-
+                result = PyRun_File(pyfile, path, Py_file_input, main_dict_copy, main_dict_copy);
+                if (result == NULL) {
+                    printf("Error loading module %s\n", path);
+                    PyErr_PrintEx(0);
+                }
             }