merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-28 21:41:58 +01:00
commit 0235709b8c
1 changed files with 8 additions and 7 deletions

View File

@ -38,13 +38,6 @@ module-level functions and methods on
that don't require you to compile a regex object first, but miss some
fine-tuning parameters.
.. seealso::
Mastering Regular Expressions
Book on regular expressions by Jeffrey Friedl, published by O'Reilly. The
second edition of the book no longer covers Python at all, but the first
edition covered writing good regular expression patterns in great detail.
.. _re-syntax:
@ -443,6 +436,14 @@ three digits in length.
The ``'\u'`` and ``'\U'`` escape sequences have been added.
.. seealso::
Mastering Regular Expressions
Book on regular expressions by Jeffrey Friedl, published by O'Reilly. The
second edition of the book no longer covers Python at all, but the first
edition covered writing good regular expression patterns in great detail.
.. _contents-of-module-re: