Skip to content

Commit

Permalink
fixing broken build
Browse files Browse the repository at this point in the history
  • Loading branch information
thingsplode committed Sep 14, 2018
1 parent e600378 commit faba051
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions appkernel/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ def init_logger(self, log_folder, level=logging.DEBUG):
handler.setLevel(level)
handler.setFormatter(formatter)
self.app.logger.setLevel(level)
#self.app.logger.addHandler(handler)
self.app.logger.handlers=[handler]
# self.app.logger.addHandler(handler)
self.app.logger.handlers = [handler]
self.app.logger.info('Logger initialised')

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion appkernel/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ def hash_content(password):
if password.startswith('$pbkdf2-sha256'):
return password
else:
return pbkdf2_sha256.hash(password, rounds=rounds, salt_size=salt_size)
return pbkdf2_sha256.using(rounds=rounds, salt_size=salt_size).hash(password)

return hash_content

0 comments on commit faba051

Please sign in to comment.