changeset: 75530:2d2a972b7523
branch: 2.7
user: Senthil Kumaran <senthil@uthcode.com>
date: Sun Mar 11 20:37:39 2012 -0700
files: Doc/library/re.rst
description:
Fix closes issue14258 - added clarification to \W and \S flags
diff -r 6b1fad34d893 -r 2d2a972b7523 Doc/library/re.rst
--- a/Doc/library/re.rst	Mon Mar 12 02:09:02 2012 +0200
+++ b/Doc/library/re.rst	Sun Mar 11 20:37:39 2012 -0700
@@ -361,12 +361,12 @@
 character properties database.
 
 ``\S``
- When the :const:`LOCALE` and :const:`UNICODE` flags are not specified, matches
- any non-whitespace character; this is equivalent to the set ``[^ \t\n\r\f\v]``
- With :const:`LOCALE`, it will match any character not in this set, and not
- defined as space in the current locale. If :const:`UNICODE` is set, this will
- match anything other than ``[ \t\n\r\f\v]`` and characters marked as space in
- the Unicode character properties database.
+ When the :const:`LOCALE` and :const:`UNICODE` flags are not specified,
+ matches any non-whitespace character; this is equivalent to the set ``[^
+ \t\n\r\f\v]`` With :const:`LOCALE`, it will match the above set plus any
+ non-space character in the current locale. If :const:`UNICODE` is set, the
+ above set ``[^ \t\n\r\f\v]`` plus the characters not marked as space in the
+ Unicode character properties database.
 
 ``\w``
 When the :const:`LOCALE` and :const:`UNICODE` flags are not specified, matches
@@ -381,12 +381,16 @@
 any non-alphanumeric character; this is equivalent to the set ``[^a-zA-Z0-9_]``.
 With :const:`LOCALE`, it will match any character not in the set ``[0-9_]``, and
 not defined as alphanumeric for the current locale. If :const:`UNICODE` is set,
- this will match anything other than ``[0-9_]`` and characters marked as
- alphanumeric in the Unicode character properties database.
+ this will match anything other than ``[0-9_]`` plus characters classied as
+ not alphanumeric in the Unicode character properties database.
 
 ``\Z``
 Matches only at the end of the string.
 
+If both :const:`LOCALE` and :const:`UNICODE` flags are included for a
+particular sequence, then :const:`LOCALE` flag takes effect first followed by
+the :const:`UNICODE`.
+
 Most of the standard escapes supported by Python string literals are also
 accepted by the regular expression parser::
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/2d2a972b7523">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/2d2a972b7523" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>