diff options
author | Tim Peters <tim.peters@gmail.com> | 2004-08-09 03:28:45 (GMT) |
---|---|---|
committer | Tim Peters <tim.peters@gmail.com> | 2004-08-09 03:28:45 (GMT) |
commit | d40a92b3f09bcf755c86af59647ffb08c9082870 (patch) | |
tree | b4f34abbe7385692716fdf7e4085564d8234a113 | |
parent | 78b58f38f183009853ca14e966afee34038f1503 (diff) | |
download | cpython-d40a92b3f09bcf755c86af59647ffb08c9082870.zip cpython-d40a92b3f09bcf755c86af59647ffb08c9082870.tar.gz cpython-d40a92b3f09bcf755c86af59647ffb08c9082870.tar.bz2 |
Indent body of _EXAMPLE_RE for readability. _IS_BLANK_OR_COMMENT makes
more sense as a callable.
-rw-r--r-- | Lib/doctest.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index ccb1592..23e1d84 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -590,18 +590,18 @@ class Parser: self.string = string.expandtabs() _EXAMPLE_RE = re.compile(r''' - # Source consists of a PS1 line followed by zero or more PS2 lines. - (?P<source> - (?:^(?P<indent> [ ]*) >>> .*) # PS1 line - (?:\n [ ]* \.\.\. .*)*) # PS2 lines - \n? - # Want consists of any non-blank lines that do not start with PS1. - (?P<want> (?:(?![ ]*$) # Not a blank line - (?![ ]*>>>) # Not a line starting with PS1 - .*$\n? # But any other line - )*) - ''', re.MULTILINE | re.VERBOSE) - _IS_BLANK_OR_COMMENT = re.compile('^[ ]*(#.*)?$') + # Source consists of a PS1 line followed by zero or more PS2 lines. + (?P<source> + (?:^(?P<indent> [ ]*) >>> .*) # PS1 line + (?:\n [ ]* \.\.\. .*)*) # PS2 lines + \n? + # Want consists of any non-blank lines that do not start with PS1. + (?P<want> (?:(?![ ]*$) # Not a blank line + (?![ ]*>>>) # Not a line starting with PS1 + .*$\n? # But any other line + )*) + ''', re.MULTILINE | re.VERBOSE) + _IS_BLANK_OR_COMMENT = re.compile('^[ ]*(#.*)?$').match def get_examples(self): """ @@ -638,7 +638,7 @@ class Parser: # Extract source/want from the regexp match. (source, want) = self._parse_example(m, lineno) - if self._IS_BLANK_OR_COMMENT.match(source): + if self._IS_BLANK_OR_COMMENT(source): continue examples.append( Example(source, want, lineno) ) |