Assorted fixes: Regex, reproducibility, and more.

.gitignore

@@ -3,3 +3,5 @@
 *.wxs
 test.log
 /build/
+/dist/
+/PyXB.egg-info/

NOTICE

@@ -20,6 +20,7 @@ PyXB includes patches from the following Contributors:
 
  Michael van der Westhuizen
  Jon Foster
+ Eurofins Digital Testing (https://www.eurofins-digitaltesting.com/)
 
 For details on these patches see the git software configuration logs.
 

README.txt

@@ -1,5 +1,18 @@
 PyXB -- Python W3C XML Schema Bindings
-Version 1.2.7-DEV
+Version 1.2.7.dev1
+
+------------------------------------------------
+What is this fork for?:
+
+At work, I use a few closed-source tools that use PyXB - some of which I maintain.  This repository has the necessary patches to make PyXB work for me.
+
+I don't have the time, inclination or the knowledge of PyXB's internals to be a proper open-source maintainer for PyXB.  This fork is just getting bugfixes as I need them.  I will accept small pull requests that fix bugs, but not anything big or risky or hard-to-test.  I have no interest in doing formal public releases or submitting this to PyPy.
+
+My experience is that PyXB is very complex and seriously lacking documentation, and does not have a stable API, but it can be made to work with some trial-and-error.  The concept is great, and it works, and I'm not aware of anything better (though I haven't looked for a couple of years).
+
+-- Jon Foster
+------------------------------------------------
+Original (upstream) PyXB README follows:
 
 The source releases includes pre-built bundles for common XML namespaces,
 assorted web service namespaces, and SAML.  A bundle with over 75 namespaces

doc/conf.py

@@ -43,7 +43,7 @@
 
 # General information about the project.
 project = 'PyXB'
-copyright = '2009-2017, Peter A. Bigot'
+copyright = '2009-2018, Peter A. Bigot'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.7-DEV'
+release = '1.2.7.dev1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

examples/cablelabs/disabled-test.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 rm -f cablelabs.wxs
 sh genbindings.sh \
   && python demo.py

examples/cablelabs/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 # Note: Module order is in increasing dependency order so schema are
 # downloaded and saved only once.
 [ -f cablelabs.wxs ] \

examples/dictionary/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 URI='http://services.aonaware.com/DictService/DictService.asmx?WSDL'
 PREFIX='dict'
 WSDL="${PREFIX}.wsdl"

examples/geocoder/disabled-test.sh

@@ -1,2 +1,4 @@
+#! /bin/sh
+
 sh genbindings.sh \
  && python client.py

examples/geocoder/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 GEO_WSDL_URI='http://geocoder.us/dist/eg/clients/GeoCoder.wsdl'
 GEO_PREFIX=GeoCoder
 GEO_WSDL="${GEO_PREFIX}.wsdl"

examples/kml/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 PYTHONPATH=../..
 export PYTHONPATH
 

examples/manual/demo.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 rm -f *.wxs po?.py *.pyc
 sh demo1.sh \
  && python demo1.py > demo1.out \

examples/manual/demo1.sh

@@ -1,2 +1,4 @@
+#! /bin/sh
+
 pyxbgen \
   -u po1.xsd  -m po1

examples/manual/demo2.sh

@@ -1,2 +1,4 @@
+#! /bin/sh
+
 pyxbgen \
   -u po2.xsd -m po2

examples/manual/demo3a.sh

@@ -1,2 +1,4 @@
+#! /bin/sh
+
 pyxbgen \
   -u po3.xsd -m po3

examples/manual/demo3b.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 pyxbgen \
   -u po3.xsd -m po3 \
   -u nsaddress.xsd -m address

examples/manual/demo3c1.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 pyxbgen \
   -u nsaddress.xsd -m address \
   --archive-to-file address.wxs

examples/manual/demo3c2.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 pyxbgen \
   -u po3.xsd -m po3 \
   --archive-path .:+

examples/manual/demo4.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 pyxbgen \
   -u po4.xsd -m po4 \
   --archive-path=.:+

examples/manual/demo4b.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 pyxbgen \
   -u po3.xsd -m po3 \
   --archive-path .:+

examples/ndfd/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 URI='http://graphical.weather.gov/xml/DWMLgen/schema/DWML.xsd'
 PREFIX='DWML'
 

examples/tmsxtvd/disabled-test.sh

@@ -1,2 +1,4 @@
+#! /bin/sh
+
 sh genbindings.sh
 python dumpsample.py

examples/tmsxtvd/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 URI='http://docs.tms.tribune.com/tech/xml/schemas/tmsxtvd.xsd'
 PREFIX='tmstvd'
 

examples/weather/disabled-test.sh

@@ -1,2 +1,4 @@
+#! /bin/sh
+
 sh genbindings.sh \
   && python client_get.py

examples/weather/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 WSDL_URI='http://ws.cdyne.com/WeatherWS/Weather.asmx?wsdl'
 WSDL_URI='http://wsf.cdyne.com/WeatherWS/Weather.asmx?WSDL'
 wget -O weather.wsdl "${WSDL_URI}"

examples/xsdprimer/genbindings.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 PYTHONPATH=../..
 export PYTHONPATH
 rm -rf raw

maintainer/bundlesupport.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 # This module is sourced by genbind scripts in bundle directories to
 # initialize a bundle area and provide a function to translate schema.
 

maintainer/genpd.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 find pyxb/bundles -name __init__.py \
  | sed -e 's@^@"@' -e 's@/[^/]*$@",@' -e 's@/@.@g' \
  | fmt

maintainer/getw3c.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 # Download a mirror of the W3C technical archive
 #  --backup-converted
 

maintainer/usepyxb.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 PYXB_ROOT=${PYXB_ROOT:-/mnt/devel/pyxb}
 PYTHONPATH=${PYXB_ROOT}:${PYTHONPATH:+:${PYTHONPATH}}
 PATH="${PYXB_ROOT}/scripts:${PYXB_ROOT}/bin:${PATH}"

pyxb/__init__.py

@@ -61,7 +61,7 @@ def __init__ (self, *args, **kw):
         if issubclass(self.__class__.mro()[-2], ( list, dict )):
             super(cscRoot, self).__init__(*args)
 
-__version__ = '1.2.7-DEV'
+__version__ = '1.2.7.dev1'
 """The version of PyXB"""
 
 __url__ = 'http://pyxb.sourceforge.net'

pyxb/binding/basis.py

@@ -1023,7 +1023,8 @@ def XsdSuperType (cls):
                 # otherwise directly descends from a Python type; return
                 # the recorded XSD supertype.
                 return cls._XsdBaseType
-            if issubclass(sc, simpleTypeDefinition):
+            if (not sc.__name__.startswith('_')) \
+                    and issubclass(sc, simpleTypeDefinition):
                 return sc
         raise pyxb.LogicError('No supertype found for %s' % (cls,))