github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 'default' argument to 'text.extr()'

Browse Source
This commit is contained in:
Mike Fährmann
2022-11-09 11:00:32 +01:00
parent e326029355
commit 05255f5be0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gallery_dl/text.py
View File

@@ -120,13 +120,13 @@ def extract(txt, begin, end, pos=0):
return None, pos return None, pos
def extr(txt, begin, end): def extr(txt, begin, end, default=""):
"""Stripped-down version of 'extract()'""" """Stripped-down version of 'extract()'"""
try: try:
first = txt.index(begin) + len(begin) first = txt.index(begin) + len(begin)
return txt[first:txt.index(end, first)] return txt[first:txt.index(end, first)]
except (ValueError, TypeError, AttributeError): except (ValueError, TypeError, AttributeError):
return "" return default
def rextract(txt, begin, end, pos=-1): def rextract(txt, begin, end, pos=-1):

5
test/test_text.py
View File

@@ -210,6 +210,11 @@ class TestText(unittest.TestCase):
self.assertEqual(f(txt, "<", ">"), "a") self.assertEqual(f(txt, "<", ">"), "a")
self.assertEqual(f(txt, "><", ">"), "b") self.assertEqual(f(txt, "><", ">"), "b")
# 'default' argument
self.assertEqual(f(txt, "<", "X", None), None)
self.assertEqual(f(txt, "<", "X", default=None), None)
self.assertEqual(f(txt, "<", "X", default=()), ())
# invalid arguments # invalid arguments
for value in INVALID: for value in INVALID:
self.assertEqual(f(value, "<" , ">") , "") self.assertEqual(f(value, "<" , ">") , "")