Changeset 3316

Timestamp:

05/09/08 22:15:01 (2 months ago)

Author:

borning

Message:

added an xml type quoted_string; renamed parser action from empty_string_to_None to blank_to_None

Location:

trunk/opus_core/configurations

Files:

• test_configurations/manytypes.xml (modified) (1 diff)
• xml_configuration.py (modified) (3 diffs)

trunk/opus_core/configurations/test_configurations/manytypes.xml

@@ -4 +4 @@
     <test_scenario type="scenario">
       <description type="string">a test configuration</description>
+      <quotedthing type="quoted_string">test\test</quotedthing>
       <empty1 type="string" />
-      <empty2 parser_action="empty_string_to_None" type="string" />
-      <emptypassword parser_action="empty_string_to_None" type="password" />
+      <empty2 parser_action="blank_to_None" type="string" />
+      <emptypassword parser_action="blank_to_None" type="password" />
       <year type="integer">1980</year>
       <mybool type="boolean" choices="True|False">True</mybool>
       <ten type="float">10.0</ten>
-      <emptyint type="integer" parser_action="empty_string_to_None" ></emptyint>
-      <emptyfloat type="float" parser_action="empty_string_to_None" ></emptyfloat>
+      <emptyint type="integer" parser_action="blank_to_None" ></emptyint>
+      <emptyfloat type="float" parser_action="blank_to_None" ></emptyfloat>
       <years type="tuple">
         <startyear type="integer">1980</startyear>

trunk/opus_core/configurations/xml_configuration.py

@@ -252 +252 @@
         elif type_name=='string' or type_name=='password' or type_name=='variable_definition' or type_name=='path':
             return self._convert_string_to_data(node, str)
+        elif type_name=='quoted_string':
+            return "'%s'" % node.text
         elif type_name=='scenario_name':
             return node.text
@@ -312 +314 @@
     def _convert_string_to_data(self, node, func):
         if node.text is None:
-            if node.get('parser_action', '')=='empty_string_to_None':
+            if node.get('parser_action', '')=='blank_to_None':
                 return None
             elif func==str:
@@ -416 +418 @@
         self.assertEqual(config, 
                          {'description': 'a test configuration',
+                          'quotedthing': r"'test\test'",
                           'empty1': '',
                           'empty2': None,