From bc4c2de76348de5ff44b9e2596aeb28d9b45682e Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
Date: Tue, 24 Jul 2012 01:37:28 -0400
Subject: [PATCH] Fixing cookie bug.

---
 pages/settings.mako    | 1 -
 toolserver/settings.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/settings.mako b/pages/settings.mako
index ff5729d..413aec6 100644
--- a/pages/settings.mako
+++ b/pages/settings.mako
@@ -3,7 +3,6 @@
 <% bot, cookies, langs, projects = main(environ, headers) %>
             <h1>Settings</h1>
             <p>This page contains some configurable options for this Toolserver site. Settings are saved as cookies. You can view and delete all cookies generated by this site at the bottom of this page.</p>
-            <h2>Options</h2>
             <form action="${environ['PATH_INFO']}" method="post">
                 <input type="hidden" name="action" value="set">
                 <table>
diff --git a/toolserver/settings.py b/toolserver/settings.py
index f3609e5..fee9756 100644
--- a/toolserver/settings.py
+++ b/toolserver/settings.py
@@ -19,7 +19,7 @@ def main(context, environ, headers):
                 set_cookie(headers, cookies, key, query.project, 365)
     elif query.action == "delete":
         if query.cookie in cookies:
-            delete_cookie(headers, cookies, query.cookie)
+            delete_cookie(headers, cookies, query.cookie.encode("utf8"))
         elif query.all:
             for cookie in cookies.values():
                 delete_cookie(headers, cookies, cookie.key)