New upstream version 1.25.3.upstream/1.25.3

2 files changed, 44 insertions, 19 deletions

diff --git a/test/test_postprocessor.py b/test/test_postprocessor.py
index c78d7b0..ac89b55 100644
--- a/test/test_postprocessor.py
+++ b/test/test_postprocessor.py
@@ -388,51 +388,60 @@ class MetadataTest(BasePostprocessorTest):
 """)
 
     def test_metadata_modify(self):
-        kwdict = {"foo": 0, "bar": {"bax": 1, "bay": 2, "baz": 3}}
+        kwdict = {"foo": 0, "bar": {"bax": 1, "bay": 2, "baz": 3, "ba2": {}}}
         self._create({
             "mode": "modify",
             "fields": {
-                "foo"     : "{filename}-{foo!s}",
-                "foo2"    : "\fE bar['bax'] + 122",
-                "bar[baz]": "{_now}",
-                "bar[ba2]": "test",
+                "foo"          : "{filename}-{foo!s}",
+                "foo2"         : "\fE bar['bax'] + 122",
+                "bar[\"baz\"]" : "{_now}",
+                "bar['ba2'][a]": "test",
             },
         }, kwdict)
-        pdict = self.pathfmt.kwdict
 
+        pdict = self.pathfmt.kwdict
         self.assertIsNot(kwdict, pdict)
         self.assertEqual(pdict["foo"], kwdict["foo"])
         self.assertEqual(pdict["bar"], kwdict["bar"])
 
         self._trigger()
 
-        self.assertEqual(pdict["foo"]       , "file-0")
-        self.assertEqual(pdict["foo2"]      , 123)
-        self.assertEqual(pdict["bar"]["ba2"], "test")
+        self.assertEqual(pdict["foo"] , "file-0")
+        self.assertEqual(pdict["foo2"], 123)
+        self.assertEqual(pdict["bar"]["ba2"]["a"], "test")
         self.assertIsInstance(pdict["bar"]["baz"], datetime)
 
     def test_metadata_delete(self):
-        kwdict = {"foo": 0, "bar": {"bax": 1, "bay": 2, "baz": 3}}
-        self._create({"mode": "delete", "fields": ["foo", "bar[baz]"]}, kwdict)
-        pdict = self.pathfmt.kwdict
+        kwdict = {
+            "foo": 0,
+            "bar": {
+                "bax": 1,
+                "bay": 2,
+                "baz": {"a": 3, "b": 4},
+            },
+        }
+        self._create({
+            "mode": "delete",
+            "fields": ["foo", "bar['bax']", "bar[\"baz\"][a]"],
+        }, kwdict)
 
+        pdict = self.pathfmt.kwdict
         self.assertIsNot(kwdict, pdict)
+
         self.assertEqual(pdict["foo"], kwdict["foo"])
         self.assertEqual(pdict["bar"], kwdict["bar"])
 
-        del kwdict["foo"]
-        del kwdict["bar"]["baz"]
-
         self._trigger()
+
         self.assertNotIn("foo", pdict)
-        self.assertNotIn("baz", pdict["bar"])
-        self.assertEqual(kwdict["bar"], pdict["bar"])
+        self.assertNotIn("bax", pdict["bar"])
+        self.assertNotIn("a", pdict["bar"]["baz"])
 
         # no errors for deleted/undefined fields
         self._trigger()
         self.assertNotIn("foo", pdict)
-        self.assertNotIn("baz", pdict["bar"])
-        self.assertEqual(kwdict["bar"], pdict["bar"])
+        self.assertNotIn("bax", pdict["bar"])
+        self.assertNotIn("a", pdict["bar"]["baz"])
 
     def test_metadata_option_skip(self):
         self._create({"skip": True})
diff --git a/test/test_ytdl.py b/test/test_ytdl.py
index 7b82a0f..4c20f67 100644
--- a/test/test_ytdl.py
+++ b/test/test_ytdl.py
@@ -235,6 +235,12 @@ class Test_CommandlineArguments(unittest.TestCase):
 class Test_CommandlineArguments_YtDlp(Test_CommandlineArguments):
     module_name = "yt_dlp"
 
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        if cls.module.version.__version__ > "2023.03.04":
+            cls.test_geo_bypass = cls._test_geo_bypass_xff
+
     def test_retries_extractor(self):
         inf = float("inf")
 
@@ -269,6 +275,16 @@ class Test_CommandlineArguments_YtDlp(Test_CommandlineArguments):
                 "title:%(artist)s - %(title)s")],
         })
 
+    def _test_geo_bypass_xff(self):
+        self._("--geo-bypass",
+               "geo_bypass", "default")
+        self._("--no-geo-bypass",
+               "geo_bypass", "never")
+        self._(["--geo-bypass-country", "EN"],
+               "geo_bypass", "EN")
+        self._(["--geo-bypass-ip-block", "198.51.100.14/24"],
+               "geo_bypass", "198.51.100.14/24")
+
 
 if __name__ == "__main__":
     unittest.main(warnings="ignore")