Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r59367:7c4e7a82df66
Date: 2012-12-07 16:30 -0800
http://bitbucket.org/pypy/pypy/changeset/7c4e7a82df66/
Log: reapply our py3k signatures from 460b29c967c1
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -4,7 +4,6 @@
import sys, os, stat
-from pypy.annotation import types
from pypy.interpreter.module import Module
from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.interpreter.typedef import TypeDef, generic_new_descr
@@ -16,6 +15,7 @@
from pypy.rlib.streamio import StreamErrors
from pypy.rlib.objectmodel import we_are_translated, specialize
from pypy.rlib.signature import signature
+from pypy.rlib import types
from pypy.module.sys.version import PYPY_VERSION
SEARCH_ERROR = 0
diff --git a/pypy/rlib/types.py b/pypy/rlib/types.py
--- a/pypy/rlib/types.py
+++ b/pypy/rlib/types.py
@@ -24,9 +24,15 @@
def unicode():
return model.SomeUnicodeString()
+def unicode0():
+ return model.SomeUnicodeString(no_nul=True)
+
def str():
return model.SomeString()
+def str0():
+ return model.SomeString(no_nul=True)
+
def char():
return model.SomeChar()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
