Ticket #549: unicode_support.diff

src/lib/Server/Plugins/Cfg.py

@@ -77 +77 @@
         if entry.get('encoding') == 'base64':
             entry.text = binascii.b2a_base64(data)
         else:
-            entry.text = data            
+            entry.text = unicode(data, "utf-8")
         if entry.text in ['', None]:
             entry.set('empty', 'true')
 

src/lib/Server/Plugins/TCheetah.py

@@ -34 +34 @@
         self.template.path = entry.get('realname', entry.get('name'))
         
         try:
-            entry.text = str(self.template)
+            entry.text = unicode(str(self.template),'UTF-8')
         except:
             (a, b, c) = sys.exc_info()
             msg = traceback.format_exception(a, b, c, limit=2)[-1][:-1]

src/lib/Client/Tools/POSIX.py

@@ -320 +320 @@
                 self.logger.error("Cannot verify incomplete ConfigFile %s" % (entry.get('name')))
                 return False
             tempdata = entry.text
+            if type(tempdata) == unicode:
+                tempdata = tempdata.encode('UTF-8')
         try:
             content = open(entry.get('name')).read()
         except IOError, error:
             self.logger.error("Failed to read %s: %s" % (error.filename, error.strerror))
             return False
+        # comparaison should be done with figerprints or md5sum so it would be faster 
+        # for big binary files
         contentStatus = content == tempdata
         if not contentStatus:
             if tbin or not isString(content):
@@ -348 +352 @@
                         break
                 if do_diff:
                     diff = '\n'.join(rawdiff)
-                    entry.set("current_bdiff", binascii.b2a_base64(diff))
+#                    entry.set("current_bdiff", binascii.b2a_base64(diff))
+#                    entry.set("current_diff", diff)
                     udiff = '\n'.join([x for x in \
                                        difflib.unified_diff(content.split('\n'), \
                                                             tempdata.split('\n'))])
@@ -356 +361 @@
                         eudiff = udiff.encode('ascii')
                     except:
                         eudiff = "Binary file: no diff printed"
+ 
                     nqtext = entry.get('qtext', '')
 
                     if nqtext:
@@ -417 +423 @@
             elif entry.get('empty', 'false') == 'true':
                 filedata = ''
             else:
-                filedata = entry.text
+                if type(entry.text) == unicode:
+                    filedata = entry.text.encode('UTF-8')
+                else:
+                    filedata = entry.text
             newfile.write(filedata)
             newfile.close()
             try:

src/sbin/bcfg2-server

@@ -103 +103 @@
             for plugin in self.Core.plugins.values():
                 for probe in plugin.GetProbes(meta):
                     resp.append(probe)
-            return tostring(resp)
+            data = "<?xml version='1.0' encoding='UTF-8' ?>\n"
+            data += tostring(resp, encoding='UTF-8')
+            return data
         except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError:
             warning = 'Client metadata resolution error for %s' % address[0]
             self.logger.warning(warning)
@@ -157 +159 @@
         '''Build config for a client'''
         try:
             client = self.Core.metadata.resolve_client(address)
-            return tostring(self.Core.BuildConfiguration(client))
+            return "<?xml version='1.0' encoding='UTF-8' ?>\n" + \
+                   tostring(self.Core.BuildConfiguration(client), encoding='UTF-8')
         except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError:
             self.logger.warning("Metadata consistency failure for %s" % (address))
             raise Fault, (6, "Metadata consistency failure")

src/sbin/bcfg2-info

@@ -97 +97 @@
         if len(args.split()) == 2:
             client, ofile = args.split()
             output = open(ofile, 'w')
-            data = lxml.etree.tostring(self.BuildConfiguration(client))
+            output.write("<?xml version='1.0' encoding='UTF-8'?>")
+            data = lxml.etree.tostring(self.BuildConfiguration(client), encoding='UTF-8')
             output.write(data)
             output.close()
         else:
@@ -121 +122 @@
             entry = lxml.etree.Element('ConfigFile', name=fname)
             metadata = self.metadata.get_metadata(client)
             self.Bind(entry, metadata)
-            print lxml.etree.tostring(entry)
+            print lxml.etree.tostring(entry, encoding="UTF-8")
         else:
             print 'Usage: buildfile filename hostname'