diff options
| author | Waylan Limberg <waylan@gmail.com> | 2010-09-20 14:45:52 -0400 |
|---|---|---|
| committer | Waylan Limberg <waylan@gmail.com> | 2010-09-20 14:45:52 -0400 |
| commit | e4993fc56dd222c9b11fc96b1044e39f84e4544f (patch) | |
| tree | 1737ed04ccf36e467f6744cda5e8d775726eeabf | |
| parent | 5ee12763465d123a313d43fc0fb497636f727d34 (diff) | |
| download | markdown-e4993fc56dd222c9b11fc96b1044e39f84e4544f.tar.gz markdown-e4993fc56dd222c9b11fc96b1044e39f84e4544f.tar.bz2 markdown-e4993fc56dd222c9b11fc96b1044e39f84e4544f.zip | |
Added the re.UNICODE flag to inlinepatterns. Now all inlinepattern regex will match unicode characters when \w, \b, or \s is used. Also updated docs to reflect change.
| -rw-r--r-- | docs/writing_extensions.txt | 7 | ||||
| -rw-r--r-- | markdown/inlinepatterns.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/writing_extensions.txt b/docs/writing_extensions.txt index 1300d55..2ecd4c9 100644 --- a/docs/writing_extensions.txt +++ b/docs/writing_extensions.txt @@ -80,9 +80,10 @@ Note that any regular expression returned by ``getCompiledRegExp`` must capture the whole block. Therefore, they should all start with ``r'^(.*?)'`` and end with ``r'(.*?)!'``. When using the default ``getCompiledRegExp()`` method provided in the ``Pattern`` you can pass in a regular expression without that -and ``getCompiledRegExp`` will wrap your expression for you. This means that -the first group of your match will be ``m.group(2)`` as ``m.group(1)`` will -match everything before the pattern. +and ``getCompiledRegExp`` will wrap your expression for you and set the +`re.DOTALL` and `re.UNICODE` flags. This means that the first group of your +match will be ``m.group(2)`` as ``m.group(1)`` will match everything before the +pattern. For an example, consider this simplified emphasis pattern: diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py index b5bd02b..ebc6d8d 100644 --- a/markdown/inlinepatterns.py +++ b/markdown/inlinepatterns.py @@ -153,7 +153,8 @@ class Pattern: """ self.pattern = pattern - self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, re.DOTALL) + self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern, + re.DOTALL | re.UNICODE) # Api for Markdown to pass safe_mode into instance self.safe_mode = False |