From abfcb7b71204ea2f77aee361b4949ab8d7e97fe4 Mon Sep 17 00:00:00 2001
From: Viktor Petersson <vpetersson@users.noreply.github.com>
Date: Fri, 23 Nov 2018 19:12:01 +0000
Subject: [PATCH] Revert "Supporting unicode for player name"

---
 lib/unicode_configparser.py | 23 -----------------------
 server.py                   |  1 -
 settings.py                 | 10 ++++------
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 lib/unicode_configparser.py

diff --git a/lib/unicode_configparser.py b/lib/unicode_configparser.py
deleted file mode 100644
index b64b3952..00000000
--- a/lib/unicode_configparser.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import ConfigParser
-
-
-class UnicodeConfigParser(ConfigParser.RawConfigParser):
-
-    def __init__(self, *args, **kwargs):
-        ConfigParser.RawConfigParser.__init__(self, *args, **kwargs)
-
-    def write(self, fp):
-        if self._defaults:
-            fp.write("[%s]\n" % 'DEFAULT')
-            for (key, value) in self._defaults.items():
-                fp.write("%s = %s\n" % (key, unicode(value).replace('\n', '\n\t')))
-            fp.write("\n")
-        for section in self._sections:
-            fp.write("[%s]\n" % section)
-            for (key, value) in self._sections[section].items():
-                if key == "__name__":
-                    continue
-                if (value is not None) or (self._optcre == self.OPTCRE):
-                    key = " = ".join((key, unicode(value).replace('\n', '\n\t')))
-                fp.write("%s\n" % (key))
-            fp.write("\n")
diff --git a/server.py b/server.py
index c8987d7e..feea87ec 100755
--- a/server.py
+++ b/server.py
@@ -101,7 +101,6 @@ def template(template_name, **context):
     but also injects some global context."""
 
     # Add global contexts
-    context['player_name'] = context['player_name'].decode('utf-8')
     context['up_to_date'] = is_up_to_date()
     context['default_duration'] = settings['default_duration']
     context['default_streaming_duration'] = settings['default_streaming_duration']
diff --git a/settings.py b/settings.py
index 98de4dd6..05e7e84a 100644
--- a/settings.py
+++ b/settings.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import codecs
+
 from os import path, getenv
 from sys import exit
 from time import sleep
 import ConfigParser
-from lib.unicode_configparser import UnicodeConfigParser
 import logging
 from UserDict import IterableUserDict
 from flask import request, Response
@@ -115,14 +114,13 @@ class ScreenlySettings(IterableUserDict):
 
     def save(self):
         # Write new settings to disk.
-        config = UnicodeConfigParser()
+        config = ConfigParser.ConfigParser()
         for section, defaults in DEFAULTS.items():
             config.add_section(section)
             for field, default in defaults.items():
                 self._set(config, section, field, default)
-        config_file = codecs.open(self.conf_file, 'w', 'utf-8')
-        config.write(config_file)
-        config_file.close()
+        with open(self.conf_file, "w") as f:
+            config.write(f)
         self.load()
 
     def get_configdir(self):