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

add 'U' conversion for format strings to unquote their content

Browse Source 
(#74)
This commit is contained in:
Mike Fährmann 2018-02-25 21:57:59 +01:00
parent 8cdce21dcb
commit 2fad0b1f1b
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/util.py
View File

@ -284,6 +284,7 @@ class Formatter():
- "u": calls str.upper - "u": calls str.upper
- "c": calls str.capitalize - "c": calls str.capitalize
- "C": calls string.capwords - "C": calls string.capwords
- "U": calls urllib.parse.unquote
- Example: {f!l} -> "example"; {f!u} -> "EXAMPLE" - Example: {f!l} -> "example"; {f!u} -> "EXAMPLE"
Extra Format Specifiers: Extra Format Specifiers:
@ -298,6 +299,7 @@ class Formatter():
"u": str.upper, "u": str.upper,
"c": str.capitalize, "c": str.capitalize,
"C": string.capwords, "C": string.capwords,
"U": urllib.parse.unquote,
"s": str, "s": str,
"r": repr, "r": repr,
"a": ascii, "a": ascii,

3
test/test_util.py
View File

@ -145,6 +145,7 @@ class TestFormatter(unittest.TestCase):
kwdict = { kwdict = {
"a": "hElLo wOrLd", "a": "hElLo wOrLd",
"b": "äöü", "b": "äöü",
"u": "%27%3C%20/%20%3E%27",
"name": "Name", "name": "Name",
"title1": "Title", "title1": "Title",
"title2": "", "title2": "",
@ -157,6 +158,8 @@ class TestFormatter(unittest.TestCase):
self._run_test("{a!u}", "HELLO WORLD") self._run_test("{a!u}", "HELLO WORLD")
self._run_test("{a!c}", "Hello world") self._run_test("{a!c}", "Hello world")
self._run_test("{a!C}", "Hello World") self._run_test("{a!C}", "Hello World")
self._run_test("{a!U}", self.kwdict["a"])
self._run_test("{u!U}", "'< / >'")
self._run_test("{a!s}", self.kwdict["a"]) self._run_test("{a!s}", self.kwdict["a"])
self._run_test("{a!r}", "'" + self.kwdict["a"] + "'") self._run_test("{a!r}", "'" + self.kwdict["a"] + "'")
self._run_test("{a!a}", "'" + self.kwdict["a"] + "'") self._run_test("{a!a}", "'" + self.kwdict["a"] + "'")