New upstream version 1.29.4.upstream/1.29.4

2 files changed, 28 insertions, 2 deletions

diff --git a/test/test_formatter.py b/test/test_formatter.py
index c0b504d..646f179 100644
--- a/test/test_formatter.py
+++ b/test/test_formatter.py
@@ -35,6 +35,8 @@ class TestFormatter(unittest.TestCase):
         "ds": "2010-01-01T01:00:00+0100",
         "dt": datetime.datetime(2010, 1, 1),
         "dt_dst": datetime.datetime(2010, 6, 1),
+        "i_str": "12345",
+        "f_str": "12.45",
         "name": "Name",
         "title1": "Title",
         "title2": "",
@@ -70,6 +72,9 @@ class TestFormatter(unittest.TestCase):
         self._run_test("{a!L}", 11)
         self._run_test("{l!L}", 3)
         self._run_test("{d!L}", 3)
+        self._run_test("{i_str!i}", 12345)
+        self._run_test("{i_str!f}", 12345.0)
+        self._run_test("{f_str!f}", 12.45)
 
         with self.assertRaises(KeyError):
             self._run_test("{a!q}", "hello world")
@@ -483,10 +488,10 @@ def noarg():
             fmt4 = formatter.parse("\fM " + path + ":lengths")
 
         self.assertEqual(fmt1.format_map(self.kwdict), "'Title' by Name")
-        self.assertEqual(fmt2.format_map(self.kwdict), "126")
+        self.assertEqual(fmt2.format_map(self.kwdict), "136")
 
         self.assertEqual(fmt3.format_map(self.kwdict), "'Title' by Name")
-        self.assertEqual(fmt4.format_map(self.kwdict), "126")
+        self.assertEqual(fmt4.format_map(self.kwdict), "136")
 
         with self.assertRaises(TypeError):
             self.assertEqual(fmt0.format_map(self.kwdict), "")
diff --git a/test/test_postprocessor.py b/test/test_postprocessor.py
index 2941b81..8b073b4 100644
--- a/test/test_postprocessor.py
+++ b/test/test_postprocessor.py
@@ -511,6 +511,17 @@ class MetadataTest(BasePostprocessorTest):
         path = self.pathfmt.realdirectory + "../json/12500/file.ext.json"
         m.assert_called_once_with(path, "w", encoding="utf-8")
 
+    def test_metadata_directory_empty(self):
+        self._create(
+            {"directory": []},
+        )
+
+        with patch("builtins.open", mock_open()) as m:
+            self._trigger()
+
+        path = self.pathfmt.realdirectory + "./file.ext.json"
+        m.assert_called_once_with(path, "w", encoding="utf-8")
+
     def test_metadata_basedirectory(self):
         self._create({"base-directory": True})
 
@@ -544,6 +555,16 @@ class MetadataTest(BasePostprocessorTest):
         path = self.pathfmt.realdirectory + "test_file__meta_.data"
         m.assert_called_once_with(path, "w", encoding="utf-8")
 
+    def test_metadata_meta_path(self):
+        self._create({
+            "metadata-path": "_meta_path",
+        })
+
+        self._trigger()
+
+        self.assertEqual(self.pathfmt.kwdict["_meta_path"],
+                         self.pathfmt.realpath + ".json")
+
     def test_metadata_stdout(self):
         self._create({"filename": "-", "indent": None, "sort": True})