8000 gh-113304: Add pos/endpos parameters to re module functions by adamsilkey · Pull Request #113306 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-113304: Add pos/endpos parameters to re module functions #113306

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

gh-113304: Add pos/endpos parameters to re module functions #113306

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a1ce2a
Update re docs to reflect Pattern methods signature
adamsilkey Dec 20, 2023
6f9a22a
Add Special Characters section to re docs
adamsilkey Dec 20, 2023
05f77b7
Add pos/endpos parameters to re module functions
adamsilkey Dec 20, 2023
d739574
Update module docstrings
adamsilkey Dec 20, 2023
a690fa1
Add tests for pos/endpos
adamsilkey Dec 20, 2023
6bf8f12
Update re docs to include string indexing
adamsilkey Dec 20, 2023
69ed402
Add Adam Silkey to ACKS
adamsilkey Dec 20, 2023
43a7248
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 20, 2023
22aa7b2
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 20, 2023
54e50cb
Add blurb and remove previous blurbs
adamsilkey Dec 20, 2023
59d1a93
Fix docs: arguments -> parameters
adamsilkey Dec 20, 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
Next Next commit
Add tests for pos/endpos
  • Loading branch information
@adamsilkey
adamsilkey committed Dec 20, 2023
commit a690fa11b086c652eb35da5906a61c75559136da
55 changes: 55 additions & 0 deletions Lib/test/test_re.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,61 @@ def test_keyword_parameters(self):
pat.scanner(string='abracadabra', pos=3, endpos=10).search().span(),
(7, 9))

def test_module_function_pos_endpos(self):
# pos/endpos - positional arguments
self.assertEqual(
re.match(r'(ab)', 'abracadabra', 0, 7).span(), (7, 9))
self.assertEqual(
re.match(r'(ab)', 'abracadabra', 0, 7, 10).span(), (7, 9))
self.assertEqual(
re.fullmatch(r'(abra)', 'abracadabra', 1, 7).span(), (7, 11))
self.assertEqual(
re.fullmatch(r'(ab)', 'abracadabra', 0, 7, 9).span(), (7, 9))
self.assertEqual(
re.search(r'(ab)', 'abracadabra', 0, 3).span(), (7, 9))
self.assertEqual(
re.search(r'(ab)', 'abracadabra', 0, 3, 10).span(), (7, 9))
self.assertEqual(
re.findall(r'(ab)', 'abracadabracadabra', 0, 3), ['ab', 'ab'])
self.assertEqual(
re.findall(r'(ab)', 'abracadabracadabra', 0, 3, 16), ['ab', 'ab'])
iter = re.finditer(r":+", "a:b::c:::d", 0, 3)
self.assertEqual([item.group(0) for item in iter], ["::", ":::"])
iter = re.finditer(r":+", "a:b::c:::d", 0, 3, 10)
self.assertEqual([item.group(0) for item in iter], ["::", ":::"])

# pos/endpos - keyword arguments
self.assertEqual(
re.match(r'(ab)', 'abracadabra', pos=7).span(), (7, 9))
self.assertEqual(
re.match(r'(ab)', 'abracadabra', endpos=9).span(), (0, 2))
self.assertEqual(
re.match(r'(ab)', 'abracadabra', pos=7, endpos=9).span(), (7, 9))
self.assertEqual(
re.fullmatch(r'(abra)', 'abracadabra', pos=7).span(), (7, 11))
self.assertEqual(
re.fullmatch(r'(ab)', 'abracadabra', endpos=2).span(), (0, 2))
self.assertEqual(
re.fullmatch(r'(ab)', 'abracadabra', pos=7, endpos=9).span(), (7, 9))
self.assertEqual(
re.search(r'(ab)', 'abracadabra', pos=3).span(), (7, 9))
self.assertEqual(
re.search(r'(ab)', 'abracadabra', endpos=9).span(), (0, 2))
self.assertEqual(
re.search(r'(ab)', 'abracadabra', pos=3, endpos=9).span(), (7, 9))
self.assertEqual(
re.findall(r':+', 'a:b::c:::d', pos=3), ['::', ':::'])
self.assertEqual(
re.findall(r':+', 'a:b::c:::d', endpos=6), [':', '::'])
self.assertEqual(
re.findall(r':+', 'a:b::c:::d', pos=3, endpos=10), ['::', ':::'])
iter = re.finditer(r':+', 'a:b::c:::d', pos=3)
self.assertEqual([item.group(0) for item in iter], ['::', ':::'])
iter = re.finditer(r':+', 'a:b::c:::d', endpos=6)
self.assertEqual([item.group(0) for item in iter], [':', '::'])
iter = re.finditer(r':+', 'a:b::c:::d', pos=3, endpos=10)
self.assertEqual([item.group(0) for item in iter], ['::', ':::'])

def test_bug_20998(self):
# Issue #20998: Fullmatch of repeated single character pattern
# with ignore case.
Expand Down
0