Fixed XMLConfig issues.

Greg Turnquist · Greg Turnquist · commit 5150b01dec20 · 2010-06-29T12:51:15.000-05:00
diff --git a/src/springpython/config/_config_base.py b/src/springpython/config/_config_base.py
@@ -25,6 +25,13 @@
 from springpython.factory import ReflectiveObjectFactory
 from springpython.container import InvalidObjectScope
 
+def get_string(value):
+    """This function is used to parse text that could either be ASCII or unicode."""
+    try:
+        return str(value)
+    except UnicodeEncodeError:
+        return unicode(value)
+        
 class ObjectDef(object):
     """
     ObjectDef is a format-neutral way of storing object definition information. It includes
@@ -171,7 +178,7 @@ def __init__(self, name, value):
 
     def _replace_refs_with_actuals(self, obj, container):
         for i in range(0, len(self.value)):
-            self.logger.debug("Checking out %s, wondering if I need to do any replacement..." % str(self.value[i]))
+            self.logger.debug("Checking out %s, wondering if I need to do any replacement..." % get_string(self.value[i]))
             if hasattr(self.value[i], "ref"):
                 self.value[i] = container.get_object(self.value[i].ref)
             else:
diff --git a/src/springpython/config/_xml_config.py b/src/springpython/config/_xml_config.py
@@ -480,7 +480,7 @@ def _convert_list(self, list_node, id, name, ns):
         self.logger.debug("list: Parsing %s" % list_node)
         for element in list_node:
             if element.tag == ns+"value":
-                list.append(str(element.text))
+                list.append(get_string(element.text))
             elif element.tag == ns+"ref":
                 list.append(self._convert_ref(element, "%s.list[%s]" % (name, len(list))))
             elif element.tag == ns+"object":
@@ -502,7 +502,7 @@ def _convert_tuple(self, tuple_node, id, name, ns):
             self.logger.debug("tuple: Looking at %s" % element)
             if element.tag == ns+"value":
                 self.logger.debug("tuple: Appending %s" % element.text)
-                list.append(str(element.text))
+                list.append(get_string(element.text))
             elif element.tag == ns+"ref":
                 list.append(self._convert_ref(element, "%s.tuple(%s}" % (name, len(list))))
             elif element.tag == ns+"object":
@@ -523,7 +523,7 @@ def _convert_set(self, set_node, id, name, ns):
         for element in set_node:
             self.logger.debug("Looking at element %s" % element)
             if element.tag == ns+"value":
-                s.add(str(element.text))
+                s.add(get_string(element.text))
             elif element.tag == ns+"ref":
                 s.add(self._convert_ref(element, name + ".set"))
             elif element.tag == ns+"object":
@@ -566,14 +566,9 @@ def _convert_prop_def(self, comp, p, name, ns):
                 return self._convert_ref(p.find(ns+"ref"), name)
         elif "value" in p.attrib or p.find(ns+"value") is not None:
             if "value" in p.attrib:
-                return ValueDef(name, str(p.get("value")))
+                return ValueDef(name, get_string(p.get("value")))
             else:
-                text = p.find(ns+"value").text
-                try:
-                    text = str(text)
-                except UnicodeEncodeError, e:
-                    text = unicode(text)
-                return ValueDef(name, text)
+                return ValueDef(name, get_string(p.find(ns+"value").text))
         elif "dict" in p.attrib or p.find(ns+"dict") is not None:
             if "dict" in p.attrib:
                 return self._convert_dict(p.get("dict"), comp.get("id"), name, ns)
