From 769a4bea9c459cf4ddd3b5378cfc770710de6db4 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Thu, 28 Mar 2019 17:56:37 +0100
Subject: [PATCH] Remove last bits of deprecated Metadata.delete()

- a note was added to it
- not removed, some plugins might rely on it
---
 picard/album.py          | 2 +-
 picard/file.py           | 2 +-
 picard/metadata.py       | 1 +
 picard/ui/metadatabox.py | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/picard/album.py b/picard/album.py
index 2e8465b75..561dbd892 100644
--- a/picard/album.py
+++ b/picard/album.py
@@ -391,7 +391,7 @@ class Album(DataObject, Item):
         if va:
             tm["compilation"] = "1"
         else:
-            tm.delete("compilation")
+            del tm["compilation"]
         if discpregap:
             tm["~discpregap"] = "1"
 
diff --git a/picard/file.py b/picard/file.py
index 357822ce1..35b427a06 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -190,7 +190,7 @@ class File(QtCore.QObject, Item):
         self.metadata.copy(metadata)
         if preserve_deleted:
             for tag in deleted_tags:
-                self.metadata.delete(tag)
+                del self.metadata[tag]
         for tag, values in saved_metadata.items():
             self.metadata.set(tag, values)
 
diff --git a/picard/metadata.py b/picard/metadata.py
index 546c5ca45..8df50aaba 100644
--- a/picard/metadata.py
+++ b/picard/metadata.py
@@ -348,6 +348,7 @@ class Metadata(MutableMapping):
             self.add(name, value)
 
     def delete(self, name):
+        """Deprecated: use del directly"""
         del self[name]
 
     def __iter__(self):
diff --git a/picard/ui/metadatabox.py b/picard/ui/metadatabox.py
index b414011e3..9211e66f4 100644
--- a/picard/ui/metadatabox.py
+++ b/picard/ui/metadatabox.py
@@ -385,7 +385,7 @@ class MetadataBox(QtWidgets.QTableWidget):
             values = []
         if not values and self.tag_is_removable(tag):
             for obj in objects:
-                obj.metadata.delete(tag)
+                del obj.metadata[tag]
         elif values:
             for obj in objects:
                 obj.metadata[tag] = values