freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement PyObject_DelItemString(), which was obviously forgotten for

Browse Source 
Python-2.2. This will fix at least the metakit port.

Bump PORTREVISION.

Obtained from:	Python CVS tree
This commit is contained in:
Thomas Gellekum
2002-01-16 12:22:20 +00:00
parent 58c044bdc6
commit 7d4762e8bb
22 changed files with 627 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lang/python27/Makefile
View File

@@ -7,6 +7,7 @@
PORTNAME= python
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/

56
lang/python27/files/patch-PyObject_DelItemString Normal file
View File

@@ -0,0 +1,56 @@
Index: Include/abstract.h
===================================================================
RCS file: /home/python/cvs/python/dist/src/Include/abstract.h,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -r2.42 -r2.43
--- Include/abstract.h 28 Nov 2001 16:20:07 -0000 2.42
+++ Include/abstract.h 5 Jan 2002 10:50:30 -0000 2.43
@@ -445,6 +445,14 @@
statement: o[key]=v.
*/
+ DL_IMPORT(int) PyObject_DelItemString(PyObject *o, char *key);
+
+ /*
+ Remove the mapping for object, key, from the object *o.
+ Returns -1 on failure. This is equivalent to
+ the Python statement: del o[key].
+ */
+
DL_IMPORT(int) PyObject_DelItem(PyObject *o, PyObject *key);
/*
Index: Objects/abstract.c
===================================================================
RCS file: /home/python/cvs/python/dist/src/Objects/abstract.c,v
retrieving revision 2.93
retrieving revision 2.94
diff -u -r2.93 -r2.94
--- Objects/abstract.c 24 Nov 2001 18:24:47 -0000 2.93
+++ Objects/abstract.c 5 Jan 2002 10:50:30 -0000 2.94
@@ -174,6 +174,24 @@
return -1;
}
+int
+PyObject_DelItemString(PyObject *o, char *key)
+{
+ PyObject *okey;
+ int ret;
+
+ if (o == NULL || key == NULL) {
+ null_error();
+ return -1;
+ }
+ okey = PyString_FromString(key);
+ if (okey == NULL)
+ return -1;
+ ret = PyObject_DelItem(o, okey);
+ Py_DECREF(okey);
+ return ret;
+}
+
int PyObject_AsCharBuffer(PyObject *obj,
const char **buffer,
int *buffer_len)