diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:44:38 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:44:38 +0000 |
| commit | e0289a34bdf414eaf4471ed14d2243e1db7c26eb (patch) | |
| tree | 423e0c6f5f57624f7fb7e6f46b4fb83209f5f49d | |
| parent | 890499cebd27521a3e3100cf12bda49df038d360 (diff) | |
| download | cpython-git-e0289a34bdf414eaf4471ed14d2243e1db7c26eb.tar.gz | |
Merged revisions 82832,82834 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82832 | georg.brandl | 2010-07-12 11:00:29 +0200 (Mo, 12 Jul 2010) | 1 line
Take care of duplicate target name warnings.
........
r82834 | georg.brandl | 2010-07-12 11:06:13 +0200 (Mo, 12 Jul 2010) | 1 line
Use raw string literals for regexes containing backlash.
........
| -rw-r--r-- | Doc/faq/extending.rst | 8 | ||||
| -rw-r--r-- | Doc/library/re.rst | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst index 5c716fe023..be5c51c631 100644 --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -26,6 +26,8 @@ function that is going to be called by the Python interpreter. Global or static C++ objects with constructors are probably not a good idea. +.. _c-wrapper-software: + Writing C is hard; are there any alternatives? ---------------------------------------------- @@ -197,11 +199,7 @@ begin by reading :ref:`the "Extending and Embedding" document whole lot of difference between C and C++ -- so the strategy of building a new Python type around a C structure (pointer) type will also work for C++ objects. -For C++ libraries, you can look at `SIP -<http://www.riverbankcomputing.co.uk/software/sip/>`_, `CXX -<http://cxx.sourceforge.net/>`_, `Boost -<http://www.boost.org/libs/python/doc/index.html>`_, `Weave -<http://www.scipy.org/Weave>`_ or `SWIG <http://www.swig.org>`_ +For C++ libraries, see :ref:`c-wrapper-software`. I added a module using the Setup file and the make fails; why? diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 46194f2388..6a0a6d0fac 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -1210,9 +1210,9 @@ in each word of a sentence except for the first and last characters:: ... random.shuffle(inner_word) ... return m.group(1) + "".join(inner_word) + m.group(3) >>> text = "Professor Abdolmalek, please report your absences promptly." - >>> re.sub("(\w)(\w+)(\w)", repl, text) + >>> re.sub(r"(\w)(\w+)(\w)", repl, text) 'Poefsrosr Aealmlobdk, pslaee reorpt your abnseces plmrptoy.' - >>> re.sub("(\w)(\w+)(\w)", repl, text) + >>> re.sub(r"(\w)(\w+)(\w)", repl, text) 'Pofsroser Aodlambelk, plasee reoprt yuor asnebces potlmrpy.' |