From 207e7de8b174be8598295254d73dfd392e84fe95 Mon Sep 17 00:00:00 2001
From: Sophist <github@sodalis.co.uk>
Date: Mon, 31 Mar 2014 07:24:50 +0100
Subject: [PATCH] Switch back to PRESERVED_TAGS

---
 picard/file.py      | 4 ++--
 picard/util/tags.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/picard/file.py b/picard/file.py
index 5b5b60501..6ae3f2f58 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -46,7 +46,7 @@ from picard.util import (
     unaccent,
 )
 from picard.util.filenaming import make_short_filename
-from picard.util.tags import MEDIA_TAGS
+from picard.util.tags import PRESERVED_TAGS
 
 
 class File(QtCore.QObject, Item):
@@ -125,7 +125,7 @@ class File(QtCore.QObject, Item):
         preserve = config.setting["preserved_tags"].strip()
         saved_metadata = {}
 
-        for tag in re.split(r"\s*,\s*", preserve) + MEDIA_TAGS:
+        for tag in re.split(r"\s*,\s*", preserve) + PRESERVED_TAGS:
             values = self.orig_metadata.getall(tag)
             if values:
                 saved_metadata[tag] = values
diff --git a/picard/util/tags.py b/picard/util/tags.py
index 2c1deebdb..2b50e25c8 100644
--- a/picard/util/tags.py
+++ b/picard/util/tags.py
@@ -91,7 +91,7 @@ TAG_NAMES = {
     'work': N_('Work'),
 }
 
-MEDIA_TAGS = [
+PRESERVED_TAGS = [
     "~bitrate", "~bits_per_sample", "~format", "~channels", "~sample_rate",
     "~dirname", "~filename", "~extension",
 ]