diff --git a/README b/README
index 276cbfd18087a3066d2c068edb245dda7f5e3407..c5a7bab73ed332c491a58b52d3e9fd898f427909 100644
--- a/README
+++ b/README
@@ -141,6 +141,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.15a (02/26/2015)
+- Modifications so that we generate code that can be used by Python 3.
+ Thanks much to Richard Gerkin for this work.
+- Removed possible use of ElementTree. Lxml is now a requirement
+ for both running generateDS.py itself and for running the
+ generated code.
+
Version 2.14a (11/26/2014)
- Fixed export of simpleType lists (added "' '.join(data)". Thanks
to Per Rosengren for catching this.
diff --git a/generateDS.html b/generateDS.html
index 1338aeb9acb3882dd61474e075c9998f1eb84ad8..a1673a409c182198b012433b638911d7a74f5738 100644
--- a/generateDS.html
+++ b/generateDS.html
@@ -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.14a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.15a</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">October 30, 2014</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">January 29, 2015</td>
</tr>
</tbody>
</table>
@@ -1403,12 +1403,6 @@ command line option.</p>
inserted in the XML Schema by importing and using
<tt class="docutils literal">process_includes.py</tt>, which is included in the <tt class="docutils literal">generateDS.py</tt>
distribution.</p>
-<p><tt class="docutils literal">process_includes.py</tt> will use either <tt class="docutils literal">lxml</tt> or <tt class="docutils literal">ElementTree</tt>,
-but its preference is <tt class="docutils literal">lxml</tt> because <tt class="docutils literal">lxml</tt> attempts to preserve
-namespace prefixes. So if your XML Schemas have <tt class="docutils literal"><include ... /></tt>
-elements in them, you might want to consider installing <tt class="docutils literal">lxml</tt>, even
-though <tt class="docutils literal">ElementTree</tt> is in the Python standard library for Python
-versions >= 2.5.</p>
<p>The include file processing is capable of retrieve included files
via FTP and HTTP internet protocols as well as from the local file
system.</p>
@@ -2942,13 +2936,6 @@ memory problem to some extent when the minidom parser is used.</p>
script scans your XML Schema document and, recursively, documents
that are included looking for <tt class="docutils literal">include</tt> elements; it inserts all
content into a single document, which it writes out.</p>
-<p>Since <tt class="docutils literal">process_includes.py</tt> uses the ElementTree API, in order
-to use <tt class="docutils literal">process_includes.py</tt> you will need one of the following:</p>
-<ul class="simple">
-<li>Python 2.5 or newer -- ElementTree is in the Python-2.5 distribution. Or,</li>
-<li><a class="reference external" href="http://effbot.org/zone/element-index.htm">ElementTree</a>. Or,</li>
-<li><a class="reference external" href="http://lxml.de/index.html">lxml</a> -- another implementation of the ElementTree API.</li>
-</ul>
<p>Here are samples of how you might use <tt class="docutils literal">process_includes.py</tt>, if
your schema contains <tt class="docutils literal">include</tt> elements.</p>
<p>Example 1:</p>
@@ -2988,8 +2975,8 @@ following among others:</p>
</div>
<div class="footer">
<hr class="footer" />
-<a class="reference external" href="/home/dkuhlman/a1/Python/GenerateDS/Hg/generateds/generateDS.txt">View document source</a>.
-Generated on: 2014-10-30 20:13 UTC.
+<a class="reference external" href="generateDS.txt">View document source</a>.
+Generated on: 2015-01-29 19:05 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 b3fdc8ec37de4df622e80236c898c64d340c0c50..bba36624437582148690ff9eb0ddc06acc2f9046 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -184,7 +184,7 @@ logging.disable(logging.INFO)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.14a'
+VERSION = '2.15a'
##VERSION##
GenerateProperties = 0
@@ -4646,60 +4646,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -5723,58 +5677,12 @@ TEMPLATE_SUBCLASS_HEADER = """\
#
import sys
+from lxml import etree as etree_
import %s as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -6537,7 +6445,7 @@ def main():
if option[0] == '--session':
sessionFilename = option[1]
from libgenerateDS.gui import generateds_gui_session
- from xml.etree import ElementTree as etree
+ from lxml import etree
doc = etree.parse(sessionFilename)
rootNode = doc.getroot()
sessionObj = generateds_gui_session.sessionType()
diff --git a/generateDS.txt b/generateDS.txt
index e180b80e0a0491c81de48eb171dcd3a63d12992a..84001442a2a0b23340115f39e17045c40b08e6ba 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
-:revision: 2.14a
+:revision: 2.15a
.. version
@@ -1173,13 +1173,6 @@ inserted in the XML Schema by importing and using
``process_includes.py``, which is included in the ``generateDS.py``
distribution.
-``process_includes.py`` will use either ``lxml`` or ``ElementTree``,
-but its preference is ``lxml`` because ``lxml`` attempts to preserve
-namespace prefixes. So if your XML Schemas have ``<include ... />``
-elements in them, you might want to consider installing ``lxml``, even
-though ``ElementTree`` is in the Python standard library for Python
-versions >= 2.5.
-
The include file processing is capable of retrieve included files
via FTP and HTTP internet protocols as well as from the local file
system.
@@ -2879,15 +2872,6 @@ script scans your XML Schema document and, recursively, documents
that are included looking for ``include`` elements; it inserts all
content into a single document, which it writes out.
-Since ``process_includes.py`` uses the ElementTree API, in order
-to use ``process_includes.py`` you will need one of the following:
-
-- Python 2.5 or newer -- ElementTree is in the Python-2.5 distribution. Or,
-
-- `ElementTree`_. Or,
-
-- `lxml`_ -- another implementation of the ElementTree API.
-
Here are samples of how you might use ``process_includes.py``, if
your schema contains ``include`` elements.
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index d0e31e8d94ef565f7de3aa6f9324eb5a3c4a81fd..e1d26463834611bc21dd43322d1ba96dca18018c 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.14a'
+VERSION = '2.15a'
##VERSION##
diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html
index eeb457447db581338f555e431414dc696215ebf2..f4451877d7e44c105fa49ee7c7c7983d1f5bf41a 100644
--- a/librarytemplate_howto.html
+++ b/librarytemplate_howto.html
@@ -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.14a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.15a</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">October 18, 2014</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">January 29, 2015</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: 2014-10-18 18:20 UTC.
+Generated on: 2015-01-29 19:05 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 1ead80d293631200ef1d5bb5937a308a5dc1cc18..8ae28acffc6ab7b55dc49abe70a08079ab5eddf3 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
-:revision: 2.14a
+:revision: 2.15a
.. version
diff --git a/process_includes.py b/process_includes.py
index 166239bf4e7f9f2dfe40f5522d55acaf82f5d73b..8c326a17b9c979c6e8c9bf5386916ee5d3d0eab0 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.14a'
+VERSION = '2.15a'
##VERSION##
CatalogDict = {}
diff --git a/setup.py b/setup.py
index 6f85b8b23e9cd416707f87f600c4043844ba07eb..c24e5513e66464ddcabb1865859fafe56e9116c3 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.14a",
+ version="2.15a",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
diff --git a/tests/OnePer/oneperType00_1One.py b/tests/OnePer/oneperType00_1One.py
index 472670cca712d353a3c0330075c9da31223e62a1..d5e769e3660608771d36314dad4023a754a8ca2b 100644
--- a/tests/OnePer/oneperType00_1One.py
+++ b/tests/OnePer/oneperType00_1One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -770,7 +724,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index 472670cca712d353a3c0330075c9da31223e62a1..d5e769e3660608771d36314dad4023a754a8ca2b 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -770,7 +724,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType01_1One.py b/tests/OnePer/oneperType01_1One.py
index 77416e74bc00b65fd2cee506ccd74c3671d4c2a8..6e34e60481d1ae789a3df4801c6c16464183179f 100644
--- a/tests/OnePer/oneperType01_1One.py
+++ b/tests/OnePer/oneperType01_1One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -849,7 +803,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index 77416e74bc00b65fd2cee506ccd74c3671d4c2a8..6e34e60481d1ae789a3df4801c6c16464183179f 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -849,7 +803,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType02_1One.py b/tests/OnePer/oneperType02_1One.py
index 57620618450a03bfbdb0c2ce4f61c2a8cb92f97a..29401429484403b484a6f5e7b5346ac20d6d12c8 100644
--- a/tests/OnePer/oneperType02_1One.py
+++ b/tests/OnePer/oneperType02_1One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -849,7 +803,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index 57620618450a03bfbdb0c2ce4f61c2a8cb92f97a..29401429484403b484a6f5e7b5346ac20d6d12c8 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -849,7 +803,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType03_1One.py b/tests/OnePer/oneperType03_1One.py
index 2d315e5613333028f027e4c506589317340f8b81..7115e39624b4ec5c439a08cddcf8fa9e11144578 100644
--- a/tests/OnePer/oneperType03_1One.py
+++ b/tests/OnePer/oneperType03_1One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -848,7 +802,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index 2d315e5613333028f027e4c506589317340f8b81..7115e39624b4ec5c439a08cddcf8fa9e11144578 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -30,60 +30,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -99,7 +53,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -848,7 +802,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/abstract_type1_sub.py b/tests/abstract_type1_sub.py
index 1e5bee0ccf74e885d9f2baf6599fc66e7a9fea6b..c7f59b95cc2bc850b9323595190f16b1eec7b379 100644
--- a/tests/abstract_type1_sub.py
+++ b/tests/abstract_type1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import abstract_type2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -219,7 +173,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index e11fc338880caaf0e9d895bab1e023ea207cd569..9776dbdb0b61a8f419341909d704da25c968344d 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -991,7 +945,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/abstract_type2_sub.py b/tests/abstract_type2_sub.py
index 1e5bee0ccf74e885d9f2baf6599fc66e7a9fea6b..c7f59b95cc2bc850b9323595190f16b1eec7b379 100644
--- a/tests/abstract_type2_sub.py
+++ b/tests/abstract_type2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import abstract_type2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -219,7 +173,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/abstract_type2_sup.py b/tests/abstract_type2_sup.py
index e11fc338880caaf0e9d895bab1e023ea207cd569..9776dbdb0b61a8f419341909d704da25c968344d 100644
--- a/tests/abstract_type2_sup.py
+++ b/tests/abstract_type2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -991,7 +945,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/annotations1_sub.py b/tests/annotations1_sub.py
index 72f1e4fa503647f90a40e90601538e0ece0e3791..be5202aa00963415e6eaf58ac167cc4a61ed84e6 100644
--- a/tests/annotations1_sub.py
+++ b/tests/annotations1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import annotations2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -212,7 +166,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index 727bdab4f7fc8b30dff9545a46c1446125b3e253..f3c1c5ff1c8d405976a9d13dda2f5736f423298d 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -867,7 +821,7 @@ class document2Type(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'rating')
self.rating = ival_
@@ -973,7 +927,7 @@ class document3Type(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'rating')
self.rating = ival_
@@ -993,7 +947,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/annotations2_sub.py b/tests/annotations2_sub.py
index 72f1e4fa503647f90a40e90601538e0ece0e3791..be5202aa00963415e6eaf58ac167cc4a61ed84e6 100644
--- a/tests/annotations2_sub.py
+++ b/tests/annotations2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import annotations2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -212,7 +166,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/annotations2_sup.py b/tests/annotations2_sup.py
index 727bdab4f7fc8b30dff9545a46c1446125b3e253..f3c1c5ff1c8d405976a9d13dda2f5736f423298d 100644
--- a/tests/annotations2_sup.py
+++ b/tests/annotations2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -867,7 +821,7 @@ class document2Type(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'rating')
self.rating = ival_
@@ -973,7 +927,7 @@ class document3Type(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'rating')
self.rating = ival_
@@ -993,7 +947,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anonymous_type1_sub.py b/tests/anonymous_type1_sub.py
index d1edd83387e4b81c4355973cb43288794bc9bc1f..6363dc8050155d32aa30a670bb977939f99ad53c 100644
--- a/tests/anonymous_type1_sub.py
+++ b/tests/anonymous_type1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import anonymous_type2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -219,7 +173,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index 06b18870c2f0d2da9c2051b7360e9d96e9553883..86be032aeb1cd99b4f4d8923e5aed02fb863bfab 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1059,7 +1013,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anonymous_type2_sub.py b/tests/anonymous_type2_sub.py
index d1edd83387e4b81c4355973cb43288794bc9bc1f..6363dc8050155d32aa30a670bb977939f99ad53c 100644
--- a/tests/anonymous_type2_sub.py
+++ b/tests/anonymous_type2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import anonymous_type2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -219,7 +173,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anonymous_type2_sup.py b/tests/anonymous_type2_sup.py
index 06b18870c2f0d2da9c2051b7360e9d96e9553883..86be032aeb1cd99b4f4d8923e5aed02fb863bfab 100644
--- a/tests/anonymous_type2_sup.py
+++ b/tests/anonymous_type2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1059,7 +1013,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anysimpletype1_sub.py b/tests/anysimpletype1_sub.py
index 8814a2e55d63fd8111a44a45ff1a1cf54ff4870d..cc9a996d5a4b2e2cf5811a011ab7ed46a4246164 100644
--- a/tests/anysimpletype1_sub.py
+++ b/tests/anysimpletype1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import anysimpletype2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -205,7 +159,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index 7897acb9c16cc0d21b38f072e0bd1f89005e0d9d..1c877f400d621a579416fc694d6db0d453f1131d 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -875,7 +829,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anysimpletype2_sub.py b/tests/anysimpletype2_sub.py
index 8814a2e55d63fd8111a44a45ff1a1cf54ff4870d..cc9a996d5a4b2e2cf5811a011ab7ed46a4246164 100644
--- a/tests/anysimpletype2_sub.py
+++ b/tests/anysimpletype2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import anysimpletype2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -205,7 +159,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anysimpletype2_sup.py b/tests/anysimpletype2_sup.py
index 7897acb9c16cc0d21b38f072e0bd1f89005e0d9d..1c877f400d621a579416fc694d6db0d453f1131d 100644
--- a/tests/anysimpletype2_sup.py
+++ b/tests/anysimpletype2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -875,7 +829,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anywildcard1_sub.py b/tests/anywildcard1_sub.py
index 6fd3abce3cce4ac1afd22282d22493f352562f11..af1a259708621c9b76fb39bf93bc9be1108525fd 100644
--- a/tests/anywildcard1_sub.py
+++ b/tests/anywildcard1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import anywildcard2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -233,7 +187,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 9c55f8e97250981e257d6344c8cd6dad648bdbbf..1d7a17725b67c63a8b16eb78557be14b3536ae4e 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1086,7 +1040,7 @@ class CatalogType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'catagory')
self.catagory = ival_
@@ -1275,7 +1229,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anywildcard2_sub.py b/tests/anywildcard2_sub.py
index 6fd3abce3cce4ac1afd22282d22493f352562f11..af1a259708621c9b76fb39bf93bc9be1108525fd 100644
--- a/tests/anywildcard2_sub.py
+++ b/tests/anywildcard2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import anywildcard2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -233,7 +187,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/anywildcard2_sup.py b/tests/anywildcard2_sup.py
index 9c55f8e97250981e257d6344c8cd6dad648bdbbf..1d7a17725b67c63a8b16eb78557be14b3536ae4e 100644
--- a/tests/anywildcard2_sup.py
+++ b/tests/anywildcard2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1086,7 +1040,7 @@ class CatalogType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'catagory')
self.catagory = ival_
@@ -1275,7 +1229,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/attr_groups1_sub.py b/tests/attr_groups1_sub.py
index e08758646e5f53dabe48f07570a0b69ddcc4db72..16a4a86b6a1601009f87b33eb4a60af7853a4810 100644
--- a/tests/attr_groups1_sub.py
+++ b/tests/attr_groups1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import attr_groups2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -198,7 +152,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index 2965b9d007932977e679ac0e5635309c70f3d52f..269e4deaa8f689af5e7b554b11ef4b3e7feedf23 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -819,7 +773,7 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('value04')
try:
self.value04 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value05', node)
if value is not None and 'value05' not in already_processed:
@@ -830,14 +784,14 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('value06')
try:
self.value06 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value07', node)
if value is not None and 'value07' not in already_processed:
already_processed.add('value07')
try:
self.value07 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value01', node)
if value is not None and 'value01' not in already_processed:
@@ -848,7 +802,7 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('value02')
try:
self.value02 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value03', node)
if value is not None and 'value03' not in already_processed:
@@ -859,7 +813,7 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('sequence')
try:
self.sequence = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
if nodeName_ == 'returnedTags':
@@ -880,7 +834,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/attr_groups2_sub.py b/tests/attr_groups2_sub.py
index e08758646e5f53dabe48f07570a0b69ddcc4db72..16a4a86b6a1601009f87b33eb4a60af7853a4810 100644
--- a/tests/attr_groups2_sub.py
+++ b/tests/attr_groups2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import attr_groups2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -198,7 +152,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/attr_groups2_sup.py b/tests/attr_groups2_sup.py
index 2965b9d007932977e679ac0e5635309c70f3d52f..269e4deaa8f689af5e7b554b11ef4b3e7feedf23 100644
--- a/tests/attr_groups2_sup.py
+++ b/tests/attr_groups2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -819,7 +773,7 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('value04')
try:
self.value04 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value05', node)
if value is not None and 'value05' not in already_processed:
@@ -830,14 +784,14 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('value06')
try:
self.value06 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value07', node)
if value is not None and 'value07' not in already_processed:
already_processed.add('value07')
try:
self.value07 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value01', node)
if value is not None and 'value01' not in already_processed:
@@ -848,7 +802,7 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('value02')
try:
self.value02 = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value03', node)
if value is not None and 'value03' not in already_processed:
@@ -859,7 +813,7 @@ class GetUserReq(GeneratedsSuper):
already_processed.add('sequence')
try:
self.sequence = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
if nodeName_ == 'returnedTags':
@@ -880,7 +834,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/extensions1_sub.py b/tests/extensions1_sub.py
index c1e79eb4601deb96202a19e4edefa72509beb10e..669c801815df07fbdfc3713590bccbd71b48fa67 100644
--- a/tests/extensions1_sub.py
+++ b/tests/extensions1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import extensions2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -275,7 +229,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index 0bb74acc9e1156bb4f8d5ba7e53198e6fb2bcd12..5cfb5a86e0bbcea14a6307d49b13006556e34700 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1046,6 +1000,7 @@ class simpleFactoidType(GeneratedsSuper):
def validate_RelationType(self, value):
# Validate type RelationType, a restriction on RelationType2.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['down', 'add']
enumeration_respectee = False
for enum in enumerations:
@@ -1054,6 +1009,7 @@ class simpleFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['up', 'subtract']
enumeration_respectee = False
for enum in enumerations:
@@ -1062,6 +1018,7 @@ class simpleFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['right', 'divide']
enumeration_respectee = False
for enum in enumerations:
@@ -1169,6 +1126,7 @@ class mixedFactoidType(GeneratedsSuper):
def validate_RelationType(self, value):
# Validate type RelationType, a restriction on RelationType2.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['down', 'add']
enumeration_respectee = False
for enum in enumerations:
@@ -1177,6 +1135,7 @@ class mixedFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['up', 'subtract']
enumeration_respectee = False
for enum in enumerations:
@@ -1185,6 +1144,7 @@ class mixedFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['right', 'divide']
enumeration_respectee = False
for enum in enumerations:
@@ -1841,7 +1801,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/extensions2_sub.py b/tests/extensions2_sub.py
index c1e79eb4601deb96202a19e4edefa72509beb10e..669c801815df07fbdfc3713590bccbd71b48fa67 100644
--- a/tests/extensions2_sub.py
+++ b/tests/extensions2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import extensions2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -275,7 +229,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/extensions2_sup.py b/tests/extensions2_sup.py
index 0bb74acc9e1156bb4f8d5ba7e53198e6fb2bcd12..5cfb5a86e0bbcea14a6307d49b13006556e34700 100644
--- a/tests/extensions2_sup.py
+++ b/tests/extensions2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1046,6 +1000,7 @@ class simpleFactoidType(GeneratedsSuper):
def validate_RelationType(self, value):
# Validate type RelationType, a restriction on RelationType2.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['down', 'add']
enumeration_respectee = False
for enum in enumerations:
@@ -1054,6 +1009,7 @@ class simpleFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['up', 'subtract']
enumeration_respectee = False
for enum in enumerations:
@@ -1062,6 +1018,7 @@ class simpleFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['right', 'divide']
enumeration_respectee = False
for enum in enumerations:
@@ -1169,6 +1126,7 @@ class mixedFactoidType(GeneratedsSuper):
def validate_RelationType(self, value):
# Validate type RelationType, a restriction on RelationType2.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['down', 'add']
enumeration_respectee = False
for enum in enumerations:
@@ -1177,6 +1135,7 @@ class mixedFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['up', 'subtract']
enumeration_respectee = False
for enum in enumerations:
@@ -1185,6 +1144,7 @@ class mixedFactoidType(GeneratedsSuper):
break
if not enumeration_respectee:
warnings_.warn('Value "%(value)s" does not match xsd enumeration restriction on RelationType' % {"value" : value.encode("utf-8")} )
+ value = str(value)
enumerations = ['right', 'divide']
enumeration_respectee = False
for enum in enumerations:
@@ -1841,7 +1801,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/mapcleanname1_sub.py b/tests/mapcleanname1_sub.py
index 29b2d560cae9e4fd1620e337b071856ea3a4ca2d..b5a574140838b4cdf934e01d826f9f1a6228b3f6 100644
--- a/tests/mapcleanname1_sub.py
+++ b/tests/mapcleanname1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import mapcleanname2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -240,7 +194,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py
index 409eb9c79b0d87435b02c04d30af830c969907f0..35f9e0b5fcfc64e9bad58b730b4f7ccc9fe344a9 100644
--- a/tests/mapcleanname1_sup.py
+++ b/tests/mapcleanname1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -785,7 +739,7 @@ class complex_type01(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value01')
self.integer_value01.append(ival_)
@@ -793,7 +747,7 @@ class complex_type01(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value01')
self.float_value01 = fval_
@@ -931,7 +885,7 @@ class complex_type02(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value02')
self.integer_value02.append(ival_)
@@ -939,7 +893,7 @@ class complex_type02(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value02')
self.float_value02 = fval_
@@ -1066,7 +1020,7 @@ class complex_type03(complex_type02):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value03')
self.integer_value03.append(ival_)
@@ -1074,7 +1028,7 @@ class complex_type03(complex_type02):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value03')
self.float_value03 = fval_
@@ -1208,7 +1162,7 @@ class type_(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value02')
self.integer_value02.append(ival_)
@@ -1216,7 +1170,7 @@ class type_(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value02')
self.float_value02 = fval_
@@ -1343,7 +1297,7 @@ class complex_type04(type_):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value03')
self.integer_value03.append(ival_)
@@ -1351,7 +1305,7 @@ class complex_type04(type_):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value03')
self.float_value03 = fval_
@@ -1485,7 +1439,7 @@ class build_(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value02')
self.integer_value02.append(ival_)
@@ -1493,7 +1447,7 @@ class build_(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value02')
self.float_value02 = fval_
@@ -1620,7 +1574,7 @@ class complex_type05(build_):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value03')
self.integer_value03.append(ival_)
@@ -1628,7 +1582,7 @@ class complex_type05(build_):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value03')
self.float_value03 = fval_
@@ -1647,7 +1601,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/mapcleanname2_sub.py b/tests/mapcleanname2_sub.py
index 29b2d560cae9e4fd1620e337b071856ea3a4ca2d..b5a574140838b4cdf934e01d826f9f1a6228b3f6 100644
--- a/tests/mapcleanname2_sub.py
+++ b/tests/mapcleanname2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import mapcleanname2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -240,7 +194,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/mapcleanname2_sup.py b/tests/mapcleanname2_sup.py
index 409eb9c79b0d87435b02c04d30af830c969907f0..35f9e0b5fcfc64e9bad58b730b4f7ccc9fe344a9 100644
--- a/tests/mapcleanname2_sup.py
+++ b/tests/mapcleanname2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -785,7 +739,7 @@ class complex_type01(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value01')
self.integer_value01.append(ival_)
@@ -793,7 +747,7 @@ class complex_type01(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value01')
self.float_value01 = fval_
@@ -931,7 +885,7 @@ class complex_type02(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value02')
self.integer_value02.append(ival_)
@@ -939,7 +893,7 @@ class complex_type02(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value02')
self.float_value02 = fval_
@@ -1066,7 +1020,7 @@ class complex_type03(complex_type02):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value03')
self.integer_value03.append(ival_)
@@ -1074,7 +1028,7 @@ class complex_type03(complex_type02):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value03')
self.float_value03 = fval_
@@ -1208,7 +1162,7 @@ class type_(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value02')
self.integer_value02.append(ival_)
@@ -1216,7 +1170,7 @@ class type_(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value02')
self.float_value02 = fval_
@@ -1343,7 +1297,7 @@ class complex_type04(type_):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value03')
self.integer_value03.append(ival_)
@@ -1351,7 +1305,7 @@ class complex_type04(type_):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value03')
self.float_value03 = fval_
@@ -1485,7 +1439,7 @@ class build_(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value02')
self.integer_value02.append(ival_)
@@ -1493,7 +1447,7 @@ class build_(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value02')
self.float_value02 = fval_
@@ -1620,7 +1574,7 @@ class complex_type05(build_):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_value03')
self.integer_value03.append(ival_)
@@ -1628,7 +1582,7 @@ class complex_type05(build_):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'float_value03')
self.float_value03 = fval_
@@ -1647,7 +1601,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/out1_sub.py b/tests/out1_sub.py
index 9cfb8b4484c15b882addc6e92d2f0706b576df85..aaec1077699c341d422e0582183362bf019125d3 100644
--- a/tests/out1_sub.py
+++ b/tests/out1_sub.py
@@ -23,58 +23,12 @@
#
import sys
+from lxml import etree as etree_
import out2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -274,7 +228,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index 96a6724a93cebecbd5b21d57e6d9946d0cb89458..0f320c90ea22ce143f7f142f8a60f048a953ed85 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -28,60 +28,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -97,7 +51,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1323,14 +1277,14 @@ class person(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1353,7 +1307,7 @@ class person(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1521,6 +1475,7 @@ class programmer(person):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1725,7 +1680,7 @@ class programmer(person):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -1734,7 +1689,7 @@ class programmer(person):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -1743,7 +1698,7 @@ class programmer(person):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -1752,7 +1707,7 @@ class programmer(person):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -1770,7 +1725,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -1780,7 +1735,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -1790,7 +1745,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -1800,7 +1755,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -1823,7 +1778,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -1831,7 +1786,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -2534,7 +2489,7 @@ class agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2713,7 +2668,7 @@ class special_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2961,7 +2916,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2969,7 +2924,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2977,7 +2932,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2985,7 +2940,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -3138,14 +3093,14 @@ class info(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -3295,7 +3250,7 @@ class client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -3361,7 +3316,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/out2_sub.py b/tests/out2_sub.py
index 9cfb8b4484c15b882addc6e92d2f0706b576df85..aaec1077699c341d422e0582183362bf019125d3 100644
--- a/tests/out2_sub.py
+++ b/tests/out2_sub.py
@@ -23,58 +23,12 @@
#
import sys
+from lxml import etree as etree_
import out2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -274,7 +228,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/out2_sup.py b/tests/out2_sup.py
index 96a6724a93cebecbd5b21d57e6d9946d0cb89458..0f320c90ea22ce143f7f142f8a60f048a953ed85 100644
--- a/tests/out2_sup.py
+++ b/tests/out2_sup.py
@@ -28,60 +28,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -97,7 +51,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1323,14 +1277,14 @@ class person(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1353,7 +1307,7 @@ class person(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1521,6 +1475,7 @@ class programmer(person):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1725,7 +1680,7 @@ class programmer(person):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -1734,7 +1689,7 @@ class programmer(person):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -1743,7 +1698,7 @@ class programmer(person):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -1752,7 +1707,7 @@ class programmer(person):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -1770,7 +1725,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -1780,7 +1735,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -1790,7 +1745,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -1800,7 +1755,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -1823,7 +1778,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -1831,7 +1786,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -2534,7 +2489,7 @@ class agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2713,7 +2668,7 @@ class special_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2961,7 +2916,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2969,7 +2924,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2977,7 +2932,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2985,7 +2940,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -3138,14 +3093,14 @@ class info(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -3295,7 +3250,7 @@ class client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -3361,7 +3316,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/people_procincl1_sub.py b/tests/people_procincl1_sub.py
index 043e65d1a333ce6008c702e7c67b714a8b6e56e3..09f65caf9f9e6fdd26a0fb6ab878b69063cf2d33 100644
--- a/tests/people_procincl1_sub.py
+++ b/tests/people_procincl1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import people_procincl2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -303,7 +257,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index 53ebbc070fb2baac7e551c706fb7dd362ebac957..49d9a6f655583cb39a2a28b7976f270fff22843c 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1283,14 +1237,14 @@ class person(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1313,7 +1267,7 @@ class person(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1711,7 +1665,7 @@ class agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -1865,7 +1819,7 @@ class special_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2079,7 +2033,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2087,7 +2041,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2095,7 +2049,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2103,7 +2057,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -2210,14 +2164,14 @@ class info(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -2316,7 +2270,7 @@ class vehicle(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'wheelcount')
self.wheelcount = ival_
@@ -2590,6 +2544,7 @@ class programmer(person):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -2787,7 +2742,7 @@ class programmer(person):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -2796,7 +2751,7 @@ class programmer(person):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -2805,7 +2760,7 @@ class programmer(person):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -2814,7 +2769,7 @@ class programmer(person):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -2832,7 +2787,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -2842,7 +2797,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -2852,7 +2807,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -2862,7 +2817,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -2881,7 +2836,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -2889,7 +2844,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -3000,7 +2955,7 @@ class client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -3242,7 +3197,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/people_procincl2_sub.py b/tests/people_procincl2_sub.py
index 043e65d1a333ce6008c702e7c67b714a8b6e56e3..09f65caf9f9e6fdd26a0fb6ab878b69063cf2d33 100644
--- a/tests/people_procincl2_sub.py
+++ b/tests/people_procincl2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import people_procincl2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -303,7 +257,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/people_procincl2_sup.py b/tests/people_procincl2_sup.py
index 53ebbc070fb2baac7e551c706fb7dd362ebac957..49d9a6f655583cb39a2a28b7976f270fff22843c 100644
--- a/tests/people_procincl2_sup.py
+++ b/tests/people_procincl2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1283,14 +1237,14 @@ class person(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1313,7 +1267,7 @@ class person(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1711,7 +1665,7 @@ class agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -1865,7 +1819,7 @@ class special_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2079,7 +2033,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2087,7 +2041,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2095,7 +2049,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2103,7 +2057,7 @@ class booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -2210,14 +2164,14 @@ class info(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -2316,7 +2270,7 @@ class vehicle(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'wheelcount')
self.wheelcount = ival_
@@ -2590,6 +2544,7 @@ class programmer(person):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -2787,7 +2742,7 @@ class programmer(person):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -2796,7 +2751,7 @@ class programmer(person):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -2805,7 +2760,7 @@ class programmer(person):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -2814,7 +2769,7 @@ class programmer(person):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -2832,7 +2787,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -2842,7 +2797,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -2852,7 +2807,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -2862,7 +2817,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -2881,7 +2836,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -2889,7 +2844,7 @@ class programmer(person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -3000,7 +2955,7 @@ class client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -3242,7 +3197,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/prefix_classname1_sub.py b/tests/prefix_classname1_sub.py
index a196947cf8ce05793a34dbac19687a5db1ef9537..c9fe1139ffb6e051756a0e40c74068b613b6a7d6 100644
--- a/tests/prefix_classname1_sub.py
+++ b/tests/prefix_classname1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import prefix_classname2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -275,7 +229,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py
index 105305a421688195168bcb14f2b20af3e2112c97..c8af5adbe474e7fa252687d9d183011d7130d9ac 100644
--- a/tests/prefix_classname1_sup.py
+++ b/tests/prefix_classname1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1227,14 +1181,14 @@ class tomato_person(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1257,7 +1211,7 @@ class tomato_person(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1379,6 +1333,7 @@ class tomato_programmer(tomato_person):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1583,7 +1538,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -1592,7 +1547,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -1601,7 +1556,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -1610,7 +1565,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -1628,7 +1583,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -1638,7 +1593,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -1648,7 +1603,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -1658,7 +1613,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -1681,7 +1636,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -1689,7 +1644,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -2208,7 +2163,7 @@ class tomato_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2341,7 +2296,7 @@ class tomato_special_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2543,7 +2498,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2551,7 +2506,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2559,7 +2514,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2567,7 +2522,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -2674,14 +2629,14 @@ class tomato_info(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -2785,7 +2740,7 @@ class tomato_client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -2805,7 +2760,7 @@ Usage: python <tomato_Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/prefix_classname2_sub.py b/tests/prefix_classname2_sub.py
index a196947cf8ce05793a34dbac19687a5db1ef9537..c9fe1139ffb6e051756a0e40c74068b613b6a7d6 100644
--- a/tests/prefix_classname2_sub.py
+++ b/tests/prefix_classname2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import prefix_classname2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -275,7 +229,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/prefix_classname2_sup.py b/tests/prefix_classname2_sup.py
index 105305a421688195168bcb14f2b20af3e2112c97..c8af5adbe474e7fa252687d9d183011d7130d9ac 100644
--- a/tests/prefix_classname2_sup.py
+++ b/tests/prefix_classname2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1227,14 +1181,14 @@ class tomato_person(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1257,7 +1211,7 @@ class tomato_person(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1379,6 +1333,7 @@ class tomato_programmer(tomato_person):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1583,7 +1538,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -1592,7 +1547,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -1601,7 +1556,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -1610,7 +1565,7 @@ class tomato_programmer(tomato_person):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -1628,7 +1583,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -1638,7 +1593,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -1648,7 +1603,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -1658,7 +1613,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -1681,7 +1636,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -1689,7 +1644,7 @@ class tomato_programmer(tomato_person):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -2208,7 +2163,7 @@ class tomato_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2341,7 +2296,7 @@ class tomato_special_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2543,7 +2498,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2551,7 +2506,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2559,7 +2514,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2567,7 +2522,7 @@ class tomato_booster(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -2674,14 +2629,14 @@ class tomato_info(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -2785,7 +2740,7 @@ class tomato_client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -2805,7 +2760,7 @@ Usage: python <tomato_Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/recursive_simpletype1_sub.py b/tests/recursive_simpletype1_sub.py
index 131671e0f22a759ee36192e077a8d173863a2617..269c0e73706809beabafed84968a3c38a1204741 100644
--- a/tests/recursive_simpletype1_sub.py
+++ b/tests/recursive_simpletype1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import recursive_simpletype2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -198,7 +152,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index a51e71971f400d40d5211b8926800599cb03a876..6acffe830e3cdecfe6ba94c567e508cbfed5ad64 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -756,7 +710,7 @@ class PersonType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'personId')
self.personId = ival_
@@ -782,7 +736,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/recursive_simpletype2_sub.py b/tests/recursive_simpletype2_sub.py
index 131671e0f22a759ee36192e077a8d173863a2617..269c0e73706809beabafed84968a3c38a1204741 100644
--- a/tests/recursive_simpletype2_sub.py
+++ b/tests/recursive_simpletype2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import recursive_simpletype2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -198,7 +152,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/recursive_simpletype2_sup.py b/tests/recursive_simpletype2_sup.py
index a51e71971f400d40d5211b8926800599cb03a876..6acffe830e3cdecfe6ba94c567e508cbfed5ad64 100644
--- a/tests/recursive_simpletype2_sup.py
+++ b/tests/recursive_simpletype2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -756,7 +710,7 @@ class PersonType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'personId')
self.personId = ival_
@@ -782,7 +736,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/reference_simpletype1_sub.py b/tests/reference_simpletype1_sub.py
index be2d57213d4143726bc6fa4050264277240713d7..3bc76694638fd89597eceb2daf233991f0c54fb7 100644
--- a/tests/reference_simpletype1_sub.py
+++ b/tests/reference_simpletype1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import reference_simpletype2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -198,7 +152,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/reference_simpletype1_sup.py b/tests/reference_simpletype1_sup.py
index faae4b350881a42faaaef471ad79a85ea09a186c..c5ae428f2a0146c89a5d4a49412b62b223797b17 100644
--- a/tests/reference_simpletype1_sup.py
+++ b/tests/reference_simpletype1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -765,21 +719,21 @@ class dummy(GeneratedsSuper):
already_processed.add('test_ref_attr')
try:
self.test_ref_attr = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('test_normal_attr', node)
if value is not None and 'test_normal_attr' not in already_processed:
already_processed.add('test_normal_attr')
try:
self.test_normal_attr = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
if nodeName_ == 'test_ref_element':
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'test_ref_element')
self.test_ref_element = ival_
@@ -787,7 +741,7 @@ class dummy(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'test_normal_element')
self.test_normal_element = ival_
@@ -804,7 +758,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/reference_simpletype2_sub.py b/tests/reference_simpletype2_sub.py
index be2d57213d4143726bc6fa4050264277240713d7..3bc76694638fd89597eceb2daf233991f0c54fb7 100644
--- a/tests/reference_simpletype2_sub.py
+++ b/tests/reference_simpletype2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import reference_simpletype2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -198,7 +152,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/reference_simpletype2_sup.py b/tests/reference_simpletype2_sup.py
index faae4b350881a42faaaef471ad79a85ea09a186c..c5ae428f2a0146c89a5d4a49412b62b223797b17 100644
--- a/tests/reference_simpletype2_sup.py
+++ b/tests/reference_simpletype2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -765,21 +719,21 @@ class dummy(GeneratedsSuper):
already_processed.add('test_ref_attr')
try:
self.test_ref_attr = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('test_normal_attr', node)
if value is not None and 'test_normal_attr' not in already_processed:
already_processed.add('test_normal_attr')
try:
self.test_normal_attr = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
if nodeName_ == 'test_ref_element':
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'test_ref_element')
self.test_ref_element = ival_
@@ -787,7 +741,7 @@ class dummy(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'test_normal_element')
self.test_normal_element = ival_
@@ -804,7 +758,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simplecontent_restriction1_sub.py b/tests/simplecontent_restriction1_sub.py
index 904619e673ffa42e2ea27537e5e0c2ed898f7437..f74b7a57bcdf78720e8bde88976d3667ac96f2fa 100644
--- a/tests/simplecontent_restriction1_sub.py
+++ b/tests/simplecontent_restriction1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import simplecontent_restriction2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -212,7 +166,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index c987b2d6097c6b40ec970baa6179deaa07fee9b0..286175e8a45fa3a16640fb13dafdc33cadd338e8 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1006,7 +960,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simplecontent_restriction2_sub.py b/tests/simplecontent_restriction2_sub.py
index 904619e673ffa42e2ea27537e5e0c2ed898f7437..f74b7a57bcdf78720e8bde88976d3667ac96f2fa 100644
--- a/tests/simplecontent_restriction2_sub.py
+++ b/tests/simplecontent_restriction2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import simplecontent_restriction2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -212,7 +166,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simplecontent_restriction2_sup.py b/tests/simplecontent_restriction2_sup.py
index c987b2d6097c6b40ec970baa6179deaa07fee9b0..286175e8a45fa3a16640fb13dafdc33cadd338e8 100644
--- a/tests/simplecontent_restriction2_sup.py
+++ b/tests/simplecontent_restriction2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1006,7 +960,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletype_memberspecs1_sub.py b/tests/simpletype_memberspecs1_sub.py
index eae5e69d5d04dabb9b5dbff6bb137455729a31bf..aacb59d3e87b0bd24faafcfa74d9ed757ea36a70 100644
--- a/tests/simpletype_memberspecs1_sub.py
+++ b/tests/simpletype_memberspecs1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import simpletype_memberspecs2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -205,7 +159,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index 0d0319612e53a3f0dd142dc097b1c5e960617485..624ce0a8f383332aee686fa7abc061b9e930fd55 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -836,7 +790,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletype_memberspecs2_sub.py b/tests/simpletype_memberspecs2_sub.py
index eae5e69d5d04dabb9b5dbff6bb137455729a31bf..aacb59d3e87b0bd24faafcfa74d9ed757ea36a70 100644
--- a/tests/simpletype_memberspecs2_sub.py
+++ b/tests/simpletype_memberspecs2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import simpletype_memberspecs2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -205,7 +159,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletype_memberspecs2_sup.py b/tests/simpletype_memberspecs2_sup.py
index 0d0319612e53a3f0dd142dc097b1c5e960617485..624ce0a8f383332aee686fa7abc061b9e930fd55 100644
--- a/tests/simpletype_memberspecs2_sup.py
+++ b/tests/simpletype_memberspecs2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -836,7 +790,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletypes_other1_sub.py b/tests/simpletypes_other1_sub.py
index 6eae03bdfe029b9326e0c9956b3b8a342ab94104..5b76f3b6ae1bc1ba2de7b780090762c1346a40a6 100644
--- a/tests/simpletypes_other1_sub.py
+++ b/tests/simpletypes_other1_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import simpletypes_other2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -205,7 +159,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 7c6dab255cda05acd64b605ba732ad16fe1782c1..32d260852dc98f26e2ea3763c6faf5071e5ada93 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1171,7 +1125,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integerVal1')
self.integerVal1 = ival_
@@ -1179,7 +1133,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integerVal2')
self.integerVal2.append(ival_)
@@ -1215,7 +1169,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'decimalVal1')
self.decimalVal1 = fval_
@@ -1223,7 +1177,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'decimalVal2')
self.decimalVal2.append(fval_)
@@ -1231,7 +1185,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'doubleVal1')
self.doubleVal1 = fval_
@@ -1239,7 +1193,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'doubleVal2')
self.doubleVal2.append(fval_)
@@ -1247,7 +1201,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'floatVal1')
self.floatVal1 = fval_
@@ -1255,7 +1209,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'floatVal2')
self.floatVal2.append(fval_)
@@ -1289,7 +1243,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletypes_other2_sub.py b/tests/simpletypes_other2_sub.py
index 6eae03bdfe029b9326e0c9956b3b8a342ab94104..5b76f3b6ae1bc1ba2de7b780090762c1346a40a6 100644
--- a/tests/simpletypes_other2_sub.py
+++ b/tests/simpletypes_other2_sub.py
@@ -24,58 +24,12 @@
#
import sys
+from lxml import etree as etree_
import simpletypes_other2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -205,7 +159,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/simpletypes_other2_sup.py b/tests/simpletypes_other2_sup.py
index 7c6dab255cda05acd64b605ba732ad16fe1782c1..32d260852dc98f26e2ea3763c6faf5071e5ada93 100644
--- a/tests/simpletypes_other2_sup.py
+++ b/tests/simpletypes_other2_sup.py
@@ -29,60 +29,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -98,7 +52,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1171,7 +1125,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integerVal1')
self.integerVal1 = ival_
@@ -1179,7 +1133,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integerVal2')
self.integerVal2.append(ival_)
@@ -1215,7 +1169,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'decimalVal1')
self.decimalVal1 = fval_
@@ -1223,7 +1177,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'decimalVal2')
self.decimalVal2.append(fval_)
@@ -1231,7 +1185,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'doubleVal1')
self.doubleVal1 = fval_
@@ -1239,7 +1193,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'doubleVal2')
self.doubleVal2.append(fval_)
@@ -1247,7 +1201,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'floatVal1')
self.floatVal1 = fval_
@@ -1255,7 +1209,7 @@ class simpleTypeTest(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'floatVal2')
self.floatVal2.append(fval_)
@@ -1289,7 +1243,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/to_etree1_sub.py b/tests/to_etree1_sub.py
index 295c01140ce1cede5e4731b3cb40d8691b548c78..7f874cba3c44efd1ec9898e6818b871cfa133520 100644
--- a/tests/to_etree1_sub.py
+++ b/tests/to_etree1_sub.py
@@ -26,58 +26,12 @@
#
import sys
+from lxml import etree as etree_
import to_etree2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -319,7 +273,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index 91e61afc2935538a9fbf97ec45ca6d6078aad562..134f962cc5fa344e2110629dbe639171cf384f71 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -31,60 +31,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -100,7 +54,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1072,14 +1026,14 @@ class personType(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1102,7 +1056,7 @@ class personType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1130,7 +1084,7 @@ class personType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'range')
self.range_ = ival_
@@ -1288,6 +1242,7 @@ class programmerType(personType):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1395,7 +1350,7 @@ class programmerType(personType):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -1404,7 +1359,7 @@ class programmerType(personType):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -1413,7 +1368,7 @@ class programmerType(personType):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -1422,7 +1377,7 @@ class programmerType(personType):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -1440,7 +1395,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -1450,7 +1405,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -1460,7 +1415,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -1470,7 +1425,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -1497,7 +1452,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -1505,7 +1460,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -1620,7 +1575,7 @@ class paramType(GeneratedsSuper):
already_processed.add('flow')
try:
self.flow = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
self.validate_FlowType(self.flow) # validate type FlowType
value = find_attr_value_('sid', node)
@@ -1748,7 +1703,7 @@ class python_programmerType(programmerType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'flowvalue')
self.flowvalue = ival_
@@ -1995,7 +1950,7 @@ class agentType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2095,7 +2050,7 @@ class special_agentType(agentType):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2190,7 +2145,7 @@ class weird_agentType(agentType):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2332,7 +2287,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2340,7 +2295,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2348,7 +2303,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2356,7 +2311,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -2427,14 +2382,14 @@ class infoType(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -2502,7 +2457,7 @@ class vehicleType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'wheelcount')
self.wheelcount = ival_
@@ -2704,7 +2659,7 @@ class hot_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2776,7 +2731,7 @@ class client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -2809,7 +2764,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/to_etree2_sub.py b/tests/to_etree2_sub.py
index 295c01140ce1cede5e4731b3cb40d8691b548c78..7f874cba3c44efd1ec9898e6818b871cfa133520 100644
--- a/tests/to_etree2_sub.py
+++ b/tests/to_etree2_sub.py
@@ -26,58 +26,12 @@
#
import sys
+from lxml import etree as etree_
import to_etree2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -319,7 +273,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/to_etree2_sup.py b/tests/to_etree2_sup.py
index 91e61afc2935538a9fbf97ec45ca6d6078aad562..134f962cc5fa344e2110629dbe639171cf384f71 100644
--- a/tests/to_etree2_sup.py
+++ b/tests/to_etree2_sup.py
@@ -31,60 +31,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -100,7 +54,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -1072,14 +1026,14 @@ class personType(GeneratedsSuper):
already_processed.add('ratio')
try:
self.ratio = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (ratio): %s' % exp)
value = find_attr_value_('id', node)
if value is not None and 'id' not in already_processed:
already_processed.add('id')
try:
self.id = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('value', node)
if value is not None and 'value' not in already_processed:
@@ -1102,7 +1056,7 @@ class personType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'category')
self.category = ival_
@@ -1130,7 +1084,7 @@ class personType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'range')
self.range_ = ival_
@@ -1288,6 +1242,7 @@ class programmerType(personType):
def validate_ArrayTypes(self, value):
# Validate type ArrayTypes, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1395,7 +1350,7 @@ class programmerType(personType):
already_processed.add('attrnegint')
try:
self.attrnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnegint >= 0:
raise_parse_error(node, 'Invalid NegativeInteger')
@@ -1404,7 +1359,7 @@ class programmerType(personType):
already_processed.add('attrposint')
try:
self.attrposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrposint <= 0:
raise_parse_error(node, 'Invalid PositiveInteger')
@@ -1413,7 +1368,7 @@ class programmerType(personType):
already_processed.add('attrnonnegint')
try:
self.attrnonnegint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonnegint < 0:
raise_parse_error(node, 'Invalid NonNegativeInteger')
@@ -1422,7 +1377,7 @@ class programmerType(personType):
already_processed.add('attrnonposint')
try:
self.attrnonposint = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
if self.attrnonposint > 0:
raise_parse_error(node, 'Invalid NonPositiveInteger')
@@ -1440,7 +1395,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ <= 0:
raise_parse_error(child_, 'requires positiveInteger')
@@ -1450,7 +1405,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ > 0:
raise_parse_error(child_, 'requires nonPositiveInteger')
@@ -1460,7 +1415,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ >= 0:
raise_parse_error(child_, 'requires negativeInteger')
@@ -1470,7 +1425,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
if ival_ < 0:
raise_parse_error(child_, 'requires nonNegativeInteger')
@@ -1497,7 +1452,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'elshort')
self.elshort = ival_
@@ -1505,7 +1460,7 @@ class programmerType(personType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'ellong')
self.ellong = ival_
@@ -1620,7 +1575,7 @@ class paramType(GeneratedsSuper):
already_processed.add('flow')
try:
self.flow = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
self.validate_FlowType(self.flow) # validate type FlowType
value = find_attr_value_('sid', node)
@@ -1748,7 +1703,7 @@ class python_programmerType(programmerType):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'flowvalue')
self.flowvalue = ival_
@@ -1995,7 +1950,7 @@ class agentType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2095,7 +2050,7 @@ class special_agentType(agentType):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2190,7 +2145,7 @@ class weird_agentType(agentType):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2332,7 +2287,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_name')
self.other_name = fval_
@@ -2340,7 +2295,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'class')
self.class_ = fval_
@@ -2348,7 +2303,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'other_value')
self.other_value.append(fval_)
@@ -2356,7 +2311,7 @@ class boosterType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'type')
self.type_.append(fval_)
@@ -2427,14 +2382,14 @@ class infoType(GeneratedsSuper):
already_processed.add('rating')
try:
self.rating = float(value)
- except ValueError, exp:
+ except ValueError as exp:
raise ValueError('Bad float/double attribute (rating): %s' % exp)
value = find_attr_value_('type', node)
if value is not None and 'type' not in already_processed:
already_processed.add('type')
try:
self.type_ = int(value)
- except ValueError, exp:
+ except ValueError as exp:
raise_parse_error(node, 'Bad integer attribute: %s' % exp)
value = find_attr_value_('name', node)
if value is not None and 'name' not in already_processed:
@@ -2502,7 +2457,7 @@ class vehicleType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'wheelcount')
self.wheelcount = ival_
@@ -2704,7 +2659,7 @@ class hot_agent(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'priority')
self.priority = fval_
@@ -2776,7 +2731,7 @@ class client_handlerType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'refid')
self.refid = ival_
@@ -2809,7 +2764,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/validate_simpletypes1_sub.py b/tests/validate_simpletypes1_sub.py
index 334881a0a42d60e6e337f6547b49feb84cdec147..2fcfe925d725a1d6745051c92bceca20075c3dba 100644
--- a/tests/validate_simpletypes1_sub.py
+++ b/tests/validate_simpletypes1_sub.py
@@ -23,58 +23,12 @@
#
import sys
+from lxml import etree as etree_
import validate_simpletypes2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -218,7 +172,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/validate_simpletypes1_sup.py b/tests/validate_simpletypes1_sup.py
index 88335411a6d0043395e0ed55cfb365f1a88b88cd..23e576d9525fe03bdab12c7907f9ca0b9de5aa41 100644
--- a/tests/validate_simpletypes1_sup.py
+++ b/tests/validate_simpletypes1_sup.py
@@ -28,60 +28,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -97,7 +51,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -961,6 +915,7 @@ class simpleOneType(GeneratedsSuper):
def validate_token_enum_st(self, value):
# Validate type token_enum_st, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1145,7 +1100,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_range_1_value')
self.integer_range_1_value = ival_
@@ -1169,7 +1124,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_range_incl_value')
self.integer_range_incl_value = ival_
@@ -1178,7 +1133,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_range_excl_value')
self.integer_range_excl_value = ival_
@@ -1197,7 +1152,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'totalDigits_value')
self.totalDigits_value = fval_
@@ -1206,7 +1161,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'anonymous_float_value')
self.anonymous_float_value = fval_
@@ -1215,7 +1170,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'primative_integer')
self.primative_integer = ival_
@@ -1223,7 +1178,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'primative_float')
self.primative_float = fval_
@@ -1422,7 +1377,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/validate_simpletypes1_warnings.txt b/tests/validate_simpletypes1_warnings.txt
index 381f25b02ada5274c11b2ad78987df3d89e971de..5e14182e7556027300906162cc591c00c042e52d 100644
--- a/tests/validate_simpletypes1_warnings.txt
+++ b/tests/validate_simpletypes1_warnings.txt
@@ -1,34 +1,34 @@
-tests/validate_simpletypes2_sup.py:949: UserWarning: Value "2" does not match xsd minExclusive restriction on integer_range_1_st
+tests/validate_simpletypes2_sup.py:903: 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:959: UserWarning: Value "mmaaa1234mnopzzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:913: 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:971: UserWarning: Value "floatxx" does not match xsd enumeration restriction on token_enum_st
+tests/validate_simpletypes2_sup.py:926: 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:978: UserWarning: Value "22" does not match xsd maxInclusive restriction on integer_range_incl_st
+tests/validate_simpletypes2_sup.py:933: 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:983: UserWarning: Value "-40" does not match xsd minExclusive restriction on integer_range_excl_st
+tests/validate_simpletypes2_sup.py:938: 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:992: UserWarning: Value "mno pqr" does not match xsd minLength restriction on min_max_length_st
+tests/validate_simpletypes2_sup.py:947: 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:997: UserWarning: Value "012345" does not match xsd length restriction on length_st
+tests/validate_simpletypes2_sup.py:952: 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:1007: UserWarning: Value "0.2" does not match xsd minInclusive restriction on anonymous_float_valueType
+tests/validate_simpletypes2_sup.py:962: 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:951: UserWarning: Value "9" does not match xsd maxExclusive restriction on integer_range_1_st
+tests/validate_simpletypes2_sup.py:905: 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:959: UserWarning: Value "aaa1234mnopzzzbcd" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:913: 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:976: UserWarning: Value "-50" does not match xsd minInclusive restriction on integer_range_incl_st
+tests/validate_simpletypes2_sup.py:931: 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:990: UserWarning: Value "asdf asdf asdf asdf asdf asdf" does not match xsd maxLength restriction on min_max_length_st
+tests/validate_simpletypes2_sup.py:945: 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:997: UserWarning: Value "01234567890" does not match xsd length restriction on length_st
+tests/validate_simpletypes2_sup.py:952: 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:1009: UserWarning: Value "6.6" does not match xsd maxInclusive restriction on anonymous_float_valueType
+tests/validate_simpletypes2_sup.py:964: 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:956: UserWarning: Value "aaa12zzz" does not match xsd minLength restriction on pattern_st
+tests/validate_simpletypes2_sup.py:910: 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:959: UserWarning: Value "aaa12zzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:913: 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:1341: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
+tests/validate_simpletypes2_sup.py:1296: 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 334881a0a42d60e6e337f6547b49feb84cdec147..2fcfe925d725a1d6745051c92bceca20075c3dba 100644
--- a/tests/validate_simpletypes2_sub.py
+++ b/tests/validate_simpletypes2_sub.py
@@ -23,58 +23,12 @@
#
import sys
+from lxml import etree as etree_
import validate_simpletypes2_sup as supermod
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -218,7 +172,7 @@ Usage: python ???.py <infilename>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/validate_simpletypes2_sup.py b/tests/validate_simpletypes2_sup.py
index 88335411a6d0043395e0ed55cfb365f1a88b88cd..23e576d9525fe03bdab12c7907f9ca0b9de5aa41 100644
--- a/tests/validate_simpletypes2_sup.py
+++ b/tests/validate_simpletypes2_sup.py
@@ -28,60 +28,14 @@ import re as re_
import base64
import datetime as datetime_
import warnings as warnings_
+from lxml import etree as etree_
Validate_simpletypes_ = True
-etree_ = None
-Verbose_import_ = False
-(
- XMLParser_import_none, XMLParser_import_lxml,
- XMLParser_import_elementtree
-) = range(3)
-XMLParser_import_library = None
-try:
- # lxml
- from lxml import etree as etree_
- XMLParser_import_library = XMLParser_import_lxml
- if Verbose_import_:
- print("running with lxml.etree")
-except ImportError:
- try:
- # cElementTree from Python 2.5+
- import xml.etree.cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree on Python 2.5+")
- except ImportError:
- try:
- # ElementTree from Python 2.5+
- import xml.etree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree on Python 2.5+")
- except ImportError:
- try:
- # normal cElementTree install
- import cElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with cElementTree")
- except ImportError:
- try:
- # normal ElementTree install
- import elementtree.ElementTree as etree_
- XMLParser_import_library = XMLParser_import_elementtree
- if Verbose_import_:
- print("running with ElementTree")
- except ImportError:
- raise ImportError(
- "Failed to import ElementTree from any known place")
-
-
def parsexml_(*args, **kwargs):
- if (XMLParser_import_library == XMLParser_import_lxml and
- 'parser' not in kwargs):
+ if 'parser' not in kwargs:
# Use the lxml ElementTree compatible parser so that, e.g.,
# we ignore comments.
kwargs['parser'] = etree_.ETCompatXMLParser()
@@ -97,7 +51,7 @@ def parsexml_(*args, **kwargs):
try:
from generatedssuper import GeneratedsSuper
-except ImportError, exp:
+except ImportError as exp:
class GeneratedsSuper(object):
tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
@@ -961,6 +915,7 @@ class simpleOneType(GeneratedsSuper):
def validate_token_enum_st(self, value):
# Validate type token_enum_st, a restriction on xs:NMTOKEN.
if value is not None and Validate_simpletypes_:
+ value = str(value)
enumerations = ['float', 'int', 'Name', 'token']
enumeration_respectee = False
for enum in enumerations:
@@ -1145,7 +1100,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_range_1_value')
self.integer_range_1_value = ival_
@@ -1169,7 +1124,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_range_incl_value')
self.integer_range_incl_value = ival_
@@ -1178,7 +1133,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'integer_range_excl_value')
self.integer_range_excl_value = ival_
@@ -1197,7 +1152,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'totalDigits_value')
self.totalDigits_value = fval_
@@ -1206,7 +1161,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'anonymous_float_value')
self.anonymous_float_value = fval_
@@ -1215,7 +1170,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
ival_ = int(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'primative_integer')
self.primative_integer = ival_
@@ -1223,7 +1178,7 @@ class simpleOneType(GeneratedsSuper):
sval_ = child_.text
try:
fval_ = float(sval_)
- except (TypeError, ValueError), exp:
+ except (TypeError, ValueError) as exp:
raise_parse_error(child_, 'requires float or double: %s' % exp)
fval_ = self.gds_validate_float(fval_, node, 'primative_float')
self.primative_float = fval_
@@ -1422,7 +1377,7 @@ Usage: python <Parser>.py [ -s ] <in_xml_file>
def usage():
- print USAGE_TEXT
+ print(USAGE_TEXT)
sys.exit(1)
diff --git a/tests/validate_simpletypes2_warnings.txt b/tests/validate_simpletypes2_warnings.txt
index 381f25b02ada5274c11b2ad78987df3d89e971de..5e14182e7556027300906162cc591c00c042e52d 100644
--- a/tests/validate_simpletypes2_warnings.txt
+++ b/tests/validate_simpletypes2_warnings.txt
@@ -1,34 +1,34 @@
-tests/validate_simpletypes2_sup.py:949: UserWarning: Value "2" does not match xsd minExclusive restriction on integer_range_1_st
+tests/validate_simpletypes2_sup.py:903: 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:959: UserWarning: Value "mmaaa1234mnopzzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:913: 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:971: UserWarning: Value "floatxx" does not match xsd enumeration restriction on token_enum_st
+tests/validate_simpletypes2_sup.py:926: 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:978: UserWarning: Value "22" does not match xsd maxInclusive restriction on integer_range_incl_st
+tests/validate_simpletypes2_sup.py:933: 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:983: UserWarning: Value "-40" does not match xsd minExclusive restriction on integer_range_excl_st
+tests/validate_simpletypes2_sup.py:938: 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:992: UserWarning: Value "mno pqr" does not match xsd minLength restriction on min_max_length_st
+tests/validate_simpletypes2_sup.py:947: 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:997: UserWarning: Value "012345" does not match xsd length restriction on length_st
+tests/validate_simpletypes2_sup.py:952: 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:1007: UserWarning: Value "0.2" does not match xsd minInclusive restriction on anonymous_float_valueType
+tests/validate_simpletypes2_sup.py:962: 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:951: UserWarning: Value "9" does not match xsd maxExclusive restriction on integer_range_1_st
+tests/validate_simpletypes2_sup.py:905: 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:959: UserWarning: Value "aaa1234mnopzzzbcd" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:913: 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:976: UserWarning: Value "-50" does not match xsd minInclusive restriction on integer_range_incl_st
+tests/validate_simpletypes2_sup.py:931: 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:990: UserWarning: Value "asdf asdf asdf asdf asdf asdf" does not match xsd maxLength restriction on min_max_length_st
+tests/validate_simpletypes2_sup.py:945: 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:997: UserWarning: Value "01234567890" does not match xsd length restriction on length_st
+tests/validate_simpletypes2_sup.py:952: 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:1009: UserWarning: Value "6.6" does not match xsd maxInclusive restriction on anonymous_float_valueType
+tests/validate_simpletypes2_sup.py:964: 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:956: UserWarning: Value "aaa12zzz" does not match xsd minLength restriction on pattern_st
+tests/validate_simpletypes2_sup.py:910: 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:959: UserWarning: Value "aaa12zzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
+tests/validate_simpletypes2_sup.py:913: 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:1341: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
+tests/validate_simpletypes2_sup.py:1296: 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/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html
index 900698b539f7beea6c5d53e2a3fb8f44f7c4659f..2566d9aa7cfd31d03c615bccdf7d8d2175fe523b 100644
--- a/tutorial/generateds_tutorial.html
+++ b/tutorial/generateds_tutorial.html
@@ -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.14a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.15a</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">October 18, 2014</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">January 29, 2015</td>
</tr>
</tbody>
</table>
@@ -1209,8 +1209,8 @@ named <tt class="docutils literal">garden_api.py</tt>, you can create an instanc
</div>
<div class="footer">
<hr class="footer" />
-<a class="reference external" href="tutorial/generateds_tutorial.txt">View document source</a>.
-Generated on: 2014-10-18 18:15 UTC.
+<a class="reference external" href="generateds_tutorial.txt">View document source</a>.
+Generated on: 2015-01-29 19:05 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 6637dc968843c7733c5801eb7107009e0129744a..d01a293fd48d6fe8ad3eeb65aab9f27aa7df996e 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
-:revision: 2.14a
+:revision: 2.15a
.. version
diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip
index cdf284fae5e32d19e27e4f8da4ae82d05ffee84d..d60fe859bc6af1e822b306176c76527c30b63a20 100644
Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ