diff options
| -rw-r--r-- | src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py index 5c50c614d..6f86cd3a3 100644 --- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py +++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py @@ -11,6 +11,7 @@ from django.utils.safestring import mark_safe from datetime import datetime, timedelta from Bcfg2.Reporting.utils import filter_list from Bcfg2.Reporting.models import Group +from Bcfg2.Reporting.views import render_history_view register = template.Library() @@ -213,7 +214,7 @@ class AddUrlFilter(template.Node): def __init__(self, filter_name, filter_value): self.filter_name = filter_name self.filter_value = filter_value - self.fallback_view = 'Bcfg2.Reporting.views.render_history_view' + self.fallback_view = render_history_view def render(self, context): link = '#' diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 0a0ed9414..270bfa62d 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -307,7 +307,8 @@ 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): - if isinstance(data, unicode): + # prevent double encoding utf-8 in python3 + if isinstance(data, unicode) and not isinstance(data, str): return str.__new__(cls, data.encode('utf-8')) else: return str.__new__(cls, data) |