From 8077499eaeffc3ca5129a9e4260a73f6699b2dc6 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 14 Aug 2017 13:41:58 +0200
Subject: [PATCH] Something with name clashes

---
 digimarks.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/digimarks.py b/digimarks.py
index a88268f..232238e 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -133,7 +133,7 @@ except AttributeError:
 
 # Cache the tags
 all_tags = {}
-settings = {}
+usersettings = {}
 
 
 def ifilterfalse(predicate, iterable):
@@ -384,7 +384,7 @@ def get_cached_tags(userkey):
 
 def get_theme(userkey):
     try:
-        usertheme = settings[userkey]['theme']
+        usertheme = usersettings[userkey]['theme']
         return themes[usertheme]
     except KeyError:
         return themes[DEFAULT_THEME]  # default
@@ -777,7 +777,7 @@ users = User.select()
 print('Current user keys:')
 for user in users:
     all_tags[user.key] = get_tags_for_user(user.key)
-    settings[user.key] = {'theme': user.theme}
+    usersettings[user.key] = {'theme': user.theme}
     print(user.key)
 
 # Run when called standalone