Skip to content

gh-56166: Deprecate passing counts and maxsplit via position in re #107767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hauntsaninja wants to merge 4 commits into from
Closed

gh-56166: Deprecate passing counts and maxsplit via position in re #107767

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cabb45
gh-56166: Deprecate passing counts and flags via position in re
hauntsaninja Aug 8, 2023
8469cc2
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 8, 2023
fe60982
docs
hauntsaninja Aug 8, 2023
c2d8f1c
idle
hauntsaninja Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
idle
  • Loading branch information
@hauntsaninja
hauntsaninja committed Aug 8, 2023
commit c2d8f1c6ed8298a5821fec13904a9ff5e9b99e73
2 changes: 1 addition & 1 deletion Lib/idlelib/idle_test/test_calltip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class SB: __call__ = None

p = re.compile('')
tiptest(re.sub, '''\
(pattern, repl, string, count=0, flags=0)
(pattern, repl, string, *_args, count=0, flags=0)
Return the string obtained by replacing the leftmost
non-overlapping occurrences of the pattern in string by the
replacement repl. repl can be either a string or a callable;
Expand Down
42 changes: 21 additions & 21 deletions Lib/re/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,24 +178,24 @@ def search(pattern, string, flags=0):
a Match object, or None if no match was found."""
return _compile(pattern, flags).search(string)

def sub(pattern, repl, string, *args, count=_zero_sentinel, flags=_zero_sentinel):
def sub(pattern, repl, string, *_args, count=_zero_sentinel, flags=_zero_sentinel):
"""Return the string obtained by replacing the leftmost
non-overlapping occurrences of the pattern in string by the
replacement repl. repl can be either a string or a callable;
if a string, backslash escapes in it are processed. If it is
a callable, it's passed the Match object and must return
a replacement string to be used."""
if args:
if _args:
if count is not _zero_sentinel:
raise TypeError("sub() got multiple values for argument 'count'")
count, *args = args
if args:
count, *_args = _args
if _args:
if flags is not _zero_sentinel:
raise TypeError("sub() got multiple values for argument 'flags'")
flags, *args = args
if args:
flags, *_args = _args
if _args:
raise TypeError("sub() takes from 2 to 4 positional arguments "
f"but {4 + len(args)} were given")
f"but {4 + len(_args)} were given")

import warnings
warnings.warn(
Expand All @@ -204,7 +204,7 @@ def sub(pattern, repl, string, *args, count=_zero_sentinel, flags=_zero_sentinel
)
return _compile(pattern, flags).sub(repl, string, count)

def subn(pattern, repl, string, *args, count=_zero_sentinel, flags=_zero_sentinel):
def subn(pattern, repl, string, *_args, count=_zero_sentinel, flags=_zero_sentinel):
"""Return a 2-tuple containing (new_string, number).
new_string is the string obtained by replacing the leftmost
non-overlapping occurrences of the pattern in the source
Expand All @@ -213,17 +213,17 @@ def subn(pattern, repl, string, *args, count=_zero_sentinel, flags=_zero_sentine
callable; if a string, backslash escapes in it are processed.
If it is a callable, it's passed the Match object and must
return a replacement string to be used."""
if args:
if _args:
if count is not _zero_sentinel:
raise TypeError("subn() got multiple values for argument 'count'")
count, *args = args
if args:
count, *_args = _args
if _args:
if flags is not _zero_sentinel:
raise TypeError("subn() got multiple values for argument 'flags'")
flags, *args = args
if args:
flags, *_args = _args
if _args:
raise TypeError("subn() takes from 2 to 4 positional arguments "
f"but {4 + len(args)} were given")
f"but {4 + len(_args)} were given")

import warnings
warnings.warn(
Expand All @@ -232,25 +232,25 @@ def subn(pattern, repl, string, *args, count=_zero_sentinel, flags=_zero_sentine
)
return _compile(pattern, flags).subn(repl, string, count)

def split(pattern, string, *args, maxsplit=_zero_sentinel, flags=_zero_sentinel):
def split(pattern, string, *_args, maxsplit=_zero_sentinel, flags=_zero_sentinel):
"""Split the source string by the occurrences of the pattern,
returning a list containing the resulting substrings. If
capturing parentheses are used in pattern, then the text of all
groups in the pattern are also returned as part of the resulting
list. If maxsplit is nonzero, at most maxsplit splits occur,
and the remainder of the string is returned as the final element
of the list."""
if args:
if _args:
if maxsplit is not _zero_sentinel:
raise TypeError("split() got multiple values for argument 'maxsplit'")
maxsplit, *args = args
if args:
maxsplit, *_args = _args
if _args:
if flags is not _zero_sentinel:
raise TypeError("split() got multiple values for argument 'flags'")
flags, *args = args
if args:
flags, *_args = _args
if _args:
raise TypeError("split() takes from 2 to 4 positional arguments "
f"but {4 + len(args)} were given")
f"but {4 + len(_args)} were given")

import warnings
warnings.warn(
Expand Down