[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17672] branches/blender2.5/blender/source /blender/python/intern: * make sure there are no redefinitions (I' m using py2.5 and ie PyUnicode_Check define exists

[Nathan Letwory]

Revision: 17672
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17672
Author:   jesterking
Date:     2008-12-01 23:20:18 +0100 (Mon, 01 Dec 2008)

Log Message:
-----------
* make sure there are no redefinitions (I'm using py2.5 and ie PyUnicode_Check define exists

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
    branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2008-12-01 21:30:44 UTC (rev 17671)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2008-12-01 22:20:18 UTC (rev 17672)
@@ -27,13 +27,24 @@
  * no utility functions please
  */
 
+#ifndef BPY_COMPAT_H__
+#define BPY_COMPAT_H__
+
 /* if you are NOT using python 3.0 - define these */
 #if PY_VERSION_HEX < 0x03000000
 #define _PyUnicode_AsString PyString_AsString
+
+#ifndef PyUnicode_Check
 #define PyUnicode_Check PyString_Check
+#endif
+
 #define PyLong_FromSize_t PyInt_FromLong
 #define PyLong_AsSsize_t PyInt_AsLong
+
+#ifndef PyLong_Check
 #define PyLong_Check PyInt_Check
+#endif
+
 #define PyUnicode_FromString PyString_FromString
 #define PyUnicode_FromFormat PyString_FromFormat
 
@@ -47,3 +58,5 @@
 #if (PY_VERSION_HEX < 0x02050000)
 #define Py_ssize_t ssize_t
 #endif
+
+#endif /* BPY_COMPAT_H__ */

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c	2008-12-01 21:30:44 UTC (rev 17671)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c	2008-12-01 22:20:18 UTC (rev 17672)
@@ -788,7 +788,7 @@
 {
 	PyObject *ret;
 	if (RNA_property_type(&self->ptr, self->prop) != PROP_COLLECTION) {
-		PyErr_SetString( PyExc_TypeError, "keys() is only valid for collection types" );
+		PyErr_SetString( PyExc_TypeError, "items() is only valid for collection types" );
 		ret = NULL;
 	} else {
 		PyObject *item;