[PyObjC-svn] r2581 - in branches/pyobjc-2.3.x: . pyobjc-core pyobjc-core/Modules/objc

Author: ronaldoussoren
Date: Sun Aug 15 06:00:24 2010
New Revision: 2581

Log:
Merged revisions 2580 via svnmerge from 
https://svn.red-bean.com/pyobjc/trunk/pyobjc

........
  r2580 | ronaldoussoren | 2010-08-15 12:59:08 +0200 (Sun, 15 Aug 2010) | 2 lines
  
  Some small tweaks that improve internal consistency.
........


Modified:
   branches/pyobjc-2.3.x/   (props changed)
   branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/module.m
   branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/pyobjc-compat.h
   branches/pyobjc-2.3.x/pyobjc-core/NEWS.txt

Modified: branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/module.m
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/module.m	(original)
+++ branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/module.m	Sun Aug 15 06:00:24 2010
@@ -556,7 +556,7 @@
 		return NULL;
 	}
 
-#if PY_MAJOR_VERSION == 2
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 6
 	return PyBuffer_New(length);
 #else
 	return PyByteArray_FromStringAndSize(NULL, length);

Modified: branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/pyobjc-compat.h
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/pyobjc-compat.h	(original)
+++ branches/pyobjc-2.3.x/pyobjc-core/Modules/objc/pyobjc-compat.h	Sun Aug 15 06:00:24 2010
@@ -111,7 +111,7 @@
 #if PY_MAJOR_VERSION == 2
 
 #ifndef Py_ARG_BYTES
-#define Py_ARG_BYTES "s"
+#define Py_ARG_BYTES "z"
 #endif
 
 #else

Modified: branches/pyobjc-2.3.x/pyobjc-core/NEWS.txt
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-core/NEWS.txt	(original)
+++ branches/pyobjc-2.3.x/pyobjc-core/NEWS.txt	Sun Aug 15 06:00:24 2010
@@ -4,6 +4,12 @@
 
 An overview of the relevant changes in new, and older, releases.
 
+Version 2.4
+-----------
+
+- ``objc.allocateBuffer`` now returns a bytearray on python >= 2.6,
+  it used to return a buffer object in Python 2.
+
 Version 2.3
 -----------
 

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev