diff --git a/gateone/__init__.py b/gateone/__init__.py index ec622676..55752a98 100644 --- a/gateone/__init__.py +++ b/gateone/__init__.py @@ -3,7 +3,7 @@ __version_info__ = (1, 2, 0) __license__ = "AGPLv3" # ...or proprietary (see LICENSE.txt) __author__ = 'Dan McDougall ' -__commit__ = "20140830220553" # Gets replaced by git (holds the date/time) +__commit__ = "20140830222151" # Gets replaced by git (holds the date/time) import os GATEONE_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/gateone/core/server.py b/gateone/core/server.py index 4a9719aa..91ca2edd 100755 --- a/gateone/core/server.py +++ b/gateone/core/server.py @@ -15,7 +15,7 @@ "version": __version__ } __author__ = 'Dan McDougall ' -__commit__ = "20140830220553" # Gets replaced by git (holds the date/time) +__commit__ = "20140830222151" # Gets replaced by git (holds the date/time) # NOTE: Docstring includes reStructuredText markup for use with Sphinx. __doc__ = '''\ @@ -939,6 +939,8 @@ def broadcast_message(args=sys.argv, message=""): with io.open(broadcast_file, 'w') as b: if not message: for message in args: + if isinstance(message, bytes): + message = message.decode('utf-8') logging.info(_("Broadcasting %s to all users") % repr(message)) b.write(message) diff --git a/gateone/static/gateone.js b/gateone/static/gateone.js index 68b523d5..3c2602b9 100644 --- a/gateone/static/gateone.js +++ b/gateone/static/gateone.js @@ -81,7 +81,7 @@ The base object for all Gate One modules/plugins. */ GateOne.__name__ = "GateOne"; GateOne.__version__ = "1.2"; -GateOne.__commit__ = "20140830220553"; +GateOne.__commit__ = "20140830222151"; GateOne.__repr__ = function () { return "[" + this.__name__ + " " + this.__version__ + "]"; };