summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-05-27 13:37:40 (GMT)
committerGitHub <noreply@github.com>2017-05-27 13:37:40 (GMT)
commitb52c68a5a3f546cbbe1589f8bb3e51bfd55a6c15 (patch)
tree7f875e950037f8b0ba6f3c0b4aaa363a7b27f258
parent584ef2aecfdaaf753e3959a8ceb0ea745189ddeb (diff)
downloadcpython-b52c68a5a3f546cbbe1589f8bb3e51bfd55a6c15.zip
cpython-b52c68a5a3f546cbbe1589f8bb3e51bfd55a6c15.tar.gz
cpython-b52c68a5a3f546cbbe1589f8bb3e51bfd55a6c15.tar.bz2
[3.6] bpo-30398: Add a docstring for re.error. (GH-1647) (#1830)
Also document that some attributes may be None. (cherry picked from commit 12d6b5d)
-rw-r--r--Doc/library/re.rst6
-rw-r--r--Lib/sre_constants.py11
2 files changed, 14 insertions, 3 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 944c6fb..5ae304d 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -828,15 +828,15 @@ form.
.. attribute:: pos
- The index of *pattern* where compilation failed.
+ The index in *pattern* where compilation failed (may be ``None``).
.. attribute:: lineno
- The line corresponding to *pos*.
+ The line corresponding to *pos* (may be ``None``).
.. attribute:: colno
- The column corresponding to *pos*.
+ The column corresponding to *pos* (may be ``None``).
.. versionchanged:: 3.5
Added additional attributes.
diff --git a/Lib/sre_constants.py b/Lib/sre_constants.py
index fc684ae..a6e8a1f 100644
--- a/Lib/sre_constants.py
+++ b/Lib/sre_constants.py
@@ -21,6 +21,17 @@ from _sre import MAXREPEAT, MAXGROUPS
# should this really be here?
class error(Exception):
+ """Exception raised for invalid regular expressions.
+
+ Attributes:
+
+ msg: The unformatted error message
+ pattern: The regular expression pattern
+ pos: The index in the pattern where compilation failed (may be None)
+ lineno: The line corresponding to pos (may be None)
+ colno: The column corresponding to pos (may be None)
+ """
+
def __init__(self, msg, pattern=None, pos=None):
self.msg = msg
self.pattern = pattern