Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
70dcef47
Commit
70dcef47
authored
Dec 23, 2012
by
Andrew Svetlov
Browse files
Options
Browse Files
Download
Plain Diff
Issue #16443: Add docstrings to regular expression match objects.
Patch by Anton Kasyanov.
parents
0a6b9eca
159bb537
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
60 additions
and
15 deletions
+60
-15
Misc/ACKS
Misc/ACKS
+2
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_sre.c
Modules/_sre.c
+55
-15
No files found.
Misc/ACKS
View file @
70dcef47
...
@@ -598,8 +598,10 @@ Jan Kaliszewski
...
@@ -598,8 +598,10 @@ Jan Kaliszewski
Peter van Kampen
Peter van Kampen
Rafe Kaplan
Rafe Kaplan
Jacob Kaplan-Moss
Jacob Kaplan-Moss
Jan Kaliszewski
Janne Karila
Janne Karila
Per Øyvind Karlsen
Per Øyvind Karlsen
Anton Kasyanov
Lou Kates
Lou Kates
Hiroaki Kawai
Hiroaki Kawai
Sebastien Keim
Sebastien Keim
...
...
Misc/NEWS
View file @
70dcef47
...
@@ -114,6 +114,9 @@ Core and Builtins
...
@@ -114,6 +114,9 @@ Core and Builtins
Library
Library
-------
-------
- Issue #16443: Add docstrings to regular expression match objects.
Patch by Anton Kasyanov.
- Issue #15701: Fix HTTPError info method call to return the headers information.
- Issue #15701: Fix HTTPError info method call to return the headers information.
- Issue #16752: Add a missing import to modulefinder. Patch by Berker Peksag.
- Issue #16752: Add a missing import to modulefinder. Patch by Berker Peksag.
...
...
Modules/_sre.c
View file @
70dcef47
...
@@ -2527,35 +2527,35 @@ pattern_deepcopy(PatternObject* self, PyObject* memo)
...
@@ -2527,35 +2527,35 @@ pattern_deepcopy(PatternObject* self, PyObject* memo)
}
}
PyDoc_STRVAR
(
pattern_match_doc
,
PyDoc_STRVAR
(
pattern_match_doc
,
"match(string[, pos[, endpos]]) -
-
> match object or None.
\n
\
"match(string[, pos[, endpos]]) -> match object or None.
\n
\
Matches zero or more characters at the beginning of the string"
);
Matches zero or more characters at the beginning of the string"
);
PyDoc_STRVAR
(
pattern_search_doc
,
PyDoc_STRVAR
(
pattern_search_doc
,
"search(string[, pos[, endpos]]) -
-
> match object or None.
\n
\
"search(string[, pos[, endpos]]) -> match object or None.
\n
\
Scan through string looking for a match, and return a corresponding
\n
\
Scan through string looking for a match, and return a corresponding
\n
\
MatchObject instance. Return None if no position in the string matches."
);
MatchObject instance. Return None if no position in the string matches."
);
PyDoc_STRVAR
(
pattern_split_doc
,
PyDoc_STRVAR
(
pattern_split_doc
,
"split(string[, maxsplit = 0]) -
-
> list.
\n
\
"split(string[, maxsplit = 0]) -> list.
\n
\
Split string by the occurrences of pattern."
);
Split string by the occurrences of pattern."
);
PyDoc_STRVAR
(
pattern_findall_doc
,
PyDoc_STRVAR
(
pattern_findall_doc
,
"findall(string[, pos[, endpos]]) -
-
> list.
\n
\
"findall(string[, pos[, endpos]]) -> list.
\n
\
Return a list of all non-overlapping matches of pattern in string."
);
Return a list of all non-overlapping matches of pattern in string."
);
PyDoc_STRVAR
(
pattern_finditer_doc
,
PyDoc_STRVAR
(
pattern_finditer_doc
,
"finditer(string[, pos[, endpos]]) -
-
> iterator.
\n
\
"finditer(string[, pos[, endpos]]) -> iterator.
\n
\
Return an iterator over all non-overlapping matches for the
\n
\
Return an iterator over all non-overlapping matches for the
\n
\
RE pattern in string. For each match, the iterator returns a
\n
\
RE pattern in string. For each match, the iterator returns a
\n
\
match object."
);
match object."
);
PyDoc_STRVAR
(
pattern_sub_doc
,
PyDoc_STRVAR
(
pattern_sub_doc
,
"sub(repl, string[, count = 0]) -
-> newstring
\n
\
"sub(repl, string[, count = 0]) -
> newstring.
\n
\
Return the string obtained by replacing the leftmost non-overlapping
\n
\
Return the string obtained by replacing the leftmost non-overlapping
\n
\
occurrences of pattern in string by the replacement repl."
);
occurrences of pattern in string by the replacement repl."
);
PyDoc_STRVAR
(
pattern_subn_doc
,
PyDoc_STRVAR
(
pattern_subn_doc
,
"subn(repl, string[, count = 0]) -
-
> (newstring, number of subs)
\n
\
"subn(repl, string[, count = 0]) -> (newstring, number of subs)
\n
\
Return the tuple (new_string, number_of_subs_made) found by replacing
\n
\
Return the tuple (new_string, number_of_subs_made) found by replacing
\n
\
the leftmost non-overlapping occurrences of pattern with the
\n
\
the leftmost non-overlapping occurrences of pattern with the
\n
\
replacement repl."
);
replacement repl."
);
...
@@ -3543,14 +3543,54 @@ match_deepcopy(MatchObject* self, PyObject* memo)
...
@@ -3543,14 +3543,54 @@ match_deepcopy(MatchObject* self, PyObject* memo)
#endif
#endif
}
}
PyDoc_STRVAR
(
match_doc
,
"The result of re.match() and re.search().
\n
\
Match objects always have a boolean value of True."
);
PyDoc_STRVAR
(
match_group_doc
,
"group([group1, ...]) -> str or tuple.
\n
\
Return subgroup(s) of the match by indices or names.
\n
\
For 0 returns the entire match."
);
PyDoc_STRVAR
(
match_start_doc
,
"start([group=0]) -> int.
\n
\
Return index of the start of the substring matched by group."
);
PyDoc_STRVAR
(
match_end_doc
,
"end([group=0]) -> int.
\n
\
Return index of the end of the substring matched by group."
);
PyDoc_STRVAR
(
match_span_doc
,
"span([group]) -> tuple.
\n
\
For MatchObject m, return the 2-tuple (m.start(group), m.end(group))."
);
PyDoc_STRVAR
(
match_groups_doc
,
"groups([default=None]) -> tuple.
\n
\
Return a tuple containing all the subgroups of the match, from 1.
\n
\
The default argument is used for groups
\n
\
that did not participate in the match"
);
PyDoc_STRVAR
(
match_groupdict_doc
,
"groupdict([default=None]) -> dict.
\n
\
Return a dictionary containing all the named subgroups of the match,
\n
\
keyed by the subgroup name. The default argument is used for groups
\n
\
that did not participate in the match"
);
PyDoc_STRVAR
(
match_expand_doc
,
"expand(template) -> str.
\n
\
Return the string obtained by doing backslash substitution
\n
\
on the string template, as done by the sub() method."
);
static
PyMethodDef
match_methods
[]
=
{
static
PyMethodDef
match_methods
[]
=
{
{
"group"
,
(
PyCFunction
)
match_group
,
METH_VARARGS
},
{
"group"
,
(
PyCFunction
)
match_group
,
METH_VARARGS
,
match_group_doc
},
{
"start"
,
(
PyCFunction
)
match_start
,
METH_VARARGS
},
{
"start"
,
(
PyCFunction
)
match_start
,
METH_VARARGS
,
match_start_doc
},
{
"end"
,
(
PyCFunction
)
match_end
,
METH_VARARGS
},
{
"end"
,
(
PyCFunction
)
match_end
,
METH_VARARGS
,
match_end_doc
},
{
"span"
,
(
PyCFunction
)
match_span
,
METH_VARARGS
},
{
"span"
,
(
PyCFunction
)
match_span
,
METH_VARARGS
,
match_span_doc
},
{
"groups"
,
(
PyCFunction
)
match_groups
,
METH_VARARGS
|
METH_KEYWORDS
},
{
"groups"
,
(
PyCFunction
)
match_groups
,
METH_VARARGS
|
METH_KEYWORDS
,
{
"groupdict"
,
(
PyCFunction
)
match_groupdict
,
METH_VARARGS
|
METH_KEYWORDS
},
match_groups_doc
},
{
"expand"
,
(
PyCFunction
)
match_expand
,
METH_O
},
{
"groupdict"
,
(
PyCFunction
)
match_groupdict
,
METH_VARARGS
|
METH_KEYWORDS
,
match_groupdict_doc
},
{
"expand"
,
(
PyCFunction
)
match_expand
,
METH_O
,
match_expand_doc
},
{
"__copy__"
,
(
PyCFunction
)
match_copy
,
METH_NOARGS
},
{
"__copy__"
,
(
PyCFunction
)
match_copy
,
METH_NOARGS
},
{
"__deepcopy__"
,
(
PyCFunction
)
match_deepcopy
,
METH_O
},
{
"__deepcopy__"
,
(
PyCFunction
)
match_deepcopy
,
METH_O
},
{
NULL
,
NULL
}
{
NULL
,
NULL
}
...
@@ -3629,7 +3669,7 @@ static PyTypeObject Match_Type = {
...
@@ -3629,7 +3669,7 @@ static PyTypeObject Match_Type = {
0
,
/* tp_setattro */
0
,
/* tp_setattro */
0
,
/* tp_as_buffer */
0
,
/* tp_as_buffer */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
0
,
/* tp_doc */
match_doc
,
/* tp_doc */
0
,
/* tp_traverse */
0
,
/* tp_traverse */
0
,
/* tp_clear */
0
,
/* tp_clear */
0
,
/* tp_richcompare */
0
,
/* tp_richcompare */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment