diff --git a/README.rst b/README.rst
index 8c9435bf427b89ae7551e1c51b9a721186bc4f3d..3cd952bf001976e2cdcc774356376f2ac402198b 100644
--- a/README.rst
+++ b/README.rst
@@ -141,6 +141,20 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.28b (08/22/2017)
+
+- Fix for Django models and forms generation -- "float" data type
+ was being mapped and was not treated as a simple data type.
+ Thanks to Sriram Sundar for catching and reporting this.
+- Sriram also requested that in the Django models and forms
+ generation, we be able to omit the "_model" and "_form" suffix on
+ generated class names. There is now a "--no-class-suffixes"
+ command line option accepted by both gends_run_gen_django.py
+ and gends_generate_django.py to do that. Thanks to Sriram for
+ this suggestion.
+- Added Python version to the information in the comments at the top
+ of generated modules.
+
Version 2.28a (06/23/2017)
Significant work by Alim Gokkaya. Thank you, Alim.
diff --git a/django/gends_generate_django.py b/django/gends_generate_django.py
index e40ae06162b54a2485883219596b411b61f25443..28e7913366029ccbb8612ba552893de296cf4dcc 100755
--- a/django/gends_generate_django.py
+++ b/django/gends_generate_django.py
@@ -8,6 +8,8 @@ Usage:
Options:
-f, --force
Overwrite models.py and forms.py without asking.
+ --no-class-suffixes
+ Do not add suffix "_model" and _form" to generated class names.
-h, --help
Show this help message.
"""
@@ -110,7 +112,8 @@ def generate_model(options, module_name):
for class_name in supermod.__all__:
if hasattr(supermod, class_name):
cls = getattr(supermod, class_name)
- cls.generate_model_(wrtmodels, wrtforms, unique_name_map)
+ cls.generate_model_(
+ wrtmodels, wrtforms, unique_name_map, options.class_suffixes)
else:
sys.stderr.write('class %s not defined\n' % (class_name, ))
wrtadmin('from django.contrib import admin\n')
@@ -172,16 +175,19 @@ def main():
opts, args = getopt.getopt(
args, 'hfs:', [
'help', 'force',
- 'suffix=', ])
+ 'no-class-suffixes', ])
except:
usage()
options = ProgramOptions()
options.force = False
+ options.class_suffixes = True
for opt, val in opts:
if opt in ('-h', '--help'):
usage()
elif opt in ('-f', '--force'):
options.force = True
+ elif opt == '--no-class-suffixes':
+ options.class_suffixes = False
if len(args) != 1:
usage()
module_name = args[0]
diff --git a/django/gends_run_gen_django.py b/django/gends_run_gen_django.py
old mode 100644
new mode 100755
index 51ed73ff1b66107a314212e0788b677d39899a3b..14e9109714a5f905585c99e66c9fdda5cba98267
--- a/django/gends_run_gen_django.py
+++ b/django/gends_run_gen_django.py
@@ -18,6 +18,9 @@ Options:
-v, --verbose Display additional information while running.
-s, --script Write out (display) the command lines used. Can
be captured and used in a shell script, for example.
+ --no-class-suffixes
+ Do not add suffix "_model" and _form" to
+ generated class names.
Examples:
python gends_run_gen_django.py my_schema.xsd
python gends_run_gen_django.py -f -p ../generateDS.py my_other_schema.xsd
@@ -93,10 +96,16 @@ def generate(options, schema_file_name):
)
if not run_cmd(options, args):
return
- args = (
- './gends_generate_django.py', '-f',
- bindings_file_stem,
- )
+ if options['class_suffixes']:
+ args = (
+ './gends_generate_django.py', '-f',
+ bindings_file_stem,
+ )
+ else:
+ args = (
+ './gends_generate_django.py', '-f', '--no-class-suffixes',
+ bindings_file_stem,
+ )
if not run_cmd(options, args):
return
@@ -153,6 +162,7 @@ def main():
opts, args = getopt.getopt(args, 'hvfp:s', [
'help', 'verbose', 'script',
'force', 'path-to-generateDS-script=',
+ 'no-class-suffixes',
])
except:
usage()
@@ -161,6 +171,7 @@ def main():
options['verbose'] = False
options['script'] = False
options['path'] = './generateDS.py'
+ options['class_suffixes'] = True
for opt, val in opts:
if opt in ('-h', '--help'):
usage()
@@ -172,6 +183,8 @@ def main():
options['script'] = True
elif opt in ('-p', '--path-to-generateDS-script'):
options['path'] = val
+ elif opt == '--no-class-suffixes':
+ options['class_suffixes'] = False
if not os.path.exists(options['path']):
sys.exit(
'\n*** error: Cannot find generateDS.py. '
@@ -184,4 +197,5 @@ def main():
if __name__ == '__main__':
#import pdb; pdb.set_trace()
+ #import ipdb; ipdb.set_trace()
main()
diff --git a/django/generatedssuper.py b/django/generatedssuper.py
index 87e859a1784ae1426ecf9499054d2aa8d6e4ffb0..daec5d6d2560594346a928b73f1c5965e2231ce9 100644
--- a/django/generatedssuper.py
+++ b/django/generatedssuper.py
@@ -154,10 +154,19 @@ class GeneratedsSuper(object):
return prefix, name
@classmethod
- def generate_model_(cls, wrtmodels, wrtforms, unique_name_map):
+ def generate_model_(
+ cls, wrtmodels, wrtforms, unique_name_map, class_suffixes):
+ if class_suffixes:
+ model_suffix = '_model'
+ form_suffix = '_form'
+ else:
+ model_suffix = ''
+ form_suffix = ''
class_name = unique_name_map.get(cls.__name__)
- wrtmodels('\nclass %s_model(models.Model):\n' % (class_name, ))
- wrtforms('\nclass %s_form(forms.Form):\n' % (class_name, ))
+ wrtmodels('\nclass %s%s(models.Model):\n' % (
+ class_name, model_suffix, ))
+ wrtforms('\nclass %s%s(forms.Form):\n' % (
+ class_name, form_suffix, ))
if cls.superclass is not None:
wrtmodels(' %s = models.ForeignKey("%s_model")\n' % (
cls.superclass.__name__, cls.superclass.__name__, ))
@@ -175,7 +184,7 @@ class GeneratedsSuper(object):
name += 'x'
elif name.endswith('_') and not name == AnyTypeIdentifier:
name += 'x'
- data_type = mapName(cleanupName(data_type))
+ clean_data_type = mapName(cleanupName(data_type))
if data_type == AnyTypeIdentifier:
data_type = 'string'
if data_type in Simple_type_table:
@@ -224,15 +233,15 @@ class GeneratedsSuper(object):
sys.stderr.write('Unhandled simple type: %s %s\n' % (
name, data_type, ))
else:
- mapped_type = unique_name_map.get(data_type)
+ mapped_type = unique_name_map.get(clean_data_type)
if mapped_type is not None:
- data_type = mapped_type
+ clean_data_type = mapped_type
wrtmodels(
' %s = models.ForeignKey(\n "%s_model",\n' % (
- name, data_type, ))
+ name, clean_data_type, ))
wrtmodels(
' related_name="{}_{}_{}",\n'.format(
- class_name, name, data_type, ))
+ class_name, name, clean_data_type, ))
if is_optional:
wrtmodels(
' blank=True, null=True,\n')
@@ -240,7 +249,7 @@ class GeneratedsSuper(object):
wrtforms(
' %s = forms.MultipleChoiceField(%s_model.objects'
'.all())\n' % (
- name, data_type, ))
+ name, clean_data_type, ))
wrtmodels('\n')
wrtmodels(' def __unicode__(self):\n')
wrtmodels(' return "id: %s" % (self.id, )\n')
diff --git a/generateDS.html b/generateDS.html
index bc11789108182fa086ebb84bc61753dfde2645d8..827ef04b8dfa054c78b2bf6b28b6716c5a40e1ab 100644
--- a/generateDS.html
+++ b/generateDS.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>generateDS -- Generate Data Structures from XML Schema</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28b</td>
</tr>
</tbody>
</table>
@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">June 23, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 22, 2017</td>
</tr>
</tbody>
</table>
@@ -3380,7 +3380,7 @@ following among others:</p>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateDS.txt">View document source</a>.
-Generated on: 2017-06-23 23:12 UTC.
+Generated on: 2017-08-22 19:57 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/generateDS.py b/generateDS.py
index 9b591ec594ee12a88c21110385dc4de632a3b006..05ab66a16e0c7ab0f553b486ce7924da20072727 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -227,7 +227,7 @@ logging.disable(logging.INFO)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.28a'
+VERSION = '2.28b'
##VERSION##
if sys.version_info.major == 2:
@@ -5031,6 +5031,7 @@ TEMPLATE_HEADER = """\
#
# Generated {tstamp} by generateDS.py{version}.
+# Python {pyversion}
#
# Command line options:
{options1}
@@ -5821,6 +5822,7 @@ except ImportError as exp:
s1 = TEMPLATE_HEADER.format(
tstamp=tstamp,
version=version,
+ pyversion=sys.version.replace('\n', ' '),
options1=options1,
args1=args1,
command_line=command_line,
@@ -6252,6 +6254,7 @@ TEMPLATE_SUBCLASS_HEADER = """\
#
# Generated %s by generateDS.py%s.
+# Python %s
#
# Command line options:
%s
@@ -6507,6 +6510,7 @@ def generateSubclasses(root, subclassFilename, behaviorFilename,
options1, args1, command_line = format_options_args(options, args)
current_working_directory = os.path.split(os.getcwd())[1]
wrt(TEMPLATE_SUBCLASS_HEADER % (tstamp, version,
+ sys.version.replace('\n', ' '),
options1, args1,
command_line, current_working_directory,
superModule, ExternalEncoding, ))
diff --git a/generateDS.txt b/generateDS.txt
index c4cb9b845fd4c5baeec9a080890ffeacab4d4f63..58303ba2674d5b44419fb8d693e5c144fea7093a 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
-:revision: 2.28a
+:revision: 2.28b
.. version
diff --git a/generateds_gui_notes.html b/generateds_gui_notes.html
index e0e7cd23defaff30c1dad1909e12b92d203ae69c..37cf9c73abf26cb042f1067f46f9e7f389606f1e 100644
--- a/generateds_gui_notes.html
+++ b/generateds_gui_notes.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>GenerateDS GUI Notes</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28b</td>
</tr>
</tbody>
</table>
@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">June 23, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 22, 2017</td>
</tr>
</tbody>
</table>
@@ -401,7 +401,7 @@ $ mv generateds_gui.mo locale/ru/LC_MESSAGES/
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_gui_notes.txt">View document source</a>.
-Generated on: 2017-06-23 23:12 UTC.
+Generated on: 2017-08-22 19:57 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/generateds_gui_notes.txt b/generateds_gui_notes.txt
index 4830511a831a0810974d1385d2710e628d59c92d..2783eda537ffca6c01f4d5521e7dfcf9c871cda8 100644
--- a/generateds_gui_notes.txt
+++ b/generateds_gui_notes.txt
@@ -12,7 +12,7 @@ GenerateDS GUI Notes
.. version
-:revision: 2.28a
+:revision: 2.28b
.. version
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index fc1e734b0a9f5f6d844097b8d3f54e0299e727fd..2f127e3a4930569e41d7c64301fc1ee227a0c37a 100644
--- a/gui/generateds_gui.py
+++ b/gui/generateds_gui.py
@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.28a'
+VERSION = '2.28b'
##VERSION##
diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html
index cb45e025f5b4d0ae1bc45511347cc41cef199fac..a1de32b62324ac1a45796bd4c5f5546d5873b979 100644
--- a/librarytemplate_howto.html
+++ b/librarytemplate_howto.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>How to package a generateDS.py generated library</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -217,7 +217,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28b</td>
</tr>
</tbody>
</table>
@@ -226,7 +226,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">June 23, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 22, 2017</td>
</tr>
</tbody>
</table>
@@ -380,7 +380,7 @@ this command for your needs. For example, you may need to use
<div class="footer">
<hr class="footer" />
<a class="reference external" href="librarytemplate_howto.txt">View document source</a>.
-Generated on: 2017-06-23 23:12 UTC.
+Generated on: 2017-08-22 19:57 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt
index 6e2f82680ffa65bc39af338d65c79ff30c40bfcf..6eee10795c7935c0689976e26c8667d7c2dad5d4 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
-:revision: 2.28a
+:revision: 2.28b
.. version
diff --git a/process_includes.py b/process_includes.py
index 1fe384b4c05062262378b48501db369bd53cf7d6..e3742527d60f93154c1cfa0a79e8dd8a864e8f36 100644
--- a/process_includes.py
+++ b/process_includes.py
@@ -40,7 +40,7 @@ except ImportError:
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.28a'
+VERSION = '2.28b'
##VERSION##
CatalogDict = {}
diff --git a/setup.py b/setup.py
index 145feeb0c23116f1c19b94da1cb7c96e0a1c15a8..f9f366a045423bb7fa0e5e43db7d085bd5cc4b06 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.28a",
+ version="2.28b",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index 6a9383a228afa725a55350e57132708e9c766b35..7c88aa9477cc107eedc47d22a2d936784727575c 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index 9cb957bfcf5058cf897b2d0cdb582a18c19b8946..561cf1e6fe18a3076c5f56d0d8f4b2809efc9d93 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index 2cc43fddfb7dee88a3f184e5fa846a59e90675cc..095fbb7e62421928555627f75a774d2c28e740f5 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index cf8139e7d632ca99006258e7d9ed5647b27a9bed..738a6dd0f1cd80a0ab8824942bed37003f27bb44 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/abstract_type1_sub.py b/tests/abstract_type1_sub.py
index b7e815b808c5e3de3e79d48b532b36016743b088..7895f4e6b586450cb529f0b08a21703085697142 100644
--- a/tests/abstract_type1_sub.py
+++ b/tests/abstract_type1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index 72181e6f6ec704700423a5225e203fcb597fb25f..76b59cc656136428ebea8337c3077d085cea751e 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/annotations1_sub.py b/tests/annotations1_sub.py
index ee65ce6ef8f17137b2791d1260e25251545e2b1d..eab0241b463399c6b7a570c8195a476c1154e0ce 100644
--- a/tests/annotations1_sub.py
+++ b/tests/annotations1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index 784711b2d090f3c8a8f4eb62e9d42962857d1019..6ee0fb0c68291c5d4d69ca2e9760e70fcc442567 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anonymous_type1_sub.py b/tests/anonymous_type1_sub.py
index e6d36961ad912af6b698eb7409c28fc47589aab6..4969be809fbf266a11ab68583777b7f023e1ddda 100644
--- a/tests/anonymous_type1_sub.py
+++ b/tests/anonymous_type1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index 757d76b9c1d1c4721dcbed5f5edf05b0cce1c80b..c5097e2cd4b77cceb35b9982259c9e11095bb0b3 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anysimpletype1_sub.py b/tests/anysimpletype1_sub.py
index a8d0cc3a8321a511b80b9e8a2c3d46b9d6f2a872..6689ed9af3756a9a265662c6106705dc33dd3eea 100644
--- a/tests/anysimpletype1_sub.py
+++ b/tests/anysimpletype1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index a42b892540e08eae4d516de89ab0643b5186c3a4..9dc2df861f06f942ed47be3b39db21b9cb7c6a1a 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anywildcard1_sub.py b/tests/anywildcard1_sub.py
index 7e40b280ac22cd321661fc045fb9c91b1a9e1a8a..c58ae95d909ba8a8f3cb8e681b2a2619f28c2b9c 100644
--- a/tests/anywildcard1_sub.py
+++ b/tests/anywildcard1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 863dd057d08b1a27af24b51a0d900e7c098141a0..51bc9cfa9b52bb79913efeb6a02bd1776f052793 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/attr_groups1_sub.py b/tests/attr_groups1_sub.py
index 446338a2e416d565ec943ea69f55ab9bf674a1fc..21a53f56077612143240a0bd0f3ac4271db29e0e 100644
--- a/tests/attr_groups1_sub.py
+++ b/tests/attr_groups1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index 1e8f030f16e02795dc1d295098206711ed35969e..489d8259ac775fa54627ad5cdfaa294fa2cbc273 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/catalogtest1_sub.py b/tests/catalogtest1_sub.py
index ba9ea614fe4a8e5e16f4db9a065983f6bd543eaf..6be03bedecff8c9b38afd46cc81ee9395c5ca133 100644
--- a/tests/catalogtest1_sub.py
+++ b/tests/catalogtest1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/catalogtest1_sup.py b/tests/catalogtest1_sup.py
index b63985eb975201f0ad9357578c9bfacac0ff497c..1d2f9cf2a07a309f6db97cf8daeda7b3d893de33 100644
--- a/tests/catalogtest1_sup.py
+++ b/tests/catalogtest1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/cdata1_sub.py b/tests/cdata1_sub.py
index 137519fc82b260babb07b9706e1b103216091f65..d9bde8cfa1562752bcd72fb4a0abfe6dbedb0dbe 100644
--- a/tests/cdata1_sub.py
+++ b/tests/cdata1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/cdata1_sup.py b/tests/cdata1_sup.py
index 60589866d522e6e8b0e5d3c3e7d3687c10fb90a3..ed4c2baba1e265930838014966794dec99085627 100644
--- a/tests/cdata1_sup.py
+++ b/tests/cdata1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/check_results.rb b/tests/check_results.rb
index f9ad8d8a969172380b39fcded3295e5356b87c81..015c7b3c7dd6678bc87e10f4ea97ad773fdd67d5 100755
--- a/tests/check_results.rb
+++ b/tests/check_results.rb
@@ -69,6 +69,8 @@ $commands = [
"diff -u nested_def1_sup.py nested_def2_sup.py",
"diff -u catalogtest1_sub.py catalogtest2_sub.py",
"diff -u catalogtest1_sup.py catalogtest2_sup.py",
+ "diff -u disable_xml_super1_sub.py disable_xml_super2_sub.py",
+ "diff -u disable_xml_super1_sup.py disable_xml_super2_sup.py",
]
def check
diff --git a/tests/cleanupname1_sub.py b/tests/cleanupname1_sub.py
index c00f3e0e4fbb1bccd3c66d705a03cf2c2983a682..6a1acf07f1601abe9104277c468a2101370fe3a5 100644
--- a/tests/cleanupname1_sub.py
+++ b/tests/cleanupname1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/cleanupname1_sup.py b/tests/cleanupname1_sup.py
index dcdd1aae3399fdcd77d1eca1759f48992bab7e50..83950e720606fb31a3a8aa34ec3ccf45af3a8331 100644
--- a/tests/cleanupname1_sup.py
+++ b/tests/cleanupname1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/copy_all b/tests/copy_all
index b89ea4351500e0adea45b58526ba0e7bd60aeb0f..70abfa96c2b3b052d1a0a854668959969f0597ea 100755
--- a/tests/copy_all
+++ b/tests/copy_all
@@ -57,3 +57,5 @@ cp catalogtest2_sup.py catalogtest1_sup.py
cp catalogtest2_sub.py catalogtest1_sub.py
cp rem_dup_elems2_sup.py rem_dup_elems1_sup.py
cp rem_dup_elems2_sub.py rem_dup_elems1_sub.py
+cp disable_xml_super2_sup.py disable_xml_super1_sup.py
+cp disable_xml_super2_sub.py disable_xml_super1_sub.py
diff --git a/tests/defaults_cases1_sub.py b/tests/defaults_cases1_sub.py
index 3e60267cdf12461a2291918650fa77850b395405..ee44fea2d0a0ef96ce67fcd4335a982857c13ac2 100644
--- a/tests/defaults_cases1_sub.py
+++ b/tests/defaults_cases1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/defaults_cases1_sup.py b/tests/defaults_cases1_sup.py
index 119f2dc9bb97f0a27244dbfe5eaed3d192305b50..558b8630d8ce0687318e993e5e6beb4d5dde80e5 100644
--- a/tests/defaults_cases1_sup.py
+++ b/tests/defaults_cases1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/defaults_coverage1_sub.py b/tests/defaults_coverage1_sub.py
index 3452d186f621ec7e8475dbd9c7357627048a46f1..776bf458bbdabc6531ccf952a660fe6a1202905a 100644
--- a/tests/defaults_coverage1_sub.py
+++ b/tests/defaults_coverage1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/defaults_coverage1_sup.py b/tests/defaults_coverage1_sup.py
index 7bd6d4f777fa364ddcbc73cfe8b81c2fa7ed027e..51e722732ed2e529258cd7dba2be05dbf4f6e83d 100644
--- a/tests/defaults_coverage1_sup.py
+++ b/tests/defaults_coverage1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/disable_xml_super1_sub.py b/tests/disable_xml_super1_sub.py
index 4f116e8ca21bbf05a72de1b6a9f49a15cc78a5b4..e7184a2731cd7ddc414455deb15a5c3ab7c8eee4 100644
--- a/tests/disable_xml_super1_sub.py
+++ b/tests/disable_xml_super1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/disable_xml_super1_sup.py b/tests/disable_xml_super1_sup.py
index 9ad8be9415f5270135727e710805428f15f26e56..db04580e5d0387e444de804f2a769b289629c447 100644
--- a/tests/disable_xml_super1_sup.py
+++ b/tests/disable_xml_super1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/extensions1_sub.py b/tests/extensions1_sub.py
index 27b9cc60e75e58f1ed86d276d9a1ecc0947df9d9..3a3919fe0b57ca01eb007ce7dee65a25390fe66a 100644
--- a/tests/extensions1_sub.py
+++ b/tests/extensions1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index dd9b80a8b2837a42ee3fb42cc8b8d1ca25d8b7ba..a3351f91173fe7cb805bfcc6cf4ca72800ac69f0 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/ipo1_sub.py b/tests/ipo1_sub.py
index 01e596514819536707a7954533bca6e10faad35e..4fd7fcb4015906883beae0f9cd9feb5a38c8402e 100644
--- a/tests/ipo1_sub.py
+++ b/tests/ipo1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/ipo1_sup.py b/tests/ipo1_sup.py
index 9828532c65ed2a7497a51a0b3865b0d241fad994..af04ab38b4a483a732552d915036213645ac7c78 100644
--- a/tests/ipo1_sup.py
+++ b/tests/ipo1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/ipo2_sub.py b/tests/ipo2_sub.py
index 01e596514819536707a7954533bca6e10faad35e..4fd7fcb4015906883beae0f9cd9feb5a38c8402e 100644
--- a/tests/ipo2_sub.py
+++ b/tests/ipo2_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/ipo2_sup.py b/tests/ipo2_sup.py
index 9828532c65ed2a7497a51a0b3865b0d241fad994..af04ab38b4a483a732552d915036213645ac7c78 100644
--- a/tests/ipo2_sup.py
+++ b/tests/ipo2_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/mapcleanname1_sub.py b/tests/mapcleanname1_sub.py
index fc4dbd21aaae3dd9fb1e75502ae258acaa51275f..d1ff8c1a006f554821bb1d4e931bc7470b42fbf4 100644
--- a/tests/mapcleanname1_sub.py
+++ b/tests/mapcleanname1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py
index b93a409b66d143ab3f75aa3c0220954a359ff467..257c9b94d9e8e188fed31e8f5033fe7355e84042 100644
--- a/tests/mapcleanname1_sup.py
+++ b/tests/mapcleanname1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/nested_def1_sub.py b/tests/nested_def1_sub.py
index 14bfb18c7cdb5a1d2fc6eb7c9f5934e551d212c3..e13ea3161940bab9acf2fa0497fc0b8394f55a31 100644
--- a/tests/nested_def1_sub.py
+++ b/tests/nested_def1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/nested_def1_sup.py b/tests/nested_def1_sup.py
index 0032b18ee3c07f0905c47188e2d3382716655cb5..1d54e5aee5de4720202e64f4c44f9674567c1920 100644
--- a/tests/nested_def1_sup.py
+++ b/tests/nested_def1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/out1_sub.py b/tests/out1_sub.py
index abd3ce1282e6d91d4297812c19cc869dd5f99a55..fa69988fc584a3192211756145df1cfa9d538996 100644
--- a/tests/out1_sub.py
+++ b/tests/out1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index 26c019085563e7ca684e583f5906697ee3277eda..ed5fc329400c60fd1bf29d526f2c4a08d3a2b1f0 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/people_procincl1_sub.py b/tests/people_procincl1_sub.py
index 8d3b5e72ea0008405efcb89f106b21e4e4a009cd..bdb5d63826cb319930b9817d7094e29d9fdae4a5 100644
--- a/tests/people_procincl1_sub.py
+++ b/tests/people_procincl1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index 9689e83b6bbe9533bbd9711f07976a9b180a594b..da0eeba061680dde97ba97ea6e22d3ac3c6e0206 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/prefix_classname1_sub.py b/tests/prefix_classname1_sub.py
index df7507a3382a8cc2860004e0c75cfe4df5863bb9..18c80fcf75b5d8a673f01d7ab36a43c4fa94583f 100644
--- a/tests/prefix_classname1_sub.py
+++ b/tests/prefix_classname1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py
index e4db412cb75eb6a9f99e537b0d038ce9ef1b51a8..92afac27781dcfcb5da486785167a9fa32b76634 100644
--- a/tests/prefix_classname1_sup.py
+++ b/tests/prefix_classname1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/recursive_simpletype1_sub.py b/tests/recursive_simpletype1_sub.py
index 336b026b124aea3698b401f7d9339e12559eaa4d..8518e2d2604f6cac54625f11a18e8f1fcadbe6ec 100644
--- a/tests/recursive_simpletype1_sub.py
+++ b/tests/recursive_simpletype1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index 45de91df6e20254be62ef7cb5849fb030e17e6ed..7a2e836b0104940bc470072fdc720f28028e81c3 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/reference_simpletype1_sub.py b/tests/reference_simpletype1_sub.py
index 9297c7a38ad181ffe21cec81c2e5d13d7e978539..84a31d327379e5aea4c0e6d7031b8945ace71ba0 100644
--- a/tests/reference_simpletype1_sub.py
+++ b/tests/reference_simpletype1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/reference_simpletype1_sup.py b/tests/reference_simpletype1_sup.py
index cc8178a4954cd7f6fce23008164067428d7c0fa0..941fa284cac920193615b76d0d9f8761d1305a4b 100644
--- a/tests/reference_simpletype1_sup.py
+++ b/tests/reference_simpletype1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/rem_dup_elems1_sub.py b/tests/rem_dup_elems1_sub.py
index c9f7ba42728f6c03a7e099617edac3663f500ccd..4f13ab12d9dea990b06abddf136b50c94c95ac70 100644
--- a/tests/rem_dup_elems1_sub.py
+++ b/tests/rem_dup_elems1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/rem_dup_elems1_sup.py b/tests/rem_dup_elems1_sup.py
index c21b87f8fd10c384c05bb18ac7db54294e85a16a..cee76401f3b056905ef1963bfd657574acee7fc6 100644
--- a/tests/rem_dup_elems1_sup.py
+++ b/tests/rem_dup_elems1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simplecontent_restriction1_sub.py b/tests/simplecontent_restriction1_sub.py
index 8ed52f91b8466a6d27643f41c6d210fa9833bbc5..580c6d234d8d04f0375359448c11157dab4d648b 100644
--- a/tests/simplecontent_restriction1_sub.py
+++ b/tests/simplecontent_restriction1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index ae5f74a8ec9f348e26ce466018bef80e60f9dc01..7056a1993ec3ca96015b177b505bfc097767579c 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletype_memberspecs1_sub.py b/tests/simpletype_memberspecs1_sub.py
index 908d5c4d0437ba933e9885f666f1e58f289c4cb6..a260c8867cd9e90c548e2202f6581c7ec0a33777 100644
--- a/tests/simpletype_memberspecs1_sub.py
+++ b/tests/simpletype_memberspecs1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index ec34c2ab8e81d22cdf8fd2be544b31b5370ec557..307d905dd0d5c503e658aeb394effa6f347efb3c 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletypes_other1_sub.py b/tests/simpletypes_other1_sub.py
index 4792c10dda257425276de50223787e9ecf9fc5a2..6afe08913fccf87d96cfeaa97c4c7fd3c2373164 100644
--- a/tests/simpletypes_other1_sub.py
+++ b/tests/simpletypes_other1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 1c58d5c7f7db21882802da83ad2b682cacac70d2..1dcf61fe1579625e8c7b5d89638655963eedcdfe 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/to_etree1_sub.py b/tests/to_etree1_sub.py
index de64934b8918ddcab1eb2897f24e622f50120c77..300d89ca58e0edee7604e04843f5b37a4346a233 100644
--- a/tests/to_etree1_sub.py
+++ b/tests/to_etree1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index 09ba4c360dc14d4dae2ecfb176c5bfc8590bc89f..17befe2ef32d5d16406ad879958ca045bbba4862 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/validate_simpletypes1_sub.py b/tests/validate_simpletypes1_sub.py
index e0f4a980e3899c129d4eee084ce56b2d05901b8f..3edf739f1638255b12f0c0d5f834a2fe097f33a3 100644
--- a/tests/validate_simpletypes1_sub.py
+++ b/tests/validate_simpletypes1_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/validate_simpletypes1_sup.py b/tests/validate_simpletypes1_sup.py
index 03af44f4d19e30dc2aa054209132237796a83164..d159830a2b653772af07d8da5b85a8f1a33a6278 100644
--- a/tests/validate_simpletypes1_sup.py
+++ b/tests/validate_simpletypes1_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/validate_simpletypes1_warnings.txt b/tests/validate_simpletypes1_warnings.txt
index c166f0e92e2c4fed2dde1ad39a1e0d89993e39ac..ecb033a9ec3389989b07c9f46944de1f1f5bc1ff 100644
--- a/tests/validate_simpletypes1_warnings.txt
+++ b/tests/validate_simpletypes1_warnings.txt
@@ -1,60 +1,60 @@
-tests/validate_simpletypes2_sup.py:1042: UserWarning: Value "2" does not match xsd minExclusive restriction on integer_range_1_st
+tests/validate_simpletypes2_sup.py:1043: UserWarning: Value "2" does not match xsd minExclusive restriction on integer_range_1_st
warnings_.warn('Value "%(value)s" does not match xsd minExclusive restriction on integer_range_1_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1052: UserWarning: Value "mmaaa1234mnopzzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:1053: UserWarning: Value "mmaaa1234mnopzzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_pattern_st_patterns_, ))
-tests/validate_simpletypes2_sup.py:1065: UserWarning: Value "floatxx" does not match xsd enumeration restriction on token_enum_st
+tests/validate_simpletypes2_sup.py:1066: UserWarning: Value "floatxx" does not match xsd enumeration restriction on token_enum_st
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on token_enum_st' % {"value" : value.encode("utf-8")} )
-tests/validate_simpletypes2_sup.py:1072: UserWarning: Value "22" does not match xsd maxInclusive restriction on integer_range_incl_st
+tests/validate_simpletypes2_sup.py:1073: UserWarning: Value "22" does not match xsd maxInclusive restriction on integer_range_incl_st
warnings_.warn('Value "%(value)s" does not match xsd maxInclusive restriction on integer_range_incl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1077: UserWarning: Value "-40" does not match xsd minExclusive restriction on integer_range_excl_st
+tests/validate_simpletypes2_sup.py:1078: UserWarning: Value "-40" does not match xsd minExclusive restriction on integer_range_excl_st
warnings_.warn('Value "%(value)s" does not match xsd minExclusive restriction on integer_range_excl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1086: UserWarning: Value "mno pqr" does not match xsd minLength restriction on min_max_length_st
+tests/validate_simpletypes2_sup.py:1087: UserWarning: Value "mno pqr" does not match xsd minLength restriction on min_max_length_st
warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on min_max_length_st' % {"value" : value.encode("utf-8")} )
-tests/validate_simpletypes2_sup.py:1091: UserWarning: Value "012345" does not match xsd length restriction on length_st
+tests/validate_simpletypes2_sup.py:1092: UserWarning: Value "012345" does not match xsd length restriction on length_st
warnings_.warn('Value "%(value)s" does not match xsd length restriction on length_st' % {"value" : value.encode("utf-8")} )
-tests/validate_simpletypes2_sup.py:1168: UserWarning: Value "0.2" does not match xsd minInclusive restriction on anonymous_float_valueType
+tests/validate_simpletypes2_sup.py:1169: UserWarning: Value "0.2" does not match xsd minInclusive restriction on anonymous_float_valueType
warnings_.warn('Value "%(value)s" does not match xsd minInclusive restriction on anonymous_float_valueType' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1162: UserWarning: Value "efgh" does not match xsd pattern restrictions: [['^abcd$|^ef\\|gh$']]
+tests/validate_simpletypes2_sup.py:1163: UserWarning: Value "efgh" does not match xsd pattern restrictions: [['^abcd$|^ef\\|gh$']]
warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_vbar_pattern_st_patterns_, ))
-tests/validate_simpletypes2_sup.py:1044: UserWarning: Value "9" does not match xsd maxExclusive restriction on integer_range_1_st
+tests/validate_simpletypes2_sup.py:1045: UserWarning: Value "9" does not match xsd maxExclusive restriction on integer_range_1_st
warnings_.warn('Value "%(value)s" does not match xsd maxExclusive restriction on integer_range_1_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1052: UserWarning: Value "aaa1234mnopzzzbcd" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:1053: UserWarning: Value "aaa1234mnopzzzbcd" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_pattern_st_patterns_, ))
-tests/validate_simpletypes2_sup.py:1070: UserWarning: Value "-50" does not match xsd minInclusive restriction on integer_range_incl_st
+tests/validate_simpletypes2_sup.py:1071: UserWarning: Value "-50" does not match xsd minInclusive restriction on integer_range_incl_st
warnings_.warn('Value "%(value)s" does not match xsd minInclusive restriction on integer_range_incl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1084: UserWarning: Value "asdf asdf asdf asdf asdf asdf" does not match xsd maxLength restriction on min_max_length_st
+tests/validate_simpletypes2_sup.py:1085: UserWarning: Value "asdf asdf asdf asdf asdf asdf" does not match xsd maxLength restriction on min_max_length_st
warnings_.warn('Value "%(value)s" does not match xsd maxLength restriction on min_max_length_st' % {"value" : value.encode("utf-8")} )
-tests/validate_simpletypes2_sup.py:1091: UserWarning: Value "01234567890" does not match xsd length restriction on length_st
+tests/validate_simpletypes2_sup.py:1092: UserWarning: Value "01234567890" does not match xsd length restriction on length_st
warnings_.warn('Value "%(value)s" does not match xsd length restriction on length_st' % {"value" : value.encode("utf-8")} )
-tests/validate_simpletypes2_sup.py:1101: UserWarning: Value "2015-05-01" does not match xsd minInclusive restriction on date_minincl_st
+tests/validate_simpletypes2_sup.py:1102: UserWarning: Value "2015-05-01" does not match xsd minInclusive restriction on date_minincl_st
warnings_.warn('Value "%(value)s" does not match xsd minInclusive restriction on date_minincl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1106: UserWarning: Value "2015-11-01" does not match xsd maxInclusive restriction on date_maxincl_st
+tests/validate_simpletypes2_sup.py:1107: UserWarning: Value "2015-11-01" does not match xsd maxInclusive restriction on date_maxincl_st
warnings_.warn('Value "%(value)s" does not match xsd maxInclusive restriction on date_maxincl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1111: UserWarning: Value "2015-05-01" does not match xsd minExclusive restriction on date_minexcl_st
+tests/validate_simpletypes2_sup.py:1112: UserWarning: Value "2015-05-01" does not match xsd minExclusive restriction on date_minexcl_st
warnings_.warn('Value "%(value)s" does not match xsd minExclusive restriction on date_minexcl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1116: UserWarning: Value "2015-11-01" does not match xsd maxExclusive restriction on date_maxexcl_st
+tests/validate_simpletypes2_sup.py:1117: UserWarning: Value "2015-11-01" does not match xsd maxExclusive restriction on date_maxexcl_st
warnings_.warn('Value "%(value)s" does not match xsd maxExclusive restriction on date_maxexcl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1121: UserWarning: Value "13:30:00" does not match xsd minInclusive restriction on time_minincl_st
+tests/validate_simpletypes2_sup.py:1122: UserWarning: Value "13:30:00" does not match xsd minInclusive restriction on time_minincl_st
warnings_.warn('Value "%(value)s" does not match xsd minInclusive restriction on time_minincl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1126: UserWarning: Value "17:00:00" does not match xsd maxInclusive restriction on time_maxincl_st
+tests/validate_simpletypes2_sup.py:1127: UserWarning: Value "17:00:00" does not match xsd maxInclusive restriction on time_maxincl_st
warnings_.warn('Value "%(value)s" does not match xsd maxInclusive restriction on time_maxincl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1131: UserWarning: Value "13:30:00" does not match xsd minExclusive restriction on time_minexcl_st
+tests/validate_simpletypes2_sup.py:1132: UserWarning: Value "13:30:00" does not match xsd minExclusive restriction on time_minexcl_st
warnings_.warn('Value "%(value)s" does not match xsd minExclusive restriction on time_minexcl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1136: UserWarning: Value "17:00:00" does not match xsd maxExclusive restriction on time_maxexcl_st
+tests/validate_simpletypes2_sup.py:1137: UserWarning: Value "17:00:00" does not match xsd maxExclusive restriction on time_maxexcl_st
warnings_.warn('Value "%(value)s" does not match xsd maxExclusive restriction on time_maxexcl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1141: UserWarning: Value "2015-06-01 13:20:10" does not match xsd minInclusive restriction on datetime_minincl_st
+tests/validate_simpletypes2_sup.py:1142: UserWarning: Value "2015-06-01 13:20:10" does not match xsd minInclusive restriction on datetime_minincl_st
warnings_.warn('Value "%(value)s" does not match xsd minInclusive restriction on datetime_minincl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1146: UserWarning: Value "2015-11-01 14:20:10" does not match xsd maxInclusive restriction on datetime_maxincl_st
+tests/validate_simpletypes2_sup.py:1147: UserWarning: Value "2015-11-01 14:20:10" does not match xsd maxInclusive restriction on datetime_maxincl_st
warnings_.warn('Value "%(value)s" does not match xsd maxInclusive restriction on datetime_maxincl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1151: UserWarning: Value "2015-06-01 13:20:10" does not match xsd minExclusive restriction on datetime_minexcl_st
+tests/validate_simpletypes2_sup.py:1152: UserWarning: Value "2015-06-01 13:20:10" does not match xsd minExclusive restriction on datetime_minexcl_st
warnings_.warn('Value "%(value)s" does not match xsd minExclusive restriction on datetime_minexcl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1156: UserWarning: Value "2015-11-01 14:20:10" does not match xsd maxExclusive restriction on datetime_maxexcl_st
+tests/validate_simpletypes2_sup.py:1157: UserWarning: Value "2015-11-01 14:20:10" does not match xsd maxExclusive restriction on datetime_maxexcl_st
warnings_.warn('Value "%(value)s" does not match xsd maxExclusive restriction on datetime_maxexcl_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1170: UserWarning: Value "6.6" does not match xsd maxInclusive restriction on anonymous_float_valueType
+tests/validate_simpletypes2_sup.py:1171: UserWarning: Value "6.6" does not match xsd maxInclusive restriction on anonymous_float_valueType
warnings_.warn('Value "%(value)s" does not match xsd maxInclusive restriction on anonymous_float_valueType' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1049: UserWarning: Value "aaa12zzz" does not match xsd minLength restriction on pattern_st
+tests/validate_simpletypes2_sup.py:1050: UserWarning: Value "aaa12zzz" does not match xsd minLength restriction on pattern_st
warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on pattern_st' % {"value" : value} )
-tests/validate_simpletypes2_sup.py:1052: UserWarning: Value "aaa12zzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:1053: UserWarning: Value "aaa12zzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_pattern_st_patterns_, ))
-tests/validate_simpletypes2_sup.py:1588: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
+tests/validate_simpletypes2_sup.py:1589: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on simpleTwoElementTwoType' % {"value" : value.encode("utf-8")} )
diff --git a/tests/validate_simpletypes2_sub.py b/tests/validate_simpletypes2_sub.py
index e0f4a980e3899c129d4eee084ce56b2d05901b8f..3edf739f1638255b12f0c0d5f834a2fe097f33a3 100644
--- a/tests/validate_simpletypes2_sub.py
+++ b/tests/validate_simpletypes2_sub.py
@@ -2,6 +2,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/validate_simpletypes2_sup.py b/tests/validate_simpletypes2_sup.py
index 03af44f4d19e30dc2aa054209132237796a83164..d159830a2b653772af07d8da5b85a8f1a33a6278 100644
--- a/tests/validate_simpletypes2_sup.py
+++ b/tests/validate_simpletypes2_sup.py
@@ -3,6 +3,7 @@
#
# Generated by generateDS.py.
+# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html
index 648e52e28ae33d9fe30503e557ee5fb0be24e4cd..fa7972fe0640858f8fb368c7a223abfddbf1d3f6 100644
--- a/tutorial/generateds_tutorial.html
+++ b/tutorial/generateds_tutorial.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
<title>generateDS -- Introduction and Tutorial</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -219,7 +219,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28b</td>
</tr>
</tbody>
</table>
@@ -228,7 +228,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">June 23, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 22, 2017</td>
</tr>
</tbody>
</table>
@@ -1210,7 +1210,7 @@ named <tt class="docutils literal">garden_api.py</tt>, you can create an instanc
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_tutorial.txt">View document source</a>.
-Generated on: 2017-06-23 23:12 UTC.
+Generated on: 2017-08-22 19:57 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt
index 69e9efde971c0816e4f72cd9f6e750ddd61d647b..1799a52c4e892a6bc39d2371a847f8ad72652514 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
-:revision: 2.28a
+:revision: 2.28b
.. version
diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip
index f103919d46c6d0eb3cb7128d9d41e5a87326d436..2f74d7acf124128c19fcfa4076aafdc1252d6cb1 100644
Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ