diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2016-02-08 16:33:07 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-02-09 00:59:05 +0000 |
| commit | 5eee50d19640c3c1ee5c2584d6f69e0ce5423214 (patch) | |
| tree | b0c8b3050a2db0059ce9f17a290297de89ff6986 /azurelinuxagent/logger.py | |
| parent | db0601bdd8753aad210589ec9ce22ee67984df27 (diff) | |
| parent | 9bb648958a406f80ab2097969e2e1ac65fec11a0 (diff) | |
| download | vyos-walinuxagent-5eee50d19640c3c1ee5c2584d6f69e0ce5423214.tar.gz vyos-walinuxagent-5eee50d19640c3c1ee5c2584d6f69e0ce5423214.zip | |
Import patches-applied version 2.1.3-0ubuntu1 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: db0601bdd8753aad210589ec9ce22ee67984df27
Unapplied parent: 9bb648958a406f80ab2097969e2e1ac65fec11a0
New changelog entries:
* New upstream release (LP: #1543359):
- Bug fixes for extension handling
- Feature enablement for AzureStack.
Diffstat (limited to 'azurelinuxagent/logger.py')
| -rw-r--r-- | azurelinuxagent/logger.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/azurelinuxagent/logger.py b/azurelinuxagent/logger.py index 21c02a6..6c6b406 100644 --- a/azurelinuxagent/logger.py +++ b/azurelinuxagent/logger.py @@ -22,7 +22,7 @@ Log utils """ import os import sys -from azurelinuxagent.future import text +from azurelinuxagent.future import ustr from datetime import datetime class Logger(object): @@ -49,8 +49,8 @@ class Logger(object): def log(self, level, msg_format, *args): #if msg_format is not unicode convert it to unicode - if type(msg_format) is not text: - msg_format = text(msg_format, errors="backslashreplace") + if type(msg_format) is not ustr: + msg_format = ustr(msg_format, errors="backslashreplace") if len(args) > 0: msg = msg_format.format(*args) else: @@ -63,7 +63,7 @@ class Logger(object): else: log_item = u"{0} {1} {2}\n".format(time, level_str, msg) - log_item = text(log_item.encode('ascii', "backslashreplace"), + log_item = ustr(log_item.encode('ascii', "backslashreplace"), encoding="ascii") for appender in self.appenders: appender.write(level, log_item) |