diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-08-10 10:04:03 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-08-10 10:04:03 -0500 |
| commit | 3b6b21c41101f1bb8be5cae096953b3907a38838 (patch) | |
| tree | 3fde1999936dc0962442da36b5abb031e5afb776 /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | 29a95907c36cd3e791bdb281948324c719a50f77 (diff) | |
| download | bcfg2-3b6b21c41101f1bb8be5cae096953b3907a38838.tar.gz bcfg2-3b6b21c41101f1bb8be5cae096953b3907a38838.tar.bz2 bcfg2-3b6b21c41101f1bb8be5cae096953b3907a38838.zip | |
Probes: Fix unicode probe handling
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 35ae9d479..ad25de194 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -9,6 +9,7 @@ import operator import lxml.etree import Bcfg2.Server import Bcfg2.Server.Plugin +from Bcfg2.Compat import unicode try: from django.db import models @@ -64,7 +65,10 @@ class ProbeData(str): # pylint: disable=E0012,R0924 .json, and .yaml properties to provide convenient ways to use ProbeData objects as XML, JSON, or YAML data """ def __new__(cls, data): - return str.__new__(cls, data.encode('utf-8')) + if isinstance(data, unicode): + return str.__new__(cls, data.encode('utf-8')) + else: + return str.__new__(cls, data) def __init__(self, data): # pylint: disable=W0613 str.__init__(self) |