Attachment 938094 Details for Bug 1115489 – use Python 2.x/3.x C API correctly

use Python 2.x/3.x C API correctly

0002-use-Python-3.x-API-correctly.patch (text/plain), 2.69 KB, created by Pavel Šimerda (pavlix) on 2014-09-16 15:38:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Šimerda (pavlix)

Created: 2014-09-16 15:38:30 UTC

Size: 2.69 KB

patch

obsolete

>From 3db0c2b767edb745eea6466cca29b00906ccdadb Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
>Date: Mon, 15 Sep 2014 18:40:50 +0200
>Subject: [PATCH 2/2] use Python 3.x API correctly
>
>---
> libunbound/python/libunbound.i | 4 ++--
> pythonmod/interface.i          | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/libunbound/python/libunbound.i b/libunbound/python/libunbound.i
>index 4f92799..78a0ed6 100644
>--- a/libunbound/python/libunbound.i
>+++ b/libunbound/python/libunbound.i
>@@ -764,13 +764,13 @@ Result: ['74.125.43.147', '74.125.43.99', '74.125.43.103', '74.125.43.104']
>      
>      list = PyList_New(cnt);
>      for (i=0;i<cnt;i++) 
>-         PyList_SetItem(list, i, PyString_FromStringAndSize(result->data[i],result->len[i]));
>+         PyList_SetItem(list, i, PyBytes_FromStringAndSize(result->data[i],result->len[i]));
>      
>      return list;
>   }
> 
>   PyObject* _packet() {
>-      return PyString_FromStringAndSize($self->answer_packet, $self->answer_len);
>+      return PyBytes_FromStringAndSize($self->answer_packet, $self->answer_len);
>   }
>   
>  %pythoncode %{
>diff --git a/pythonmod/interface.i b/pythonmod/interface.i
>index 606d85f..4f1a25f 100644
>--- a/pythonmod/interface.i
>+++ b/pythonmod/interface.i
>@@ -48,7 +48,7 @@
>      list = PyList_New(cnt);
>      i = 0; cnt = 0;
>      while (i < len) {
>-        PyList_SetItem(list, cnt, PyString_FromStringAndSize(name + i + 1, name[i]));
>+        PyList_SetItem(list, cnt, PyBytes_FromStringAndSize(name + i + 1, name[i]));
>         i += name[i] + 1;
>         cnt++;
>      }
>@@ -148,7 +148,7 @@ struct query_info {
>    };
> 
>    PyObject* _get_qname(struct query_info* q) {
>-      return PyString_FromStringAndSize((char*)q->qname, q->qname_len);
>+      return PyBytes_FromStringAndSize((char*)q->qname, q->qname_len);
>    } 
> 
>    PyObject* _get_qname_components(struct query_info* q) {
>@@ -210,7 +210,7 @@ uint16_t ntohs(uint16_t netshort);
> 
> %inline %{
>    PyObject* _get_dname(struct packed_rrset_key* k) {
>-      return PyString_FromStringAndSize((char*)k->dname, k->dname_len);
>+      return PyBytes_FromStringAndSize((char*)k->dname, k->dname_len);
>    } 
>    PyObject* _get_dname_components(struct packed_rrset_key* k) {
>       return GetNameAsLabelList((char*)k->dname, k->dname_len);
>@@ -317,7 +317,7 @@ struct packed_rrset_data {
>    PyObject* _get_data_rr_data(struct packed_rrset_data* d, int idx) {
>      if ((d != NULL) && (idx >= 0) && 
>              ((size_t)idx < (d->count+d->rrsig_count))) 
>-        return PyString_FromStringAndSize((char*)d->rr_data[idx],
>+        return PyBytes_FromStringAndSize((char*)d->rr_data[idx],
>                 d->rr_len[idx]);
>      return Py_None;
>    }
>-- 
>1.8.5.5
>

Actions: View

Attachments on bug 1115489: 938042 | 938094 | 938995 | 939159