diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index 690367336..7e9d510ea 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -897,7 +897,7 @@ class ApplicationInstaller(multi.Thread): VALUES (LAST_INSERT_ID(),'8');""" % (prefix, username, password, prefix) out, err = proc.communicate( - file(finalPath + 'installation/sql/mysql/joomlaInstall.sql').read() + "\n" + usercreation) + open(finalPath + 'installation/sql/mysql/joomlaInstall.sql', 'rb').read() + ("\n" + usercreation).encode('utf-8')) shutil.rmtree(finalPath + "installation") diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 5c969457f..20ce290b1 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -1963,7 +1963,7 @@ class WebsiteManager: ## Installation salt = randomPassword.generate_pass(32) # return salt - password_hash = hashlib.md5(password + salt).hexdigest() + password_hash = hashlib.md5((password + salt).encode('utf-8')).hexdigest() password = password_hash + ":" + salt statusFile = open(tempStatusPath, 'w')