From d5beab75fa0c3265f5dedc0260002cfd1e6487e6 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Thu, 25 Jan 2018 17:44:06 +0100
Subject: [PATCH] Do not redefine builtin map

---
 picard/config_upgrade.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/picard/config_upgrade.py b/picard/config_upgrade.py
index 31cc16b13..19ef98b26 100644
--- a/picard/config_upgrade.py
+++ b/picard/config_upgrade.py
@@ -155,7 +155,7 @@ def upgrade_to_v1_4_0_dev_2():
 def upgrade_to_v1_4_0_dev_3():
     """Cover art providers options were moved to a list of tuples"""
     _s = config.setting
-    map = [
+    map_ca_provider = [
         ('ca_provider_use_amazon', 'Amazon'),
         ('ca_provider_use_caa', 'Cover Art Archive'),
         ('ca_provider_use_whitelist', 'Whitelist'),
@@ -163,7 +163,7 @@ def upgrade_to_v1_4_0_dev_3():
     ]
 
     newopts = []
-    for old, new in map:
+    for old, new in map_ca_provider:
         if old in _s:
             newopts.append((new, _s.value(old, config.BoolOption, True)))
     _s['ca_providers'] = newopts