From 79b5b73e97f4316dd1fe344b2375da5afa3e29ed Mon Sep 17 00:00:00 2001 From: dkuhlman <none@none> Date: Sun, 14 Sep 2014 19:02:31 -0700 Subject: [PATCH] Fix for export of simpleType lists --- README | 4 ++++ generateDS.py | 27 +++++++++++++------------ generateDS.txt | 2 +- gui/generateds_gui.py | 2 +- librarytemplate_howto.txt | 2 +- process_includes.py | 2 +- setup.py | 2 +- tests/OnePer/compare | 7 +++++++ tests/OnePer/copy | 6 ++++++ tests/OnePer/oneperType00_1One.py | 16 +++++++-------- tests/OnePer/oneperType00_2One.py | 16 +++++++-------- tests/OnePer/oneperType01_1One.py | 16 +++++++-------- tests/OnePer/oneperType01_2One.py | 16 +++++++-------- tests/OnePer/oneperType02_1One.py | 16 +++++++-------- tests/OnePer/oneperType02_2One.py | 16 +++++++-------- tests/OnePer/oneperType03_1One.py | 16 +++++++-------- tests/OnePer/oneperType03_2One.py | 16 +++++++-------- tests/abstract_type1_sup.py | 16 +++++++-------- tests/abstract_type2_sup.py | 16 +++++++-------- tests/annotations1_sup.py | 16 +++++++-------- tests/annotations2_sup.py | 16 +++++++-------- tests/anonymous_type1_sup.py | 16 +++++++-------- tests/anonymous_type2_sup.py | 16 +++++++-------- tests/anysimpletype1_sup.py | 16 +++++++-------- tests/anysimpletype2_sup.py | 16 +++++++-------- tests/anywildcard1_sup.py | 16 +++++++-------- tests/anywildcard2_sup.py | 16 +++++++-------- tests/attr_groups1_sup.py | 16 +++++++-------- tests/attr_groups2_sup.py | 16 +++++++-------- tests/extensions1_sup.py | 16 +++++++-------- tests/extensions2_sup.py | 16 +++++++-------- tests/mapcleanname1_sup.py | 16 +++++++-------- tests/mapcleanname2_sup.py | 16 +++++++-------- tests/out1_sup.py | 16 +++++++-------- tests/out2_sup.py | 16 +++++++-------- tests/people_procincl1_sup.py | 16 +++++++-------- tests/people_procincl2_sup.py | 16 +++++++-------- tests/prefix_classname1_sup.py | 16 +++++++-------- tests/prefix_classname2_sup.py | 16 +++++++-------- tests/recursive_simpletype1_sup.py | 16 +++++++-------- tests/recursive_simpletype2_sup.py | 16 +++++++-------- tests/simplecontent_restriction1_sup.py | 16 +++++++-------- tests/simplecontent_restriction2_sup.py | 16 +++++++-------- tests/simpletype_memberspecs1_sup.py | 16 +++++++-------- tests/simpletype_memberspecs2_sup.py | 16 +++++++-------- tests/simpletypes_other1_sup.py | 16 +++++++-------- tests/simpletypes_other2_sup.py | 16 +++++++-------- tests/to_etree1_sup.py | 16 +++++++-------- tests/to_etree2_sup.py | 16 +++++++-------- tutorial/generateds_tutorial.txt | 2 +- 50 files changed, 357 insertions(+), 339 deletions(-) create mode 100755 tests/OnePer/compare create mode 100755 tests/OnePer/copy diff --git a/README b/README index 5cdd6eb..198b2e5 100644 --- a/README +++ b/README @@ -141,6 +141,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Change history -------------- +Version 2.13b (09/14/2014) +- Fixed export of simpleType lists (added "' '.join(data)". Thanks + to Per Rosengren for catching this. + Version 2.13a (09/09/2014) - Minor fix to function generateToEtreeChildren. Must generate call to get_valueOf only when defined (i.e. when element is diff --git a/generateDS.py b/generateDS.py index 7c32e5d..68355f8 100755 --- a/generateDS.py +++ b/generateDS.py @@ -179,7 +179,7 @@ logging.disable(logging.INFO) # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.13a' +VERSION = '2.13b' ##VERSION## GenerateProperties = 0 @@ -3522,10 +3522,11 @@ def generateBuildStandard_1( ElementDict[childType].getSimpleType()): typeName = ElementDict[childType].getType() # fixlist - if (child.getSimpleType() in SimpleTypeDict and - SimpleTypeDict[child.getSimpleType()].isListType()): - wrt(" self.%s = self.%s.split()\n" % ( - mappedName, mappedName, )) + # splitting the list is now done in gds_validate_xxx_list. +## if (child.getSimpleType() in SimpleTypeDict and +## SimpleTypeDict[child.getSimpleType()].isListType()): +## wrt(" self.%s = self.%s.split()\n" % ( +## mappedName, mappedName, )) typeName = child.getSimpleType() if typeName and typeName in SimpleTypeDict: wrt(" self.validate_%s(self.%s) # validate type %s\n" % ( @@ -4406,7 +4407,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%%s' %% input_data + return '%%s' %% ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -4414,13 +4415,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%%.15f' %% input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%%s' %% input_data + return '%%s' %% ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -4428,13 +4429,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%%e' %% input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%%s' %% input_data + return '%%s' %% ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -4442,13 +4443,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%%s' %% input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%%s' %% input_data + return '%%s' %% ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -4457,7 +4458,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/generateDS.txt b/generateDS.txt index 0cfa919..d8e2df5 100644 --- a/generateDS.txt +++ b/generateDS.txt @@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema .. version -:revision: 2.13a +:revision: 2.13b .. version diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py index 8622d68..3e2bc3f 100755 --- a/gui/generateds_gui.py +++ b/gui/generateds_gui.py @@ -31,7 +31,7 @@ from libgenerateDS.gui import generateds_gui_session # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.13a' +VERSION = '2.13b' ##VERSION## diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt index 51928ab..ed399ce 100644 --- a/librarytemplate_howto.txt +++ b/librarytemplate_howto.txt @@ -8,7 +8,7 @@ How to package a generateDS.py generated library .. version -:revision: 2.13a +:revision: 2.13b .. version diff --git a/process_includes.py b/process_includes.py index 31ba6af..8ea7785 100755 --- a/process_includes.py +++ b/process_includes.py @@ -30,7 +30,7 @@ from lxml import etree # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.13a' +VERSION = '2.13b' ##VERSION## CatalogDict = {} diff --git a/setup.py b/setup.py index 0bdcc97..e73b0d4 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup(name="generateDS", # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## - version="2.13a", + version="2.13b", ##VERSION## author="Dave Kuhlman", author_email="dkuhlman@davekuhlman.org", diff --git a/tests/OnePer/compare b/tests/OnePer/compare new file mode 100755 index 0000000..5e9838b --- /dev/null +++ b/tests/OnePer/compare @@ -0,0 +1,7 @@ +#!/bin/bash +# +# Usage: +# ./compare N where N = 0 or 1 or 2 or 3 +# +#diffless.py oneperType0$1_?One.py +diff -u oneperType0$1_2One.py oneperType0$1_1One.py | vim -R - diff --git a/tests/OnePer/copy b/tests/OnePer/copy new file mode 100755 index 0000000..4ff384f --- /dev/null +++ b/tests/OnePer/copy @@ -0,0 +1,6 @@ +#!/bin/bash +cp oneperType00_1One.py oneperType00_2One.py +cp oneperType01_1One.py oneperType01_2One.py +cp oneperType02_1One.py oneperType02_2One.py +cp oneperType03_1One.py oneperType03_2One.py + diff --git a/tests/OnePer/oneperType00_1One.py b/tests/OnePer/oneperType00_1One.py index 4513f82..eb028c4 100644 --- a/tests/OnePer/oneperType00_1One.py +++ b/tests/OnePer/oneperType00_1One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py index 4513f82..eb028c4 100644 --- a/tests/OnePer/oneperType00_2One.py +++ b/tests/OnePer/oneperType00_2One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType01_1One.py b/tests/OnePer/oneperType01_1One.py index 6123e80..96afe49 100644 --- a/tests/OnePer/oneperType01_1One.py +++ b/tests/OnePer/oneperType01_1One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py index 6123e80..96afe49 100644 --- a/tests/OnePer/oneperType01_2One.py +++ b/tests/OnePer/oneperType01_2One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType02_1One.py b/tests/OnePer/oneperType02_1One.py index adfb17b..63667bb 100644 --- a/tests/OnePer/oneperType02_1One.py +++ b/tests/OnePer/oneperType02_1One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py index adfb17b..63667bb 100644 --- a/tests/OnePer/oneperType02_2One.py +++ b/tests/OnePer/oneperType02_2One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType03_1One.py b/tests/OnePer/oneperType03_1One.py index 6dca330..c3102f4 100644 --- a/tests/OnePer/oneperType03_1One.py +++ b/tests/OnePer/oneperType03_1One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py index 6dca330..c3102f4 100644 --- a/tests/OnePer/oneperType03_2One.py +++ b/tests/OnePer/oneperType03_2One.py @@ -125,7 +125,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -133,13 +133,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -147,13 +147,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -161,13 +161,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -176,7 +176,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py index 09570e1..7474797 100644 --- a/tests/abstract_type1_sup.py +++ b/tests/abstract_type1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/abstract_type2_sup.py b/tests/abstract_type2_sup.py index 09570e1..7474797 100644 --- a/tests/abstract_type2_sup.py +++ b/tests/abstract_type2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py index be3de41..ba6a380 100644 --- a/tests/annotations1_sup.py +++ b/tests/annotations1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/annotations2_sup.py b/tests/annotations2_sup.py index be3de41..ba6a380 100644 --- a/tests/annotations2_sup.py +++ b/tests/annotations2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py index 202cc62..21f333e 100644 --- a/tests/anonymous_type1_sup.py +++ b/tests/anonymous_type1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/anonymous_type2_sup.py b/tests/anonymous_type2_sup.py index 202cc62..21f333e 100644 --- a/tests/anonymous_type2_sup.py +++ b/tests/anonymous_type2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py index 49eb155..8965b08 100644 --- a/tests/anysimpletype1_sup.py +++ b/tests/anysimpletype1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/anysimpletype2_sup.py b/tests/anysimpletype2_sup.py index 49eb155..8965b08 100644 --- a/tests/anysimpletype2_sup.py +++ b/tests/anysimpletype2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py index 6462296..6fe4929 100644 --- a/tests/anywildcard1_sup.py +++ b/tests/anywildcard1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/anywildcard2_sup.py b/tests/anywildcard2_sup.py index 6462296..6fe4929 100644 --- a/tests/anywildcard2_sup.py +++ b/tests/anywildcard2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py index d9ce950..75755fe 100644 --- a/tests/attr_groups1_sup.py +++ b/tests/attr_groups1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/attr_groups2_sup.py b/tests/attr_groups2_sup.py index d9ce950..75755fe 100644 --- a/tests/attr_groups2_sup.py +++ b/tests/attr_groups2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py index 86ef16f..56df5a9 100644 --- a/tests/extensions1_sup.py +++ b/tests/extensions1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/extensions2_sup.py b/tests/extensions2_sup.py index 86ef16f..56df5a9 100644 --- a/tests/extensions2_sup.py +++ b/tests/extensions2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py index 1842db5..9776f19 100644 --- a/tests/mapcleanname1_sup.py +++ b/tests/mapcleanname1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/mapcleanname2_sup.py b/tests/mapcleanname2_sup.py index 1842db5..9776f19 100644 --- a/tests/mapcleanname2_sup.py +++ b/tests/mapcleanname2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/out1_sup.py b/tests/out1_sup.py index e121a6b..0ce418c 100644 --- a/tests/out1_sup.py +++ b/tests/out1_sup.py @@ -123,7 +123,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -131,13 +131,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -145,13 +145,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -159,13 +159,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -174,7 +174,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/out2_sup.py b/tests/out2_sup.py index e121a6b..0ce418c 100644 --- a/tests/out2_sup.py +++ b/tests/out2_sup.py @@ -123,7 +123,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -131,13 +131,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -145,13 +145,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -159,13 +159,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -174,7 +174,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py index 4c24c60..c2d2220 100644 --- a/tests/people_procincl1_sup.py +++ b/tests/people_procincl1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/people_procincl2_sup.py b/tests/people_procincl2_sup.py index 4c24c60..c2d2220 100644 --- a/tests/people_procincl2_sup.py +++ b/tests/people_procincl2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py index 5f2ebd0..96730d2 100644 --- a/tests/prefix_classname1_sup.py +++ b/tests/prefix_classname1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/prefix_classname2_sup.py b/tests/prefix_classname2_sup.py index 5f2ebd0..96730d2 100644 --- a/tests/prefix_classname2_sup.py +++ b/tests/prefix_classname2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py index 76817ae..956f2f6 100644 --- a/tests/recursive_simpletype1_sup.py +++ b/tests/recursive_simpletype1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/recursive_simpletype2_sup.py b/tests/recursive_simpletype2_sup.py index 76817ae..956f2f6 100644 --- a/tests/recursive_simpletype2_sup.py +++ b/tests/recursive_simpletype2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py index 70e5ffa..3c59aa9 100644 --- a/tests/simplecontent_restriction1_sup.py +++ b/tests/simplecontent_restriction1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/simplecontent_restriction2_sup.py b/tests/simplecontent_restriction2_sup.py index 70e5ffa..3c59aa9 100644 --- a/tests/simplecontent_restriction2_sup.py +++ b/tests/simplecontent_restriction2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py index 54de097..8dae63a 100644 --- a/tests/simpletype_memberspecs1_sup.py +++ b/tests/simpletype_memberspecs1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/simpletype_memberspecs2_sup.py b/tests/simpletype_memberspecs2_sup.py index 54de097..8dae63a 100644 --- a/tests/simpletype_memberspecs2_sup.py +++ b/tests/simpletype_memberspecs2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py index db76994..84e2ae7 100644 --- a/tests/simpletypes_other1_sup.py +++ b/tests/simpletypes_other1_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/simpletypes_other2_sup.py b/tests/simpletypes_other2_sup.py index db76994..84e2ae7 100644 --- a/tests/simpletypes_other2_sup.py +++ b/tests/simpletypes_other2_sup.py @@ -124,7 +124,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -132,13 +132,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -146,13 +146,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -160,13 +160,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -175,7 +175,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py index 75d42db..8d7435a 100644 --- a/tests/to_etree1_sup.py +++ b/tests/to_etree1_sup.py @@ -126,7 +126,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -134,13 +134,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -148,13 +148,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -162,13 +162,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -177,7 +177,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tests/to_etree2_sup.py b/tests/to_etree2_sup.py index 75d42db..8d7435a 100644 --- a/tests/to_etree2_sup.py +++ b/tests/to_etree2_sup.py @@ -126,7 +126,7 @@ except ImportError, exp: def gds_validate_integer(self, input_data, node, input_name=''): return input_data def gds_format_integer_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_integer_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -134,13 +134,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of integers') - return input_data + return values def gds_format_float(self, input_data, input_name=''): return ('%.15f' % input_data).rstrip('0') def gds_validate_float(self, input_data, node, input_name=''): return input_data def gds_format_float_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_float_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -148,13 +148,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of floats') - return input_data + return values def gds_format_double(self, input_data, input_name=''): return '%e' % input_data def gds_validate_double(self, input_data, node, input_name=''): return input_data def gds_format_double_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_double_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -162,13 +162,13 @@ except ImportError, exp: float(value) except (TypeError, ValueError): raise_parse_error(node, 'Requires sequence of doubles') - return input_data + return values def gds_format_boolean(self, input_data, input_name=''): return ('%s' % input_data).lower() def gds_validate_boolean(self, input_data, node, input_name=''): return input_data def gds_format_boolean_list(self, input_data, input_name=''): - return '%s' % input_data + return '%s' % ' '.join(input_data) def gds_validate_boolean_list(self, input_data, node, input_name=''): values = input_data.split() for value in values: @@ -177,7 +177,7 @@ except ImportError, exp: node, 'Requires sequence of booleans ' '("true", "1", "false", "0")') - return input_data + return values def gds_validate_datetime(self, input_data, node, input_name=''): return input_data def gds_format_datetime(self, input_data, input_name=''): diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt index 3a9d416..46348ce 100644 --- a/tutorial/generateds_tutorial.txt +++ b/tutorial/generateds_tutorial.txt @@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial .. version -:revision: 2.13a +:revision: 2.13b .. version -- GitLab