[pypy-commit] pypy py3k: merge default

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r63473:b9501c954681
Date: 2013-04-17 20:33 -0700
http://bitbucket.org/pypy/pypy/changeset/b9501c954681/

Log:	merge default

diff --git a/rpython/rtyper/lltypesystem/rffi.py b/rpython/rtyper/lltypesystem/rffi.py
--- a/rpython/rtyper/lltypesystem/rffi.py
+++ b/rpython/rtyper/lltypesystem/rffi.py
@@ -1059,7 +1059,7 @@
             self.buf = str2charp(value)
         else:
             self.buf = lltype.nullptr(CCHARP.TO)
-    __init__._annenforceargs_ = [None, str]
+    __init__._annenforceargs_ = [None, annmodel.SomeString(can_be_None=True)]
     def __enter__(self):
         return self.buf
     def __exit__(self, *args):
@@ -1073,7 +1073,8 @@
             self.buf = unicode2wcharp(value)
         else:
             self.buf = lltype.nullptr(CWCHARP.TO)
-    __init__._annenforceargs_ = [None, unicode]
+    __init__._annenforceargs_ = [None,
+                                 annmodel.SomeUnicodeString(can_be_None=True)]
     def __enter__(self):
         return self.buf
     def __exit__(self, *args):