From 504a1957088623bffb3afa859c42ba6c62ee55b8 Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Sat, 2 Nov 2013 14:56:00 +0000
Subject: [PATCH 1/3] Remove commit line from UserStore. This function was not
 defined in withsqlite, and also unnecessary since autocommit is on.

---
 modules/installed/lib/user_store.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/installed/lib/user_store.py b/modules/installed/lib/user_store.py
index 52863498a..a6ba6c20f 100644
--- a/modules/installed/lib/user_store.py
+++ b/modules/installed/lib/user_store.py
@@ -58,7 +58,6 @@ class UserStore(UserStoreModule, sqlite_db):
 
     def remove(self,username=None):
         self.__delitem__(username)
-        self.commit()
 
     def get_all(self):
         return self.items()

From 7b3a2fbe2cd906b8ec3a52c5f621669c95b08523 Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Sat, 2 Nov 2013 15:51:08 +0000
Subject: [PATCH 2/3] Remove completed TODO.

---
 modules/installed/lib/auth.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/installed/lib/auth.py b/modules/installed/lib/auth.py
index fb2ad2ac9..7e6384d98 100644
--- a/modules/installed/lib/auth.py
+++ b/modules/installed/lib/auth.py
@@ -6,8 +6,6 @@
 # http://tools.cherrypy.org/wiki/AuthenticationAndAccessRestrictions
 # on 1 February 2011.
 
-# TODO: DeprecationWarning: the md5 module is deprecated; use hashlib instead import md5
-
 import cherrypy
 import urllib, hashlib
 import cfg

From 7536b7387b65be47ef4d46e3229a80b915b88a69 Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Sat, 2 Nov 2013 16:05:05 +0000
Subject: [PATCH 3/3] Remove references to deleted md5.js file.

---
 modules/installed/first_boot.py   | 1 -
 modules/installed/system/users.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py
index 9d47e7cd9..6104d1a94 100644
--- a/modules/installed/first_boot.py
+++ b/modules/installed/first_boot.py
@@ -88,7 +88,6 @@ class FirstBoot(PagePlugin):
                         action="firstboot",
                         name="whats_my_name",
                         message=message)
-        form.text = '<script type="text/javascript" src="/static/js/md5.js"></script>\n'+form.text
         form.html("<p>For convenience, your FreedomBox needs a name.  It should be something short that doesn't contain spaces or punctuation.  'Willard' would be a good name.  'Freestyle McFreedomBox!!!' would not.</p>")
         form.text_input('Name your FreedomBox', id="hostname", value=hostname)
         form.html("<p><strong>Initial user and password.</strong> Access to this web interface is protected by knowing a username and password.  Provide one here to register the initial privileged user.  The password can be changed and other users added later.</p>")
diff --git a/modules/installed/system/users.py b/modules/installed/system/users.py
index 4277f1050..1d358e4fa 100644
--- a/modules/installed/system/users.py
+++ b/modules/installed/system/users.py
@@ -37,7 +37,6 @@ class add(FormPlugin, PagePlugin):
                         onsubmit="return md5ify('add_user_form', 'password')", 
                         name="add_user_form",
                         message=message)
-        form.text = '<script type="text/javascript" src="/static/js/md5.js"></script>\n'+form.text
         form.text_input(_("Username"), name="username", value=username)
         form.text_input(_("Full name"), name="name", value=name)
         form.text_input(_("Email"), name="email", value=email)