Commits

Ronald Oussoren committed b06f45d Merge

merge 2.5.x branch

Comments (0)

Files changed (3)

 f400e4dd57982967ae35f934b7d4bbfe6b85d387 pyobjc-1.3b1
 09e47efb822e058a067a6e4db467b76a8f8a5cd5 pyobjc-2.4
 f469eb255847212a5fb177cd1f25b3acc46a271d pyobjc-2.5
+f029a7682d34ada87012f6f478ac72c964197834 PyDE
+0000000000000000000000000000000000000000 PyDE
+2a7140c7e44f5c3f4a8441496f39ccf8cb6ff447 import-pyobjc-in-macosx-10.5
+2a7140c7e44f5c3f4a8441496f39ccf8cb6ff447 r200-leopard
+0000000000000000000000000000000000000000 r200-leopard
+9c34344aab4693bafb5ed3fe5b06036142a8400c pyobjc-0.8
+c3dd78401dd86e898b72f219701085759464b515 pyobjc-0.9
+9c34344aab4693bafb5ed3fe5b06036142a8400c REL_20021219_0pt8
+0000000000000000000000000000000000000000 REL_20021219_0pt8
+28520fd433a74bbf226b768510f4a3a8d4f76bb4 REL_20030703_1pt0b1
+0000000000000000000000000000000000000000 REL_20030703_1pt0b1
+8e2d80c58da221d031e1c442fc206bb51fbbb2e6 pyobjc-1.0
+cc8fac9002d2a4bebe94fef78695a985309de067 pyobjc-1.1b1
+58ba1f0bdb9e01198e6d22d8c2d7db01dd82b7a6 pyobjc-1.2
+c3dd78401dd86e898b72f219701085759464b515 REL_20030502_0pt9
+0000000000000000000000000000000000000000 REL_20030502_0pt9
+cc8fac9002d2a4bebe94fef78695a985309de067 release_1_1b1
+0000000000000000000000000000000000000000 release_1_1b1
+58ba1f0bdb9e01198e6d22d8c2d7db01dd82b7a6 release_1_2
+0000000000000000000000000000000000000000 release_1_2
+8e2d80c58da221d031e1c442fc206bb51fbbb2e6 release_1_0
+0000000000000000000000000000000000000000 release_1_0
+409a8611db37b84407e4e822abd25dc9ef2a3b03 pyobc-1.1
+409a8611db37b84407e4e822abd25dc9ef2a3b03 pyobjc
+0000000000000000000000000000000000000000 pyobjc

pyobjc-core/Lib/objc/_pycoder.py

 
     if slotstate:
         for k, v in slotstate.items():
+            if isinstance(k, objc.pyobjc_unicode):
+                k = unicode(k)
             setattr(value, intern(k), v)
 
     return value
 
     if slotstate:
         for k, v in slotstate.items():
+            if isinstance(k, objc.pyobjc_unicode):
+                k = unicode(k)
             setattr(value, intern(k), v)
 
     if listitems:

pyobjc-core/Modules/objc/unicode-object.m

 			ascii->length = length - nr_surrogates;
 			*ucs2_cur = 0;
 		}
+#if SIZEOF_WCHAR_T == 2
+		ascii->wstr = (wchar_t*)(result->base.data.ucs4);
+		compact->wstr_length = ascii->length;
+#endif
 
 	} else { /* 4BYTE_KIND */
 		result->base.data.ucs4 = PyObject_MALLOC(sizeof(Py_UCS4) * (length + 1 - nr_surrogates));
 		}
 		*ucs4_cur = 0;
 		ascii->length = length - nr_surrogates;
+#if SIZEOF_WCHAR_T == 4
+		ascii->wstr = (wchar_t*)(result->base.data.ucs4);
+		compact->wstr_length = ascii->length;
+#endif
 	}