Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r60772:08fd9ba5355b
Date: 2013-01-31 15:04 +0100
http://bitbucket.org/pypy/pypy/changeset/08fd9ba5355b/
Log: hg merge default
diff --git a/pypy/doc/discussion/improve-rpython.rst
b/pypy/doc/discussion/improve-rpython.rst
--- a/pypy/doc/discussion/improve-rpython.rst
+++ b/pypy/doc/discussion/improve-rpython.rst
@@ -15,7 +15,7 @@
from pypy.interpreter.typedef import interp_attrproperty,
interp_attrproperty_w
from pypy.interpreter.gateway import interp2app
from pypy.interpreter.error import OperationError
- from pypy.rpython.lltypesystem import rffi, lltype
+ from rpython.rtyper.lltypesystem import rffi, lltype
- A more direct declarative way to write Typedef::
diff --git a/pypy/doc/rffi.rst b/pypy/doc/rffi.rst
--- a/pypy/doc/rffi.rst
+++ b/pypy/doc/rffi.rst
@@ -17,7 +17,7 @@
lltype.Signed or lltype.Array) and memory management must be done
by hand. To declare a function, we write::
- from pypy.rpython.lltypesystem import rffi
+ from rpython.rtyper.lltypesystem import rffi
external_function = rffi.llexternal(name, args, result)
@@ -31,7 +31,7 @@
libraries and sources by passing in the optional ``compilation_info``
parameter::
- from pypy.rpython.lltypesystem import rffi
+ from rpython.rtyper.lltypesystem import rffi
from rpython.translator.tool.cbuild import ExternalCompilationInfo
info = ExternalCompilationInfo(includes=[], libraries=[])
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
