rpms/coccinelle/devel coccinelle-0.2.3rc6-python-2.7.patch,1.1,1.2

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/coccinelle/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13942

Modified Files:
	coccinelle-0.2.3rc6-python-2.7.patch 
Log Message:
Latest Python 2.7 fixes patch from upstream.


coccinelle-0.2.3rc6-python-2.7.patch:
 b/pycaml/pycaml_ml.c    |    6 ++++++
 b/python/yes_pycocci.ml |    3 ++-
 pycaml/pycaml.ml        |    3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

Index: coccinelle-0.2.3rc6-python-2.7.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coccinelle/devel/coccinelle-0.2.3rc6-python-2.7.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coccinelle-0.2.3rc6-python-2.7.patch	24 Jul 2010 09:15:41 -0000	1.1
+++ coccinelle-0.2.3rc6-python-2.7.patch	24 Jul 2010 14:25:01 -0000	1.2
@@ -1,39 +1,51 @@
-diff -u -p a/pycaml/pycaml_ml.c b/pycaml/pycaml_ml.c
---- a/pycaml/pycaml_ml.c
-+++ b/pycaml/pycaml_ml.c
-@@ -554,7 +554,7 @@ extern DL_IMPORT(PyObject *) PyObject_Ri
- extern DL_IMPORT(PyObject *) PyObject_GetAttrString(PyObject *, char *);
- /* 17 */
- extern DL_IMPORT(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
--extern DL_IMPORT(PyObject *) PyObject_CallObject(PyObject *, PyObject *);
-+//extern DL_IMPORT(PyObject *) PyObject_CallObject(PyObject *, PyObject *);
- /* 18 */
- extern DL_IMPORT(int) PyObject_IsTrue(PyObject *);
- extern DL_IMPORT(int) PyObject_Not(PyObject *);
-@@ -744,7 +744,7 @@ DL_IMPORT(int) PyImport_ImportFrozenModu
+diff -u -p a/pycaml/pycaml_ml.c  b/pycaml/pycaml_ml.c
+--- a/pycaml/pycaml_ml.c	2009-03-18 08:26:35.000000000 +0100
++++ b/pycaml/pycaml_ml.c	2010-07-24 13:18:06.000000000 +0200
+@@ -744,7 +744,10 @@ DL_IMPORT(int) PyImport_ImportFrozenModu
  /* 42 */
  DL_IMPORT(PyObject *) PyEval_CallObjectWithKeywords(PyObject *, PyObject *, PyObject *);
  /* 17 */
--DL_IMPORT(PyObject *) PyEval_CallObject(PyObject *, PyObject *);
-+//DL_IMPORT(PyObject *) PyEval_CallObject(PyObject *, PyObject *);
++#if 0
++// dropped in Python 2.7
+ DL_IMPORT(PyObject *) PyEval_CallObject(PyObject *, PyObject *);
++#endif
  
  /* 29 */
  DL_IMPORT(PyObject *) PyEval_GetBuiltins(void);
-@@ -1020,7 +1020,7 @@ python_func_table the_python_func_table[
-     { (void *)PyObject_GetAttrString, 16, "PyObject_GetAttrString" },
- /* 17 */
-     { (void *)PyObject_GetAttr, 17, "PyObject_GetAttr" },
--    { (void *)PyObject_CallObject, 17, "PyObject_CallObject" },
-+//    { (void *)PyObject_CallObject, 17, "PyObject_CallObject" },
- /* 18 */
-     { (void *)PyObject_IsTrue, 18, "PyObject_IsTrue" },
-     { (void *)PyObject_Not, 18, "PyObject_Not" },
-@@ -1203,7 +1203,7 @@ python_func_table the_python_func_table[
+@@ -1203,7 +1206,10 @@ python_func_table the_python_func_table[
  /* 42 */
  { (void *)PyEval_CallObjectWithKeywords, 42, "PyEval_CallObjectWithKeywords" },
  /* 17 */
--{ (void *)PyEval_CallObject, 17, "PyEval_CallObject" },
-+//{ (void *)PyEval_CallObject, 17, "PyEval_CallObject" },
++#if 0
++// dropped in Python 2.7
+ { (void *)PyEval_CallObject, 17, "PyEval_CallObject" },
++#endif
  
  /* 29 */
  { (void *)PyEval_GetBuiltins, 29, "PyEval_GetBuiltins" },
+diff -u -p a/pycocci/yes_pycocci.ml b/pycocci/yes_pycocci.ml
+--- a/pycaml/pycaml.ml	2010-01-28 15:25:07.000000000 +0100
++++ b/pycaml/pycaml.ml	2010-07-24 13:18:36.000000000 +0200
+@@ -398,7 +398,8 @@ let pyimport_importfrozenmodule = fmt5ca
+ (* 42 *)
+ let pyeval_callobjectwithkeywords = fmt42call (pnf ())
+ (* 17 *)
+-let pyeval_callobject = fmt17call (pnf ())
++(* dropped in Python 2.7
++let pyeval_callobject = fmt17call (pnf ()) *)
+ 
+ (* 29 *)
+ let pyeval_getbuiltins = fmt29call (pnf ())
+diff -u -p a/pycocci/yes_pycocci.ml b/pycocci/yes_pycocci.ml
+--- a/python/yes_pycocci.ml	2010-07-20 15:41:59.000000000 +0200
++++ b/python/yes_pycocci.ml	2010-07-24 13:16:12.000000000 +0200
+@@ -107,7 +107,8 @@ let pycocci_get_class_type fqn =
+ 
+ let pycocci_instantiate_class fqn args =
+   let class_type = pycocci_get_class_type fqn in
+-  let obj = pyeval_callobject(class_type, args) in
++  let obj =
++    pyeval_callobjectwithkeywords(class_type, args, pynull()) in
+   check_return_value obj;
+   obj
+