diff --git a/README b/README index 5cdd6ebf2987d2683a6234140f0e9bc4d801dfb5..198b2e5a9bc9656698208510a0a4d2865d5066f7 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 7c32e5d61c9592623927b7131b0fd69f0a4f758b..68355f80713853893a3cb89cb92d799104ed8a0a 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 0cfa919835bdef2ffc20113e7c352df143e68d3b..d8e2df54e0af1cf217e4bccb6f71ce16d65e47fe 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 8622d6837262a43dba0199147f3a73d51bbac5ef..3e2bc3f5e09004812aacf3dd65fb78c794bb5994 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 51928ab43686dc7bef909d3135a7977bfee57143..ed399ce928bb610f7ced13220da55fe01043c6ee 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 31ba6af72a602f4f5548ad7633939b3eb26d16d7..8ea77859c2bf97a3d67887b05b86c0adf33a6c4c 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 0bdcc977ce36e0a6b07742dd7790b1b36a14996f..e73b0d4e0f8be568894c0e786e5c11dd56734b9d 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 0000000000000000000000000000000000000000..5e9838b46b8cc33d65c26a810ffa7b84ace68e7d --- /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 0000000000000000000000000000000000000000..4ff384f575b2a7076683e57f116042a07fa5d73b --- /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 4513f82b21e3ec5a46c4e1b33a105e62f52fd4c0..eb028c4604959d7621d32ea8f889405d23a8e790 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 4513f82b21e3ec5a46c4e1b33a105e62f52fd4c0..eb028c4604959d7621d32ea8f889405d23a8e790 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 6123e80fef1bb902574cb05f5c5d227a44d44d24..96afe49ff4181b2b7b329987f737859b0ead3eb6 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 6123e80fef1bb902574cb05f5c5d227a44d44d24..96afe49ff4181b2b7b329987f737859b0ead3eb6 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 adfb17b0f0a017cc27edc696d4821427288c42ad..63667bb9ba0a9f8c81aece4c9fe8bf1258246c77 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 adfb17b0f0a017cc27edc696d4821427288c42ad..63667bb9ba0a9f8c81aece4c9fe8bf1258246c77 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 6dca33026c104fd476d4cf05b17b0d2c48ace3d3..c3102f49f208040c8c5757041542e1e002870af6 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 6dca33026c104fd476d4cf05b17b0d2c48ace3d3..c3102f49f208040c8c5757041542e1e002870af6 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 09570e1941a1160d5eefcee7df3bd64fe8f975df..74747978d07ec88dbd96d5bcc38dca593835cef3 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 09570e1941a1160d5eefcee7df3bd64fe8f975df..74747978d07ec88dbd96d5bcc38dca593835cef3 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 be3de4132c9bd174720ccb28975ece1ec08862ca..ba6a3807446f43ecd2bdc8ed365f8f28c5c4783e 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 be3de4132c9bd174720ccb28975ece1ec08862ca..ba6a3807446f43ecd2bdc8ed365f8f28c5c4783e 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 202cc62871047522189d6c87ad9eb9ab9e4a8421..21f333e2c1c5aed468c315c90a185e9eb4f97e4b 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 202cc62871047522189d6c87ad9eb9ab9e4a8421..21f333e2c1c5aed468c315c90a185e9eb4f97e4b 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 49eb1551677165fab4396407ab89a587a8e330ae..8965b0841e90cc5bf9065239aef33ec417e010d5 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 49eb1551677165fab4396407ab89a587a8e330ae..8965b0841e90cc5bf9065239aef33ec417e010d5 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 6462296eb43bef0445f1da38e2403060835a8763..6fe49290abe6edf80958b798ee7b58f85e0d39dc 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 6462296eb43bef0445f1da38e2403060835a8763..6fe49290abe6edf80958b798ee7b58f85e0d39dc 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 d9ce95034dcfea1ee1f3830e24fd2228fd81338b..75755fea7a66890468a0edf9d74159616bfc835f 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 d9ce95034dcfea1ee1f3830e24fd2228fd81338b..75755fea7a66890468a0edf9d74159616bfc835f 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 86ef16fe1441a4df689dc77c140e80fd664c3773..56df5a9b293af5de105730154977deee6e81f859 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 86ef16fe1441a4df689dc77c140e80fd664c3773..56df5a9b293af5de105730154977deee6e81f859 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 1842db587cf3bfe3210397c59f43b923c8c0d666..9776f19e070adcbe15d01b72c7664ffd71d54461 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 1842db587cf3bfe3210397c59f43b923c8c0d666..9776f19e070adcbe15d01b72c7664ffd71d54461 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 e121a6b9c44609859fbd572fb85168d5e39d4ead..0ce418cf302b1bfbb6e58651ec3c926b35b90b39 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 e121a6b9c44609859fbd572fb85168d5e39d4ead..0ce418cf302b1bfbb6e58651ec3c926b35b90b39 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 4c24c6007193149a2bdb50d4c3ab9a52af7015e2..c2d2220da05b010ac0d70aa90825f3df957778bc 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 4c24c6007193149a2bdb50d4c3ab9a52af7015e2..c2d2220da05b010ac0d70aa90825f3df957778bc 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 5f2ebd0ef75074325a48d8d749e64c03c366efbf..96730d24716cbd34de2c74b933f7557338849990 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 5f2ebd0ef75074325a48d8d749e64c03c366efbf..96730d24716cbd34de2c74b933f7557338849990 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 76817ae41bfbd9d0f763c8680898d22005db50ac..956f2f67816e5d0d9a954634149d7f3cdcc3c44f 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 76817ae41bfbd9d0f763c8680898d22005db50ac..956f2f67816e5d0d9a954634149d7f3cdcc3c44f 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 70e5ffae981ab43904d6901b56d398552ddfa132..3c59aa995a702ddbd80a4f77f48262c7a786e508 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 70e5ffae981ab43904d6901b56d398552ddfa132..3c59aa995a702ddbd80a4f77f48262c7a786e508 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 54de0975d1c3e2cbfc0f0ad9545ab046be475b05..8dae63aca4afb82bb72c84ba6c4290beaa542440 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 54de0975d1c3e2cbfc0f0ad9545ab046be475b05..8dae63aca4afb82bb72c84ba6c4290beaa542440 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 db7699420dfd015b6ae2c16a67fd3fd983c6ab48..84e2ae739c1cd821cde3a4337311f006bd75caa0 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 db7699420dfd015b6ae2c16a67fd3fd983c6ab48..84e2ae739c1cd821cde3a4337311f006bd75caa0 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 75d42db49061beaa9285a6c6a89d4e2dcc4a6fd4..8d7435a442e1af61b94ebde6a515b29f3dc2c27b 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 75d42db49061beaa9285a6c6a89d4e2dcc4a6fd4..8d7435a442e1af61b94ebde6a515b29f3dc2c27b 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 3a9d416596b41c7ae9904be075260b98be870c83..46348ce28b43e0d40a9c67523c0b9e625d12a898 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