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 = '\n'+form.text form.html("

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.

") form.text_input('Name your FreedomBox', id="hostname", value=hostname) form.html("

Initial user and password. 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.

") 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 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() 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 = '\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)