aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-07-06 14:43:51 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-07-06 14:43:51 +0100
commit5a6a960005dec356eba224bdf5e7751ffd833e6c (patch)
tree4cda1d84eb0c9fff94344960d2def9a85f4c594d /tools
parentac9fcaa957b4305d0f9417b1bc428e08bb008d8a (diff)
downloadxen-5a6a960005dec356eba224bdf5e7751ffd833e6c.tar.gz
xen-5a6a960005dec356eba224bdf5e7751ffd833e6c.tar.bz2
xen-5a6a960005dec356eba224bdf5e7751ffd833e6c.zip
[ACM] Support for initial unicode handling of strings in policies.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/security/xensec_ezpolicy16
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/security/xensec_ezpolicy b/tools/security/xensec_ezpolicy
index 970fb380b4..458ff556f2 100644
--- a/tools/security/xensec_ezpolicy
+++ b/tools/security/xensec_ezpolicy
@@ -1102,8 +1102,10 @@ def org2dict():
for i in iterchildren(app.win.orgs.GetRootItem()):
d = []
for j in iterchildren(i):
- d.append(str(app.win.orgspanel.orgs.GetItemText(j)))
- o.append([str(app.win.orgspanel.orgs.GetItemText(i)) , d])
+ d.append(
+ str(app.win.orgspanel.orgs.GetItemText(j).encode("utf-8")))
+ o.append([str(app.win.orgspanel.orgs.GetItemText(i).encode("utf-8")),
+ d])
dic['orgs'] = o
c=[]
for i in app.win.conspanel.conflictsets:
@@ -1175,12 +1177,14 @@ def printPolicy(fd, types, cons):
continue
#name is optional but must be set
if i[0]:
- rer_name = str(i[0])
+ rer_name = i[0]
else:
- rer_name = str("RER")
- fd.write(""" <Conflict name=\"%s\">\n""" % rer_name)
+ rer_name = "RER"
+ fd.write(""" <Conflict name=\"""" +
+ rer_name.encode("utf-8") + """\">\n""")
for j in i[1]:
- fd.write(""" <Type>%s</Type>\n""" % str(j))
+ typ = j.encode("utf-8")
+ fd.write(""" <Type>%s</Type>\n""" % typ)
fd.write(""" </Conflict>\n""")
fd.write(""" </ConflictSets>\n""")