summaryrefslogtreecommitdiffstats
path: root/Doc/extending
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-07-01 07:56:07 (GMT)
committerGeorg Brandl <georg@python.org>2012-07-01 07:56:07 (GMT)
commitc9d2fc390d7eee2bc8c19e029ea4958aa10a4922 (patch)
treee385a33dd2e707585497d8a68f2bfb65aaad11c2 /Doc/extending
parente4870b511796293b5e6cb82809ea035c54079e90 (diff)
parent29feb1ffcaa45335c33fc0a8bade83304b238744 (diff)
downloadcpython-c9d2fc390d7eee2bc8c19e029ea4958aa10a4922.zip
cpython-c9d2fc390d7eee2bc8c19e029ea4958aa10a4922.tar.gz
cpython-c9d2fc390d7eee2bc8c19e029ea4958aa10a4922.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Doc/extending')
-rw-r--r--Doc/extending/embedding.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
index 3143c99..d004d24 100644
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -155,13 +155,13 @@ for data conversion between Python and C, and for error reporting. The
interesting part with respect to embedding Python starts with ::
Py_Initialize();
- pName = PyString_FromString(argv[1]);
+ pName = PyUnicode_FromString(argv[1]);
/* Error checking of pName left out */
pModule = PyImport_Import(pName);
After initializing the interpreter, the script is loaded using
:c:func:`PyImport_Import`. This routine needs a Python string as its argument,
-which is constructed using the :c:func:`PyString_FromString` data conversion
+which is constructed using the :c:func:`PyUnicode_FromString` data conversion
routine. ::
pFunc = PyObject_GetAttrString(pModule, argv[2]);