View | Details | Raw Unified | Return to bug 233778
Collapse All | Expand All

(-)b/net/py-xmlrpc/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	xmlrpc
4
PORTNAME=	xmlrpc
5
PORTVERSION=	0.8.8.3
5
PORTVERSION=	0.8.8.3
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	net python
7
CATEGORIES=	net python
8
MASTER_SITES=	SF/py-${PORTNAME}/source/py-${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/py-${PORTNAME}/source/py-${PORTNAME}-${PORTVERSION}
9
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
(-)b/net/py-xmlrpc/files/patch-exceptions (+31 lines)
Added Link Here
1
--- src/rpcBase64.c.orig	2015-09-18 10:30:11.000000000 +0300
2
+++ src/rpcBase64.c	2015-09-18 10:30:55.000000000 +0300
3
@@ -32,8 +32,6 @@
4
 static	PyObject	*binascii_a2b_base64(PyObject *self, PyObject *args);
5
 
6
 
7
-static PyObject *Error;
8
-
9
 static char table_a2b_base64[] = {
10
 	-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
11
 	-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
12
@@ -100,7 +98,7 @@
13
 	}
14
 	/* Check that no bits are left */
15
 	if ( leftbits ) {
16
-		PyErr_SetString(Error, "Incorrect padding");
17
+		PyErr_SetString(PyExc_SyntaxError, "Incorrect padding");
18
 		Py_DECREF(rv);
19
 		return NULL;
20
 	}
21
--- src/xmlrpc.c.orig	2015-09-18 10:30:11.000000000 +0300
22
+++ src/xmlrpc.c	2015-09-18 10:30:55.000000000 +0300
23
@@ -50,7 +50,7 @@
24
 	rpcClientType.ob_type = &PyType_Type;
25
 	rpcServerType.ob_type = &PyType_Type;
26
 	rpcSourceType.ob_type = &PyType_Type;
27
-	rpcError = PyString_FromString("xmlrpc.error");
28
+	rpcError = PyErr_NewException("xmlrpc.error", NULL, NULL);
29
 	if (rpcError == NULL) {
30
 		fprintf(rpcLogger, "rpcError is NULL in xmlrpcInit\n");
31
 		exit(1);

Return to bug 233778