开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:python-xmlschema.spec Changed

@@ -1,11 +1,11 @@
 %global _empty_manifest_terminate_build 0
 Name:           python-xmlschema
-Version:        1.5.2
+Version:        1.9.2
 Release:        1
 Summary:        An XML Schema validator and decoder
 License:        MIT
 URL:            https://github.com/sissaschool/xmlschema
-Source0:        https://files.pythonhosted.org/packages/5e/45/3c66bbae8a6773bf1559e6eedb4b97b8c656dc4b22a7157b852d50a0b0b9/xmlschema-1.5.2.tar.gz
+Source0:        https://files.pythonhosted.org/packages/49/6e/abc3be7ab1deb38dcb5721b58fd9ab2451ace530a1d247c49b675efa90fc/xmlschema-1.9.2.tar.gz
 BuildArch:      noarch
 %description
 An XML Schema validator and decoder
@@ -29,6 +29,8 @@
 BuildRequires:  python3-memory-profiler
 BuildRequires:  python3-sphinx
 BuildRequires:  python3-sphinx_rtd_theme
+BuildRequires:  python3-flake8
+BuildRequires:  python3-mypy
 # General requires
 Requires:       python3-elementpath
 Requires:       python3-jinja2
@@ -38,6 +40,8 @@
 Requires:       python3-memory-profiler
 Requires:       python3-sphinx
 Requires:       python3-sphinx_rtd_theme
+Requires:       python3-flake8
+Requires:       python3-mypy
 %description -n python3-xmlschema
 An XML Schema validator and decoder
 
@@ -48,14 +52,14 @@
 An XML Schema validator and decoder
 
 %prep
-%autosetup -n xmlschema-1.5.2
+%autosetup -n xmlschema-%{version}
 
 %build
 %py3_build
 
-
 %install
 %py3_install
+
 install -d -m755 %{buildroot}/%{_pkgdocdir}
 if  -d doc ; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
 if  -d docs ; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
@@ -82,13 +86,16 @@
 mv %{buildroot}/filelist.lst .
 mv %{buildroot}/doclist.lst .
 
+
 %files -n python3-xmlschema -f filelist.lst
 %dir %{python3_sitelib}/*
 
-
 %files help -f doclist.lst
 %{_docdir}/*
 
 %changelog
+* Fri Jul 15 2022 OpenStack_SIG <openstack@openeuler.org> - 1.9.2-1
+- Upgrade package python3-xmlschema to version 1.9.2
+
 * Mon Jul 19 2021 OpenStack_SIG <openstack@openeuler.org> - 1.5.2-1
 - Package Spec generate

_service Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_schema_class.py Deleted

@@ -1,729 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
-# All rights reserved.
-# This file is distributed under the terms of the MIT License.
-# See the file 'LICENSE' in the root directory of the present
-# distribution, or http://opensource.org/licenses/MIT.
-#
-# @author Davide Brunato <brunato@sissa.it>
-#
-import unittest
-import logging
-import tempfile
-import warnings
-import pathlib
-import platform
-import glob
-import os
-import re
-from textwrap import dedent
-
-from xmlschema import XMLSchemaParseError, XMLSchemaIncludeWarning, XMLSchemaImportWarning
-from xmlschema.names import XML_NAMESPACE, LOCATION_HINTS, SCHEMAS_DIR, XSD_ELEMENT, XSI_TYPE
-from xmlschema.etree import etree_element
-from xmlschema.validators import XMLSchemaBase, XMLSchema11, XsdGlobals
-from xmlschema.testing import SKIP_REMOTE_TESTS, XsdValidatorTestCase
-from xmlschema.validators.schema import logger, XMLSchemaNotBuiltError
-
-
-class TestXMLSchema10(XsdValidatorTestCase):
-    TEST_CASES_DIR = os.path.join(os.path.dirname(__file__), '../test_cases')
-    maxDiff = None
-
-    def test_schema_validation(self):
-        schema = self.schema_class(self.vh_xsd_file)
-        self.assertEqual(schema.validation, 'strict')
-
-        schema = self.schema_class(self.vh_xsd_file, validation='lax')
-        self.assertEqual(schema.validation, 'lax')
-
-        schema = self.schema_class(self.vh_xsd_file, validation='skip')
-        self.assertEqual(schema.validation, 'skip')
-
-        with self.assertRaises(ValueError):
-            self.schema_class(self.vh_xsd_file, validation='none')
-
-    def test_schema_string_repr(self):
-        schema = self.schema_class(self.vh_xsd_file)
-        tmpl = "%s(name='vehicles.xsd', namespace='http://example.com/vehicles')"
-        self.assertEqual(str(schema), tmpl % self.schema_class.__name__)
-
-    def test_schema_copy(self):
-        schema = self.vh_schema.copy()
-        self.assertNotEqual(id(self.vh_schema), id(schema))
-        self.assertNotEqual(id(self.vh_schema.namespaces), id(schema.namespaces))
-        self.assertNotEqual(id(self.vh_schema.maps), id(schema.maps))
-
-    def test_schema_location_hints(self):
-        with warnings.catch_warnings(record=True):
-            warnings.simplefilter("always")
-            schema = self.schema_class(dedent("""\
-                <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://xmlschema.test/ns schema.xsd">
-                  <xs:element name="root" />
-                </xs:schema>"""))
-
-        self.assertEqual(schema.schema_location, ("http://xmlschema.test/ns", "schema.xsd"))
-        self.assertIsNone(schema.no_namespace_schema_location)
-
-        schema = self.schema_class(dedent("""\
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:noNamespaceSchemaLocation="schema.xsd">
-              <xs:element name="root" />
-            </xs:schema>"""))
-
-        self.assertEqual(schema.schema_location, )
-        self.assertEqual(schema.no_namespace_schema_location, 'schema.xsd')
-
-    def test_target_prefix(self):
-        schema = self.schema_class(dedent("""\
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                targetNamespace="http://xmlschema.test/ns">
-              <xs:element name="root" />
-            </xs:schema>"""))
-
-        self.assertEqual(schema.target_prefix, '')
-
-        schema = self.schema_class(dedent("""\
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:tns="http://xmlschema.test/ns"
-                targetNamespace="http://xmlschema.test/ns">
-              <xs:element name="root" />
-            </xs:schema>"""))
-
-        self.assertEqual(schema.target_prefix, 'tns')
-
-    def test_builtin_types(self):
-        self.assertIn('string', self.schema_class.builtin_types())
-
-        with self.assertRaises(XMLSchemaNotBuiltError):
-            self.schema_class.meta_schema.builtin_types()
-
-    def test_resolve_qname(self):
-        schema = self.schema_class(dedent("""\
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">    
-              <xs:element name="root" />
-            </xs:schema>"""))
-
-        self.assertEqual(schema.resolve_qname('xs:element'), XSD_ELEMENT)
-        self.assertEqual(schema.resolve_qname('xsi:type'), XSI_TYPE)
-
-        self.assertEqual(schema.resolve_qname(XSI_TYPE), XSI_TYPE)
-        self.assertEqual(schema.resolve_qname('element'), 'element')
-        self.assertRaises(ValueError, schema.resolve_qname, '')
-        self.assertRaises(ValueError, schema.resolve_qname, 'xsi:a type ')
-        self.assertRaises(ValueError, schema.resolve_qname, 'xml::lang')
-
-    def test_global_group_definitions(self):
-        schema = self.check_schema("""
-            <xs:group name="wrong_child">
-              <xs:element name="foo"/>
-            </xs:group>""", validation='lax')
-        self.assertEqual(len(schema.errors), 1)
-
-        self.check_schema('<xs:group name="empty" />', XMLSchemaParseError)
-        self.check_schema('<xs:group name="empty"><xs:annotation/></xs:group>', XMLSchemaParseError)
-
-    def test_wrong_includes_and_imports(self):
-
-        with warnings.catch_warnings(record=True) as context:
-            warnings.simplefilter("always")
-            self.check_schema("""
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="ns">
-                <xs:include schemaLocation="example.xsd" />
-                <xs:import schemaLocation="example.xsd" />
-                <xs:redefine schemaLocation="example.xsd"/>
-                <xs:import namespace="http://missing.example.test/" />
-                <xs:import/>
-            </xs:schema>
-            """)
-            self.assertEqual(len(context), 3, "Wrong number of include/import warnings")
-            self.assertEqual(context0.category, XMLSchemaIncludeWarning)
-            self.assertEqual(context1.category, XMLSchemaIncludeWarning)
-            self.assertEqual(context2.category, XMLSchemaImportWarning)
-            self.assertTrue(str(context0.message).startswith("Include"))
-            self.assertTrue(str(context1.message).startswith("Redefine"))
-            self.assertTrue(str(context2.message).startswith("Import of namespace"))
-
-    def test_wrong_references(self):
-        # Wrong namespace for element type's reference
-        self.check_schema("""
-        <xs:element name="dimension" type="xs:dimensionType"/>
-        <xs:simpleType name="dimensionType">
-          <xs:restriction base="xs:short"/>
-        </xs:simpleType>
-        """, XMLSchemaParseError)
-
-    def test_annotations(self):
-        schema = self.check_schema("""
-            <xs:element name='foo'>
-                <xs:annotation />
-            </xs:element>""")
-        self.assertIsNotNone(schema.elements'foo'.annotation)
-
-        schema = self.check_schema("""
-        <xs:simpleType name='Magic'>
-            <xs:annotation>
-                <xs:documentation> stuff </xs:documentation>
-            </xs:annotation>
-            <xs:restriction base='xs:string'>
-                <xs:enumeration value='A'/>
-            </xs:restriction>
-        </xs:simpleType>""")
-        self.assertIsNotNone(schema.types"Magic".annotation)
-
-        self.check_schema("""
-        <xs:simpleType name='Magic'>
-            <xs:annotation />
-            <xs:annotation />
-            <xs:restriction base='xs:string'>
-                <xs:enumeration value='A'/>
-            </xs:restriction>
-        </xs:simpleType>""", XMLSchemaParseError)
-
-    def test_base_schemas(self):
-        xsd_file = os.path.join(SCHEMAS_DIR, 'XML/xml_minimal.xsd')
-        schema = self.schema_class(xsd_file)
-        self.assertEqual(schema.target_namespace, XML_NAMESPACE)
-
-    def test_root_elements(self):
-        schema = self.schema_class(dedent("""\
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"/>"""))
-        self.assertEqual(schema.root_elements, )
-
-        schema = self.schema_class(dedent("""\
-            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/schema.py Deleted

@@ -1,1932 +0,0 @@
-#
-# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
-# All rights reserved.
-# This file is distributed under the terms of the MIT License.
-# See the file 'LICENSE' in the root directory of the present
-# distribution, or http://opensource.org/licenses/MIT.
-#
-# @author Davide Brunato <brunato@sissa.it>
-#
-"""
-This module contains XMLSchema classes creator for xmlschema package.
-
-Two schema classes are created at the end of this module, XMLSchema10 for XSD 1.0 and
-XMLSchema11 for XSD 1.1. The latter class parses also XSD 1.0 schemas, as prescribed by
-the standard.
-"""
-import os
-import logging
-import threading
-import warnings
-import re
-import sys
-from copy import copy
-from abc import ABCMeta
-from collections import namedtuple, Counter
-from itertools import chain
-
-from ..exceptions import XMLSchemaTypeError, XMLSchemaKeyError, \
-    XMLSchemaValueError, XMLSchemaNamespaceError
-from ..names import VC_MIN_VERSION, VC_MAX_VERSION, VC_TYPE_AVAILABLE, \
-    VC_TYPE_UNAVAILABLE, VC_FACET_AVAILABLE, VC_FACET_UNAVAILABLE, XSD_NOTATION, \
-    XSD_ATTRIBUTE, XSD_ATTRIBUTE_GROUP, XSD_GROUP, XSD_SIMPLE_TYPE, XSI_TYPE, \
-    XSD_COMPLEX_TYPE, XSD_ELEMENT, XSD_SEQUENCE, XSD_CHOICE, XSD_ALL, XSD_ANY, \
-    XSD_ANY_ATTRIBUTE, XSD_ANY_TYPE, XSD_NAMESPACE, XML_NAMESPACE, XSI_NAMESPACE, \
-    VC_NAMESPACE, SCHEMAS_DIR, LOCATION_HINTS, XSD_ANNOTATION, XSD_INCLUDE, \
-    XSD_IMPORT, XSD_REDEFINE, XSD_OVERRIDE, XSD_DEFAULT_OPEN_CONTENT
-from ..etree import etree_element, ParseError
-from ..helpers import prune_etree, get_namespace
-from ..namespaces import NamespaceResourcesMap, NamespaceView
-from ..resources import is_local_url, is_remote_url, url_path_is_file, \
-    normalize_locations, fetch_resource, normalize_url, XMLResource
-from ..converters import XMLSchemaConverter
-from ..xpath import XMLSchemaProxy, ElementPathMixin
-
-from .exceptions import XMLSchemaParseError, XMLSchemaValidationError, XMLSchemaEncodeError, \
-    XMLSchemaNotBuiltError, XMLSchemaIncludeWarning, XMLSchemaImportWarning
-from .helpers import get_xsd_derivation_attribute
-from .xsdbase import check_validation_mode, XsdValidator, ValidationMixin, XsdComponent
-from .notations import XsdNotation
-from .identities import XsdKey, XsdKeyref, XsdUnique, Xsd11Key, Xsd11Unique, Xsd11Keyref
-from .facets import XSD_10_FACETS, XSD_11_FACETS
-from .simple_types import xsd_simple_type_factory, XsdUnion, XsdAtomicRestriction, \
-    Xsd11AtomicRestriction, Xsd11Union
-from .attributes import XsdAttribute, XsdAttributeGroup, Xsd11Attribute
-from .complex_types import XsdComplexType, Xsd11ComplexType
-from .groups import XsdGroup, Xsd11Group
-from .elements import XsdElement, Xsd11Element
-from .wildcards import XsdAnyElement, XsdAnyAttribute, Xsd11AnyElement, \
-    Xsd11AnyAttribute, XsdDefaultOpenContent
-from .global_maps import XsdGlobals
-
-logger = logging.getLogger('xmlschema')
-logging_formatter = logging.Formatter('%(levelname)s %(message)s')
-logging_handler = logging.StreamHandler(sys.stderr)
-logging_handler.setFormatter(logging_formatter)
-logger.addHandler(logging_handler)
-
-XSD_VERSION_PATTERN = re.compile(r'^\d+\.\d+$')
-DRIVE_PATTERN = re.compile(r'^a-zA-Z:$')
-
-# Elements for building dummy groups
-ATTRIBUTE_GROUP_ELEMENT = etree_element(XSD_ATTRIBUTE_GROUP)
-ANY_ATTRIBUTE_ELEMENT = etree_element(
-    XSD_ANY_ATTRIBUTE, attrib={'namespace': '##any', 'processContents': 'lax'}
-)
-SEQUENCE_ELEMENT = etree_element(XSD_SEQUENCE)
-ANY_ELEMENT = etree_element(
-    XSD_ANY,
-    attrib={
-        'namespace': '##any',
-        'processContents': 'lax',
-        'minOccurs': '0',
-        'maxOccurs': 'unbounded'
-    })
-
-
-class XMLSchemaMeta(ABCMeta):
-
-    def __new__(mcs, name, bases, dict_):
-
-        def get_attribute(attr, *args):
-            for obj in args:
-                if hasattr(obj, attr):
-                    return getattr(obj, attr)
-
-        meta_schema = dict_.get('meta_schema') or get_attribute('meta_schema', *bases)
-        if meta_schema is None:
-            # Defining a subclass without a meta-schema (eg. XMLSchemaBase)
-            return super(XMLSchemaMeta, mcs).__new__(mcs, name, bases, dict_)
-        dict_'meta_schema' = None
-        dict_'lock' = threading.Lock()  # Lock instance for shared meta-schemas
-
-        xsd_version = dict_.get('XSD_VERSION') or get_attribute('XSD_VERSION', *bases)
-        if xsd_version not in ('1.0', '1.1'):
-            raise XMLSchemaValueError("XSD_VERSION must be '1.0' or '1.1'")
-
-        builders = dict_.get('BUILDERS') or get_attribute('BUILDERS', *bases)
-        if isinstance(builders, dict):
-            # noinspection PyArgumentList
-            dict_'BUILDERS' = namedtuple('Builders', builders)(**builders)
-            dict_'BUILDERS_MAP' = {
-                XSD_NOTATION: builders'notation_class',
-                XSD_SIMPLE_TYPE: builders'simple_type_factory',
-                XSD_COMPLEX_TYPE: builders'complex_type_class',
-                XSD_ATTRIBUTE: builders'attribute_class',
-                XSD_ATTRIBUTE_GROUP: builders'attribute_group_class',
-                XSD_GROUP: builders'group_class',
-                XSD_ELEMENT: builders'element_class',
-            }
-        elif builders is None:
-            raise XMLSchemaValueError("validator class doesn't have defined XSD builders")
-        elif get_attribute('BUILDERS_MAP', *bases) is None:
-            raise XMLSchemaValueError("validator class doesn't have a builder map for XSD globals")
-
-        # Build the new meta-schema class
-        meta_schema_class_name = 'Meta' + name
-        meta_schema_class: XMLSchemaBase = super(XMLSchemaMeta, mcs).__new__(
-            mcs, meta_schema_class_name, bases, dict_
-        )
-
-        meta_schema_class.__qualname__ = meta_schema_class_name
-        globals()meta_schema_class_name = meta_schema_class
-
-        # Build the shared meta-schema instance
-        schema_location = meta_schema.url if isinstance(meta_schema, XMLSchemaBase) else meta_schema
-        meta_schema = meta_schema_class.create_meta_schema(schema_location)
-        dict_'meta_schema' = meta_schema
-        dict_.pop('lock')
-
-        return super(XMLSchemaMeta, mcs).__new__(mcs, name, bases, dict_)
-
-
-class XMLSchemaBase(XsdValidator, ValidationMixin, ElementPathMixin, metaclass=XMLSchemaMeta):
-    """
-    Base class for an XML Schema instance.
-
-    :param source: an URI that reference to a resource or a file path or a file-like \
-    object or a string containing the schema or an Element or an ElementTree document.
-    :type source: Element or ElementTree or str or file-like object
-    :param namespace: is an optional argument that contains the URI of the namespace. \
-    When specified it must be equal to the *targetNamespace* declared in the schema.
-    :type namespace: str or None
-    :param validation: the XSD validation mode to use for build the schema, \
-    that can be 'strict' (default), 'lax' or 'skip'.
-    :type validation: str
-    :param global_maps: is an optional argument containing an :class:`XsdGlobals` \
-    instance, a mediator object for sharing declaration data between dependents \
-    schema instances.
-    :type global_maps: XsdGlobals or None
-    :param converter: is an optional argument that can be an :class:`XMLSchemaConverter` \
-    subclass or instance, used for defining the default XML data converter for XML Schema instance.
-    :type converter: XMLSchemaConverter or None
-    :param locations: schema extra location hints, that can include custom resource locations \
-    (eg. local XSD file instead of remote resource) or additional namespaces to import after \
-    processing schema's import statements. Can be a dictionary or a sequence of couples \
-    (namespace URI, resource URL). Extra locations passed using a tuple container are not \
-    normalized.
-    :type locations: dict or list or tuple or None
-    :param base_url: is an optional base URL, used for the normalization of relative paths \
-    when the URL of the schema resource can't be obtained from the source argument.
-    :type base_url: str or None
-    :param allow: defines the security mode for accessing resource locations. Can be \
-    'all', 'remote', 'local' or 'sandbox'. Default is 'all' that means all types of \
-    URLs are allowed. With 'remote' only remote resource URLs are allowed. With 'local' \
-    only file paths and URLs are allowed. With 'sandbox' only file paths and URLs that \
-    are under the directory path identified by source or by the *base_url* argument \
-    are allowed.
-    :type allow: str
-    :param defuse: defines when to defuse XML data using a `SafeXMLParser`. Can be \
-    'always', 'remote' or 'never'. For default defuses only remote XML data.
-    :type defuse: str
-    :param timeout: the timeout in seconds for fetching resources. Default is `300`.
-    :type timeout: int
-    :param build: defines whether build the schema maps. Default is `True`.
-    :type build: bool
-    :param use_meta: if `True` the schema processor uses the validator meta-schema, \
-    otherwise a new meta-schema is added at the end. In the latter case the meta-schema \
-    is rebuilt if any base namespace has been overridden by an import. Ignored if the \
-    argument *global_maps* is provided.
-    :type use_meta: bool
-    :param use_fallback: if `True` the schema processor uses the validator fallback \
-    location hints to load well-known namespaces (eg. xhtml).
-    :type use_fallback: bool
-    :param loglevel: for setting a different logging level for schema initialization \
-    and building. For default is WARNING (30). For INFO level set it with 20, for \
-    DEBUG level with 10. The default loglevel is restored after schema building, \
-    when exiting the initialization method.
-    :type loglevel: int
-

_service:tar_scm:xmlschema-1.5.2.tar.gz/CHANGELOG.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/CHANGELOG.rst Changed

@@ -2,6 +2,86 @@
 CHANGELOG
 *********
 
+`v1.9.2`_ (2021-12-23)
+======================
+* Fix for global simple type naming (issue #278)
+
+`v1.9.1`_ (2021-12-08)
+======================
+* Improve error reporting for encoded data (issue #275)
+* Fix attribute duplicates in attribute group (issue #276)
+* Add process_skipped optional argument to decoding/encoding
+
+`v1.9.0`_ (2021-11-30)
+======================
+* Add iter_decode() to document level API
+* Enhance XMLResource class adding usage of pathlib.Path objects
+  for source and base_url arguments
+* Fix for issue #273
+
+`v1.8.2`_ (2021-11-11)
+======================
+* Fix for issues #266 and #268
+* Fix type annotation of XMLSchema source argument (issue #230)
+
+`v1.8.1`_ (2021-10-20)
+======================
+* Near compliance with strict type annotations
+* Removed ModelGroup class, merged with XsdGroup
+* Some optimizations and fixes from static analysis
+
+`v1.8.0`_ (2021-09-27)
+======================
+* Refactor XMLSchemaMeta deprecating BUILDER attribute
+* Extend type annotations to package API
+* Add static typing tests with checked mypy runs
+
+`v1.7.1`_ (2021-09-03)
+======================
+* Activate mypy checks for package
+* Fix for issues #257 and #259
+
+`v1.7.0`_ (2021-08-02)
+======================
+* Make XSD annotation parsing lazy
+* Add lazy annotations to schema instances
+* Add get_annotation() method to multiple-facets classes (issue #255)
+
+`v1.6.4`_ (2021-06-09)
+======================
+* Add testing config for Python 3.10 (Tox and CI)
+* Fix internal _PurePath class with Python 3.10 (issue #251)
+* Remove redundant xmlns="" declaration when encoding with lxml (issue #252)
+
+`v1.6.3`_ (2021-06-07)
+======================
+* Refactor normalize_url() using pathlib.PurePath
+* Support UNC paths (issue #246)
+* Fix API docs (issue #248)
+
+`v1.6.2`_ (2021-05-03)
+======================
+* Fix for issue #245 (key/keyref with dynamic types)
+* Change default decoding of mixed content with only text to a string
+  instead of a dictionary (issue #242)
+
+`v1.6.1`_ (2021-04-11)
+======================
+* Add multi-source initialization and add_schema() to schema class
+* Add bytes strings to accepted XML sources (issue #238)
+
+`v1.6.0`_ (2021-04-06)
+======================
+* XML data bindings and code generators are now considered stable
+* Add arguments 'max_depth' and 'extra_validator' to validation methods
+* Enhance decoding with 'value_hook' argument
+
+`v1.5.3`_ (2021-03-14)
+======================
+* Remove unnecessary bindings with schema proxy from ElementPathMixin
+  to avoid conflicts when schema is used by an XPath 3 parser
+* Fix schema logger (issue #228)
+
 `v1.5.2`_ (2021-03-04)
 ======================
 * Improve empty content checking
@@ -416,3 +496,17 @@
 .. _v1.5.0: https://github.com/brunato/xmlschema/compare/v1.4.2...v1.5.0
 .. _v1.5.1: https://github.com/brunato/xmlschema/compare/v1.5.0...v1.5.1
 .. _v1.5.2: https://github.com/brunato/xmlschema/compare/v1.5.1...v1.5.2
+.. _v1.5.3: https://github.com/brunato/xmlschema/compare/v1.5.2...v1.5.3
+.. _v1.6.0: https://github.com/brunato/xmlschema/compare/v1.5.3...v1.6.0
+.. _v1.6.1: https://github.com/brunato/xmlschema/compare/v1.6.0...v1.6.1
+.. _v1.6.2: https://github.com/brunato/xmlschema/compare/v1.6.1...v1.6.2
+.. _v1.6.3: https://github.com/brunato/xmlschema/compare/v1.6.2...v1.6.3
+.. _v1.6.4: https://github.com/brunato/xmlschema/compare/v1.6.3...v1.6.4
+.. _v1.7.0: https://github.com/brunato/xmlschema/compare/v1.6.4...v1.7.0
+.. _v1.7.1: https://github.com/brunato/xmlschema/compare/v1.7.0...v1.7.1
+.. _v1.8.0: https://github.com/brunato/xmlschema/compare/v1.7.1...v1.8.0
+.. _v1.8.1: https://github.com/brunato/xmlschema/compare/v1.8.0...v1.8.1
+.. _v1.8.2: https://github.com/brunato/xmlschema/compare/v1.8.1...v1.8.2
+.. _v1.9.0: https://github.com/brunato/xmlschema/compare/v1.8.2...v1.9.0
+.. _v1.9.1: https://github.com/brunato/xmlschema/compare/v1.9.0...v1.9.1
+.. _v1.9.2: https://github.com/brunato/xmlschema/compare/v1.9.1...v1.9.2

_service:tar_scm:xmlschema-1.5.2.tar.gz/PKG-INFO -> _service:tar_scm:xmlschema-1.9.2.tar.gz/PKG-INFO Changed

@@ -1,172 +1,11 @@
 Metadata-Version: 2.1
 Name: xmlschema
-Version: 1.5.2
+Version: 1.9.2
 Summary: An XML Schema validator and decoder
 Home-page: https://github.com/sissaschool/xmlschema
 Author: Davide Brunato
 Author-email: brunato@sissa.it
 License: MIT
-Description: *********
-        xmlschema
-        *********
-        
-        .. image:: https://img.shields.io/pypi/v/xmlschema.svg
-           :target: https://pypi.python.org/pypi/xmlschema/
-        .. image:: https://img.shields.io/pypi/pyversions/xmlschema.svg
-           :target: https://pypi.python.org/pypi/xmlschema/
-        .. image:: https://img.shields.io/pypi/implementation/xmlschema.svg
-           :target: https://pypi.python.org/pypi/xmlschema/
-        .. image:: https://img.shields.io/badge/License-MIT-blue.svg
-           :alt: MIT License
-           :target: https://lbesson.mit-license.org/
-        .. image:: https://travis-ci.org/sissaschool/xmlschema.svg?branch=master
-           :target: https://travis-ci.org/sissaschool/xmlschema
-        .. image:: https://img.shields.io/pypi/dm/xmlschema.svg
-           :target: https://pypi.python.org/pypi/xmlschema/
-        .. image:: https://img.shields.io/badge/Maintained%3F-yes-green.svg
-           :target: https://GitHub.com/Naereen/StrapDown.js/graphs/commit-activity
-        
-        .. xmlschema-introduction-start
-        
-        The *xmlschema* library is an implementation of `XML Schema <http://www.w3.org/2001/XMLSchema>`_
-        for Python (supports Python 3.6+).
-        
-        This library arises from the needs of a solid Python layer for processing XML
-        Schema based files for
-        `MaX (Materials design at the Exascale) <http://www.max-centre.eu>`_  European project.
-        A significant problem is the encoding and the decoding of the XML data files
-        produced by different simulation software.
-        Another important requirement is the XML data validation, in order to put the
-        produced data under control. The lack of a suitable alternative for Python in
-        the schema-based decoding of XML data has led to build this library. Obviously
-        this library can be useful for other cases related to XML Schema based processing,
-        not only for the original scope.
-        
-        The full `xmlschema documentation is available on "Read the Docs" <http://xmlschema.readthedocs.io/en/latest/>`_.
-        
-        
-        Features
-        ========
-        
-        This library includes the following features:
-        
-        * Full XSD 1.0 and XSD 1.1 support
-        * Building of XML schema objects from XSD files
-        * Validation of XML instances against XSD schemas
-        * Decoding of XML data into Python data and to JSON
-        * Encoding of Python data and JSON to XML
-        * Data decoding and encoding ruled by converter classes
-        * An XPath based API for finding schema's elements and attributes
-        * Support of XSD validation modes *strict*/*lax*/*skip*
-        * Remote attacks protection by default using an XMLParser that forbids entities
-        * XML data bindings based on DataElement class (experimental)
-        * Static code generation with Jinja2 templates (experimental)
-        
-        
-        Installation
-        ============
-        
-        You can install the library with *pip* in a Python 3.6+ environment::
-        
-            pip install xmlschema
-        
-        The library uses the Python's ElementTree XML library and requires
-        `elementpath <https://github.com/brunato/elementpath>`_ additional package.
-        The base schemas of the XSD standards are included in the package for working
-        offline and to speed-up the building of schema instances.
-        
-        .. xmlschema-introduction-end
-        
-        
-        Usage
-        =====
-        
-        Import the library and then create a schema instance using the path of
-        the file containing the schema as argument:
-        
-        .. code-block:: pycon
-        
-            >>> import xmlschema
-            >>> my_schema = xmlschema.XMLSchema('tests/test_cases/examples/vehicles/vehicles.xsd')
-        
-        .. note::
-            For XSD 1.1 schemas use the class `XMLSchema11`, because the default class
-            `XMLSchema` is an alias of the XSD 1.0 validator class `XMLSchema10`.
-        
-        The schema can be used to validate XML documents:
-        
-        .. code-block:: pycon
-        
-            >>> my_schema.is_valid('tests/test_cases/examples/vehicles/vehicles.xml')
-            True
-            >>> my_schema.is_valid('tests/test_cases/examples/vehicles/vehicles-1_error.xml')
-            False
-            >>> my_schema.validate('tests/test_cases/examples/vehicles/vehicles-1_error.xml')
-            Traceback (most recent call last):
-              File "<stdin>", line 1, in <module>
-              File "/home/brunato/Development/projects/xmlschema/xmlschema/validators/xsdbase.py", line 393, in validate
-                raise error
-            xmlschema.validators.exceptions.XMLSchemaValidationError: failed validating <Element '{http://example.com/vehicles}cars' at 0x7f8032768458> with XsdGroup(model='sequence').
-        
-            Reason: character data between child elements not allowed!
-        
-            Schema:
-        
-              <xs:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema">
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="car" type="vh:vehicleType" />
-              </xs:sequence>
-        
-            Instance:
-        
-              <vh:cars xmlns:vh="http://example.com/vehicles">
-                NOT ALLOWED CHARACTER DATA
-                <vh:car make="Porsche" model="911" />
-                <vh:car make="Porsche" model="911" />
-              </vh:cars>
-        
-        Using a schema you can also decode the XML documents to nested dictionaries, with
-        values that match to the data types declared by the schema:
-        
-        .. code-block:: pycon
-        
-            >>> import xmlschema
-            >>> from pprint import pprint
-            >>> xs = xmlschema.XMLSchema('tests/test_cases/examples/collection/collection.xsd')
-            >>> pprint(xs.to_dict('tests/test_cases/examples/collection/collection.xml'))
-            {'@xsi:schemaLocation': 'http://example.com/ns/collection collection.xsd',
-             'object': {'@available': True,
-                         '@id': 'b0836217462',
-                         'author': {'@id': 'PAR',
-                                    'born': '1841-02-25',
-                                    'dead': '1919-12-03',
-                                    'name': 'Pierre-Auguste Renoir',
-                                    'qualification': 'painter'},
-                         'estimation': Decimal('10000.00'),
-                         'position': 1,
-                         'title': 'The Umbrellas',
-                         'year': '1886'},
-                        {'@available': True,
-                         '@id': 'b0836217463',
-                         'author': {'@id': 'JM',
-                                    'born': '1893-04-20',
-                                    'dead': '1983-12-25',
-                                    'name': 'Joan Miró',
-                                    'qualification': 'painter, sculptor and ceramicist'},
-                         'position': 2,
-                         'title': None,
-                         'year': '1925'}}
-        
-        
-        Authors
-        =======
-        Davide Brunato and others who have contributed with code or with sample cases.
-        
-        License
-        =======
-        This software is distributed under the terms of the MIT License.
-        See the file 'LICENSE' in the root directory of the present
-        distribution, or http://opensource.org/licenses/MIT.
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -181,6 +20,7 @@
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries
@@ -189,3 +29,167 @@
 Provides-Extra: codegen
 Provides-Extra: dev
 Provides-Extra: docs
+License-File: LICENSE
+
+*********
+xmlschema
+*********
+
+.. image:: https://img.shields.io/pypi/v/xmlschema.svg
+   :target: https://pypi.python.org/pypi/xmlschema/
+.. image:: https://img.shields.io/pypi/pyversions/xmlschema.svg
+   :target: https://pypi.python.org/pypi/xmlschema/
+.. image:: https://img.shields.io/pypi/implementation/xmlschema.svg
+   :target: https://pypi.python.org/pypi/xmlschema/
+.. image:: https://img.shields.io/badge/License-MIT-blue.svg
+   :alt: MIT License

_service:tar_scm:xmlschema-1.5.2.tar.gz/README.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/README.rst Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/doc/api.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/doc/api.rst Changed

@@ -37,6 +37,7 @@
 .. autofunction:: xmlschema.validate
 .. autofunction:: xmlschema.is_valid
 .. autofunction:: xmlschema.iter_errors
+.. autofunction:: xmlschema.iter_decode
 .. autofunction:: xmlschema.to_dict
 .. autofunction:: xmlschema.to_json
 .. autofunction:: xmlschema.from_json
@@ -59,7 +60,9 @@
 
     .. autoattribute:: root
     .. automethod:: get_text
+    .. autoattribute:: name
     .. autoattribute:: url
+    .. autoattribute:: base_url
 
     .. autoattribute:: tag
     .. autoattribute:: id
@@ -69,7 +72,6 @@
     .. autoattribute:: no_namespace_schema_location
     .. autoattribute:: target_prefix
     .. autoattribute:: default_namespace
-    .. autoattribute:: base_url
     .. autoattribute:: root_elements
     .. autoattribute:: simple_types
     .. autoattribute:: complex_types
@@ -186,8 +188,10 @@
 
     .. autoattribute:: root
     .. autoattribute:: text
+    .. autoattribute:: name
     .. autoattribute:: url
     .. autoattribute:: base_url
+    .. autoattribute:: filepath
     .. autoattribute:: namespace
 
     .. automethod:: parse
@@ -313,7 +317,7 @@
 .. autoclass:: xmlschema.validators.Xsd11ComplexType
 .. autoclass:: xmlschema.validators.XsdComplexType
 
-    .. autoattribute:: content_type
+    .. autoattribute:: content
 
 .. autoclass:: xmlschema.validators.XsdSimpleType

_service:tar_scm:xmlschema-1.5.2.tar.gz/doc/components.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/doc/components.rst Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/doc/conf.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/doc/conf.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/doc/extras.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/doc/extras.rst Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/doc/testing.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/doc/testing.rst Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/doc/usage.rst -> _service:tar_scm:xmlschema-1.9.2.tar.gz/doc/usage.rst Changed

@@ -79,6 +79,51 @@
     >>> schema = xmlschema.XMLSchema(schema_file, base_url='tests/test_cases/examples/vehicles/')
 
 
+Non standard options for schema instance creation
+-------------------------------------------------
+
+Other options for schema instance creation are available using non-standard
+methods. Most cases require to use the *build* option to delay the schema
+build after the loading of all schema resources. For example:
+
+.. doctest::
+
+    >>> schema_file = open('tests/test_cases/examples/vehicles/vehicles.xsd')
+    >>> schema = xmlschema.XMLSchema(schema_file, build=False)
+    >>> _ = schema.include_schema('tests/test_cases/examples/vehicles/cars.xsd')
+    >>> _ = schema.include_schema('tests/test_cases/examples/vehicles/bikes.xsd')
+    >>> schema.build()
+
+Another option, available from release v1.6.1, is to provide a list of schema sources,
+particurlaly useful when sources have no locations associated:
+
+.. doctest::
+
+    >>> sources = open('tests/test_cases/examples/vehicles/vehicles.xsd'),
+    ...            open('tests/test_cases/examples/vehicles/cars.xsd'),
+    ...            open('tests/test_cases/examples/vehicles/bikes.xsd'),
+    ...            open('tests/test_cases/examples/vehicles/types.xsd')
+    >>> schema = xmlschema.XMLSchema(sources)
+
+or similarly to the previous example one can use the method :meth:`add_schema()`:
+
+.. doctest::
+
+    >>> schema_file = open('tests/test_cases/examples/vehicles/vehicles.xsd')
+    >>> schema = xmlschema.XMLSchema(schema_file, build=False)
+    >>> _ = schema.add_schema(open('tests/test_cases/examples/vehicles/cars.xsd'))
+    >>> _ = schema.add_schema(open('tests/test_cases/examples/vehicles/bikes.xsd'))
+    >>> _ = schema.add_schema(open('tests/test_cases/examples/vehicles/types.xsd'))
+    >>> schema.build()
+
+
+.. note::
+    Anyway the advice is to build intermediate XSD schemas intead for loading
+    all the schemas needed in a standard way, because XSD mechanisms of imports,
+    includes, redefines and overrides are usually supported when you submit your
+    schemas to other XSD validators.
+
+
 Validation
 ==========

_service:tar_scm:xmlschema-1.5.2.tar.gz/requirements-dev.txt -> _service:tar_scm:xmlschema-1.9.2.tar.gz/requirements-dev.txt Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/setup.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/setup.py Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #
-# Copyright (c) 2016-2020, SISSA (International School for Advanced Studies).
+# Copyright (c) 2016-2021, SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
 # See the file 'LICENSE' in the root directory of the present
@@ -9,14 +9,16 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from setuptools import setup, find_packages
+from pathlib import Path
 
-with open("README.rst") as readme:
+
+with Path(__file__).parent.joinpath('README.rst').open() as readme:
     long_description = readme.read()
 
 
 setup(
     name='xmlschema',
-    version='1.5.2',
+    version='1.9.2',
     packages=find_packages(include='xmlschema', 'xmlschema.*'),
     include_package_data=True,
     entry_points={
@@ -27,12 +29,13 @@
         
     },
     python_requires='>=3.6',
-    install_requires='elementpath>=2.1.2, <3.0.0',
+    install_requires='elementpath>=2.4.0, <3.0.0',
     extras_require={
-        'codegen': 'elementpath>=2.1.2, <3.0.0', 'jinja2',
-        'dev': 'tox', 'coverage', 'lxml', 'elementpath>=2.1.2, <3.0.0',
-                'memory_profiler', 'Sphinx', 'sphinx_rtd_theme', 'jinja2',
-        'docs': 'elementpath>=2.1.2, <3.0.0', 'Sphinx', 'sphinx_rtd_theme', 'jinja2'
+        'codegen': 'elementpath>=2.4.0, <3.0.0', 'jinja2',
+        'dev': 'tox', 'coverage', 'lxml', 'elementpath>=2.4.0, <3.0.0',
+                'memory_profiler', 'Sphinx', 'sphinx_rtd_theme', 'jinja2',
+                'flake8', 'mypy', 'lxml-stubs',
+        'docs': 'elementpath>=2.4.0, <3.0.0', 'Sphinx', 'sphinx_rtd_theme', 'jinja2'
     },
     author='Davide Brunato',
     author_email='brunato@sissa.it',
@@ -55,6 +58,7 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries',

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/check_memory.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/check_memory.py Changed

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/templates/filters/unknown_filter_test.jinja Added

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_all.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_all.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_cases/examples/collection/collection.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/examples/collection/collection.py Changed

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/features/decoder/data4-mixed.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/features/decoder/long-sequence-1.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/features/decoder/mixed-content.xsd Added

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_cases/features/decoder/simple-types.xsd -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/features/decoder/simple-types.xsd Changed

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir1 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir1/issue_237.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir1/stockquoteservice.wsdl Added

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<definitions name="StockQuote"
+             targetNamespace="http://example.com/stockquote/service"
+             xmlns:tns="http://example.com/stockquote/service"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:defs="http://example.com/stockquote/definitions"
+             xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+   <import namespace="http://example.com/stockquote/definitions"
+           location="../dir2/stockquote.wsdl"/>
+
+    <binding name="StockQuoteBinding" type="defs:StockQuotePortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="GetLastTradePrice">
+           <soap:operation soapAction="http://example.com/GetLastTradePrice"/>
+           <input>
+               <soap:body use="literal"/>
+           </input>
+           <output>
+               <soap:body use="literal"/>
+           </output>
+        </operation>
+    </binding>
+
+    <service name="StockQuoteService">
+        <documentation>My first service</documentation>
+        <port name="StockQuotePort" binding="tns:StockQuoteBinding">
+           <soap:address location="http://example.com/stockquote"/>
+        </port>
+    </service>
+</definitions>
\ No newline at end of file

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir2 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir2/issue_237a.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir2/issue_237b.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir2/stockquote.wsdl Added

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<definitions name="StockQuote"
+             targetNamespace="http://example.com/stockquote/definitions"
+             xmlns:tns="http://example.com/stockquote/definitions"
+             xmlns:xsd1="http://example.com/stockquote/schemas"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+    <import namespace="http://example.com/stockquote/schemas" location="./stockquote.xsd" />
+
+    <message name="GetLastTradePriceInput">
+        <part name="body" element="xsd1:TradePriceRequest"/>
+    </message>
+
+    <message name="GetLastTradePriceOutput">
+        <part name="body" element="xsd1:TradePrice"/>
+    </message>
+
+    <portType name="StockQuotePortType">
+        <operation name="GetLastTradePrice">
+           <input message="tns:GetLastTradePriceInput"/>
+           <output message="tns:GetLastTradePriceOutput"/>
+        </operation>
+    </portType>
+</definitions>
\ No newline at end of file

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_237/dir2/stockquote.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_243 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_243/issue_243.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_243/issue_243.xsd Added

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified"
+    attributeFormDefault="unqualified" vc:minVersion="1.1"
+    xmlns:am="http://www.test.com/XMLSchema/manifest/2021"
+    targetNamespace="http://www.test.com/XMLSchema/manifest/2021"
+    xmlns="http://www.test.com/XMLSchema/manifest/2021">
+    <xs:element name="manifest">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="session">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="userId" nillable="true">
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:string">
+                                        <xs:minLength value="1"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                            <xs:element name="sessionId" nillable="true">
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:integer">
+                                        <xs:minInclusive value="0"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="anonymous" type="xs:boolean" use="required">
+                        </xs:attribute>
+                        <xs:assert
+                            test="((@anonymous eq true()) and am:userId@xsi:nil and am:sessionId@xsi:nil) or ((@anonymous eq false()) and am:userIdnode() and am:sessionIdnode())"
+                        />
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
+

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_245 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_245/issue_245-valid.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_245/issue_245.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_245/issue_245.xsd Added

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified"
+    attributeFormDefault="unqualified" vc:minVersion="1.1"
+    targetNamespace="http://www.test.com/XMLSchema/data/2021"
+    xmlns="http://www.test.com/XMLSchema/data/2021"
+    xmlns:ad="http://www.test.com/XMLSchema/data/2021">
+    <xs:element name="assessment">
+        <xs:annotation>
+            <xs:documentation>Data about the performed tests.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="part" type="AssessmentPart">
+                    <xs:key name="circle_id_key">
+                        <xs:annotation>
+                            <xs:documentation>For ContrastVisionTest. 
+
+Since all parts are types we can not add keys and keyrefs to them. As such, we add the constraints here.</xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="ad:screen_elements/ad:contrast_circles/ad:circle"/>
+                        <xs:field xpath="@circle_id"/>
+                    </xs:key>
+                    <xs:keyref name="circle_id_keyref" refer="circle_id_key">
+                        <xs:selector xpath="ad:events/ad:circle_pressed"/>
+                        <xs:field xpath="@circle_id"/>
+                    </xs:keyref>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:complexType abstract="true" name="AssessmentPart">
+        <xs:annotation>
+            <xs:documentation>Base type for the assessment element.</xs:documentation>
+        </xs:annotation>
+    </xs:complexType>
+    <xs:complexType abstract="true" name="AssessmentTest">
+        <xs:annotation>
+            <xs:documentation>Base type for a test.</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="AssessmentPart"/>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="ContrastVisionTest">
+        <xs:complexContent>
+            <xs:extension base="AssessmentTest">
+                <xs:sequence>
+                    <xs:element name="screen_elements">
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element name="contrast_circles">
+                                    <xs:complexType>
+                                        <xs:sequence>
+                                            <xs:element maxOccurs="3" name="circle" minOccurs="3">
+                                                <xs:complexType>
+                                                  <xs:attribute name="circle_id" use="required">
+                                                  <xs:annotation>
+                                                  <xs:documentation>The id of this circle, used to reference the circle presses.</xs:documentation>
+                                                  </xs:annotation>
+                                                  <xs:simpleType>
+                                                  <xs:restriction base="xs:integer">
+                                                  <xs:minInclusive value="0"/>
+                                                  <xs:maxInclusive value="9"/>
+                                                  </xs:restriction>
+                                                  </xs:simpleType>
+                                                  </xs:attribute>
+                                                </xs:complexType>
+                                            </xs:element>
+                                        </xs:sequence>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                    <xs:element name="events">
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element maxOccurs="unbounded" minOccurs="0"
+                                    name="circle_pressed">
+                                    <xs:complexType>
+                                        <xs:attribute name="circle_id" type="xs:integer"
+                                            use="required"/>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_259 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_259/issue_259-1.xsd Added

@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<xs:schema
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+  elementFormDefault="qualified"
+  vc:minVersion="1.1">
+
+  <xs:complexType name="ConfigurationType">
+    <xs:all>
+      <xs:element name="DefaultProt1" type="ProtocolDefault" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="DefaultProt2" type="ProtocolDefault" minOccurs="0" maxOccurs="1"/>
+      
+      <xs:element name="DefaultProt13" type="ProtocolDefault" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="connectionChannel" type="connectionChannel" maxOccurs="1" >
+        <xs:unique name="redChannelNameUniqueness">
+          <xs:selector xpath="redChannel"/>
+          <xs:field xpath="@name"/>
+        </xs:unique>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="connectionChannel">
+    <xs:all>
+      <xs:element name="Prot1" type="Protocol" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="Prot2" type="Protocol" minOccurs="0" maxOccurs="1"/>
+      
+      <xs:element name="Prot13" type="Protocol" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="redChannel" type="redChannelType" minOccurs="1" maxOccurs="8"/>
+    </xs:all>
+    <xs:attribute name="name" use="required">
+      <xs:simpleType>
+        <xs:restriction base="xs:string">
+          <xs:minLength value="1"/>
+          <xs:maxLength value="63"/>
+          <xs:pattern value="(a-zA-Z0-9\._\-)*"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:complexType>
+
+
+  <xs:element name="Configuration" type="ConfigurationType">
+    <xs:unique name="connectionChannelNameUniqueness">
+      <xs:selector xpath="connectionChannel"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+  </xs:element>
+
+
+  <xs:complexType name="redChannelType">
+    <xs:attribute name="name" use="required" type="xs:string"/>
+  </xs:complexType>
+
+  <xs:complexType name="ProtocolDefault">
+  <xs:attribute name="interfaceIdentifier" use="optional" type="xs:unsignedByte"/>
+  <xs:attribute name="outgoingDirectionIdentifier" use="optional" type="xs:unsignedByte"/>
+</xs:complexType>
+
+  <xs:complexType name="Protocol">
+  <xs:attribute name="interfaceIdentifier" use="optional" type="xs:unsignedByte"/>
+  <xs:attribute name="outgoingDirectionIdentifier" use="optional" type="xs:unsignedByte"/>
+</xs:complexType>
+
+</xs:schema>
\ No newline at end of file

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_259/issue_259-2.xsd Added

@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<xs:schema
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+  elementFormDefault="qualified"
+  vc:minVersion="1.1">
+
+  <xs:redefine schemaLocation="issue_259-1.xsd">
+    <xs:complexType name="ConfigurationType">
+      <xs:complexContent>
+        <xs:extension base="ConfigurationType">
+          <xs:all>
+            <xs:element name="MyProtDefault" type="CustomProtocolDefault" minOccurs="0" maxOccurs="1"/>
+          </xs:all>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+
+
+    <xs:complexType name="redChannelType">
+      <xs:complexContent>
+        <xs:extension base="redChannelType">
+          <xs:all>
+            <xs:element name="MyProt" type="CustomProtocol" minOccurs="0" maxOccurs="1"/>
+          </xs:all>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:redefine>
+
+
+  <xs:complexType name="CustomProtocolDefault">
+        <xs:attribute name="interfaceIdentifier" use="optional" type="xs:unsignedByte"/>
+        <xs:attribute name="outgoingDirectionIdentifier" use="optional" type="xs:unsignedByte"/>
+  </xs:complexType>
+
+    <xs:complexType name="CustomProtocol">
+        <xs:attribute name="interfaceIdentifier" use="optional" type="xs:unsignedByte"/>
+        <xs:attribute name="outgoingDirectionIdentifier" use="optional" type="xs:unsignedByte"/>
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_265 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_265/issue_265-1.xsd Added

@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:complexType name="studentInfoHuelle" abstract="true"/>
+
+	<xs:complexType name="studentInfoMinimal">
+		<xs:complexContent>
+			<xs:extension base="studentInfoHuelle">
+				<xs:sequence>
+					<xs:element name="vorname" type="sbtTextNotEmpty" minOccurs="1"/>
+					<xs:element name="nachname" type="sbtTextNotEmpty" minOccurs="1"/>
+					<xs:element name="geburtsdatum" type="xs:date" minOccurs="1"/>
+					<xs:element name="geschlecht" type="geschlechtTyp" minOccurs="1"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="studentInfoBasis">
+		<xs:complexContent>
+			<xs:extension base="studentInfoMinimal">
+				<xs:sequence>
+					<xs:element name="staatsbuergerschaft" type="staatTyp" minOccurs="0"/>
+					<xs:element name="akadgrad" type="akadTyp" minOccurs="0"/>
+					<xs:element name="akadnach" type="akadTyp" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="studentInfoExtended">
+		<xs:complexContent>
+			<xs:extension base="studentInfoBasis">
+				<xs:sequence>
+					<xs:element name="bpk" type="bpkTyp" minOccurs="0"/>
+					<xs:element name="svnr" type="svnrTyp" minOccurs="0"/>
+					<xs:element name="ekz" type="ekzTyp" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="studentInfoBasisAdressen">
+		<xs:complexContent>
+			<xs:extension base="studentInfoExtended">
+				<xs:sequence>
+					<xs:element name="adressen" type="adressenListe"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="UniStudentInfo">
+		<xs:complexContent>
+			<xs:extension base="studentInfoBasisAdressen">
+				<xs:sequence>
+					<xs:element name="studierendenkey" type="Studierendenkey" minOccurs="1" maxOccurs="1"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+  <xs:complexType name="FullStudentInfo">
+		<xs:complexContent>
+			<xs:extension base="UniStudentInfo">
+				<xs:sequence>
+                  <xs:element name="studienliste" type="studienliste"/>
+                  <xs:element name="studienbeitrag" type="KontostandUniInfo"/>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+  </xs:complexType>
+
+	
+
+	<xs:simpleType name="sbtTextNotEmpty">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="geschlechtTyp">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="staatTyp">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="akadTyp">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="bpkTyp">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="svnrTyp">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="ekzTyp">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="adressenListe">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="Studierendenkey">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="studienliste">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="KontostandUniInfo">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+</xs:schema>
\ No newline at end of file

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_265/issue_265-2-invalid.xsd Added

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:redefine schemaLocation="issue_265-1.xsd">
+      <xs:complexType name="FullStudentInfo">
+        <xs:complexContent>
+          <xs:restriction base="FullStudentInfo">
+            <xs:sequence>
+              <xs:element name="vorname" type="sbtTextNotEmpty" minOccurs="1"/>
+              <xs:element name="nachname" type="sbtTextNotEmpty" minOccurs="1"/>
+              <xs:element name="geburtsdatum" type="xs:date" minOccurs="1"/>
+              <xs:element name="geschlecht" type="geschlechtTyp" minOccurs="1"/>
+              <xs:element name="staatsbuergerschaft" type="staatTyp" minOccurs="0"/>
+              <xs:element name="akadgrad" type="akadTyp" minOccurs="0"/>
+              <xs:element name="akadnach" type="akadTyp" minOccurs="0"/>
+              <xs:element name="bpk" type="bpkTyp" minOccurs="0"/>
+              <xs:element name="svnr" type="svnrTyp" minOccurs="0"/>
+              <xs:element name="ekz" type="ekzTyp" minOccurs="0"/>
+              <xs:element name="adressen" type="adressenListe"/>
+              <xs:element name="studierendenkey" type="Studierendenkey" minOccurs="1" maxOccurs="1"/>
+              <xs:element name="studienbeitrag" type="KontostandUniInfo"/>
+            </xs:sequence>
+          </xs:restriction>
+        </xs:complexContent>
+      </xs:complexType>
+  </xs:redefine>
+
+</xs:schema>
\ No newline at end of file

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_265/issue_265-2-override.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266/issue_266-1.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266/issue_266-1.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266/issue_266-2.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266/issue_266-2.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266/issue_266b-1.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_266/issue_266b-2.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_273 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_273/issue_273.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_273/issue_273.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_276 Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_276/dummy.xml Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/issues/issue_276/schema.xsd Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/mypy Added

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/mypy/schema_source.py Added

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+def main() -> None:
+    import io
+    from pathlib import Path
+    from typing import cast, IO
+    from xml.etree import ElementTree
+
+    import xmlschema
+
+    case_dir = Path(__file__).parent.parent
+    col_xsd = case_dir.joinpath('examples/collection/collection.xsd')
+
+    schema = xmlschema.XMLSchema10(str(col_xsd))
+    print(f"{schema} from filepath")
+
+    with open(str(col_xsd)) as fp:
+        schema = xmlschema.XMLSchema10(fp)
+    print(f"{schema} from open(filepath)")
+
+    with open(str(col_xsd), mode='rb') as bfp:
+        schema = xmlschema.XMLSchema10(bfp)
+    print(f"{schema} from open(filepath, mode='rb'), mode binary")
+
+    with col_xsd.open() as fp:
+        schema = xmlschema.XMLSchema10(cast(IOstr, fp))
+    print(f"{schema} from IOstr")
+
+    with col_xsd.open(mode='rb') as bfp:
+        schema = xmlschema.XMLSchema10(cast(IOstr, bfp))
+    print(f"{schema} from IObytes")
+
+    with col_xsd.open() as fp:
+        schema = xmlschema.XMLSchema10(io.StringIO(fp.read()))
+    print(f"{schema} from io.StringIO()")
+
+    with col_xsd.open(mode='rb') as bfp:
+        schema = xmlschema.XMLSchema10(io.BytesIO(bfp.read()))
+    print(f"{schema} from io.BytesIO()")
+
+    xt = ElementTree.parse(col_xsd)
+    namespaces = {
+        'xs': "http://www.w3.org/2001/XMLSchema",
+        '': "http://example.com/ns/collection",
+    }
+    schema = xmlschema.XMLSchema10(xt, build=False)
+    schema.namespaces.update(namespaces)  # FIXME? Provide an init argument?
+    schema.build()
+    print(f"{schema} from ElementTree.ElementTree")
+
+    schema = xmlschema.XMLSchema10(xt.getroot(), build=False)
+    schema.namespaces.update(namespaces)
+    schema.build()
+    print(f"{schema} from ElementTree.Element")
+
+    schema = xmlschema.XMLSchema10(xmlschema.XMLResource(str(col_xsd)))
+    print(f"{schema} from xmlschema.XMLResource()")
+
+
+if __name__ == '__main__':
+    main()

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/mypy/simple_types.py Added

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_cases/testfiles -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_cases/testfiles Changed

@@ -8,19 +8,19 @@
 #
 
 # Cases with schema examples
-examples/collection/collection.xsd --inspect
-examples/collection/collection.xsd --inspect --version=1.1
-examples/collection/collection.xml
+examples/collection/collection.xsd --inspect --codegen
+examples/collection/collection.xsd --inspect --version=1.1 --codegen
+examples/collection/collection.xml --codegen
 examples/collection/collection2.xsd --inspect   # key constraint
 examples/collection/collection2.xml --errors 1
 examples/collection/collection3.xsd      # key and keyref constraints
 examples/collection/collection3.xml --errors 1
 examples/collection/collection3bis.xsd
 examples/collection/collection3bis.xml --errors 1
-examples/collection/collection4.xml      # Many XML comments inserted
-examples/vehicles/vehicles.xsd --inspect
-examples/vehicles/vehicles.xsd --inspect --version=1.1
-examples/vehicles/vehicles.xml
+examples/collection/collection4.xml --codegen # Many XML comments inserted
+examples/vehicles/vehicles.xsd --inspect --codegen
+examples/vehicles/vehicles.xsd --inspect --version=1.1 --codegen
+examples/vehicles/vehicles.xml --codegen
 examples/vehicles/vehicles-1_error.xml --errors=1
 examples/vehicles/vehicles-2_errors.xml --errors=2
 examples/vehicles/vehicles-3_errors.xml --errors=3
@@ -32,8 +32,12 @@
 
 features/builtins/builtins.xsd
 features/builtins/builtins.xml
+
 features/decoder/simple-types.xsd
 features/decoder/data2.xml --errors=2
+features/decoder/mixed-content.xsd
+features/decoder/data4-mixed.xml
+
 features/derivations/complex-extensions.xsd --errors=1
 features/derivations/complex-with-simple-content-restriction.xsd
 features/derivations/list_types.xsd --errors=1
@@ -118,3 +122,16 @@
 issues/issue_222/issue_222.xml -L '' issue_222.xsd
 issues/issue_223/issue_223.xsd
 issues/issue_223/issue_223.xml -L '' issue_223.xsd --errors=1  # pattern matching with \n ending
+issues/issue_243/issue_243.xml --version=1.1 -L '' issue_243.xsd
+issues/issue_245/issue_245.xml --version=1.1 --errors=2  # duplicated key value with xsi:type
+issues/issue_245/issue_245-valid.xml --version=1.1
+issues/issue_259/issue_259-2.xsd --version=1.1
+issues/issue_265/issue_265-1.xsd
+issues/issue_265/issue_265-2-invalid.xsd --errors=1
+issues/issue_265/issue_265-2-override.xsd --version=1.1
+issues/issue_266/issue_266-1.xsd
+issues/issue_266/issue_266-1.xml
+issues/issue_266/issue_266-2.xsd
+issues/issue_266/issue_266-2.xml
+issues/issue_276/schema.xsd
+issues/issue_276/dummy.xml

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_codegen.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_codegen.py Changed

@@ -14,12 +14,17 @@
 import os
 import datetime
 import ast
+import logging
 import platform
 import importlib.util
+import tempfile
+from collections import namedtuple
 from pathlib import Path
 from textwrap import dedent
 from xml.etree import ElementTree
 
+from elementpath import datatypes
+
 from xmlschema import XMLSchema10, XMLSchema11
 from xmlschema.names import XSD_ANY_TYPE, XSD_STRING, XSD_FLOAT
 
@@ -45,6 +50,7 @@
             'float': 'float',
             'double': 'double',
             'integer': 'int',
+            'decimal': 'float',
             'unsignedByte': 'unsigned short',
             'nonNegativeInteger': 'unsigned int',
             'positiveInteger': 'unsigned int',
@@ -80,23 +86,37 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:tns="http://xmlschema.test/ns" 
     targetNamespace="http://xmlschema.test/ns">
+
   <xs:element name="root" type="xs:string" />
+
   <xs:complexType name="type3">
     <xs:sequence>
       <xs:element name="elem1" type="tns:type1" />
       <xs:element name="elem2" type="tns:type2" />
     </xs:sequence>
   </xs:complexType>
+
   <xs:complexType name="type2">
     <xs:sequence>
       <xs:element name="elem1" type="tns:type1" />
-      <xs:element name="elem4" type="tns:type4" />
+      <xs:element name="elem4" type="tns:type4" maxOccurs="10" />
     </xs:sequence>
   </xs:complexType>
+
   <xs:simpleType name="type4">
     <xs:restriction base="xs:string" />
   </xs:simpleType>
+
   <xs:complexType name="type1" />
+
+  <xs:simpleType name="type5">
+    <xs:restriction base="xs:decimal" />
+  </xs:simpleType>
+  
+  <xs:simpleType name="type6">
+    <xs:restriction base="xs:float" />
+  </xs:simpleType>
+
 </xs:schema>
 """
 
@@ -104,18 +124,19 @@
 @unittest.skipIf(jinja2 is None, "jinja2 library is not installed!")
 class TestAbstractGenerator(unittest.TestCase):
 
+    schema_class = XMLSchema10
     generator_class = DemoGenerator
 
     @classmethod
     def setUpClass(cls):
-        cls.schema = XMLSchema10(XSD_TEST)
+        cls.schema = cls.schema_class(XSD_TEST)
         cls.searchpath = Path(__file__).absolute().parent.joinpath('templates/filters/')
         cls.generator = cls.generator_class(cls.schema, str(cls.searchpath))
 
         cls.col_dir = casepath('examples/collection')
         cls.col_xsd_file = casepath('examples/collection/collection.xsd')
         cls.col_xml_file = casepath('examples/collection/collection.xml')
-        cls.col_schema = XMLSchema10(cls.col_xsd_file)
+        cls.col_schema = cls.schema_class(cls.col_xsd_file)
 
     def test_formal_language(self):
         self.assertEqual(self.generator_class.formal_language, 'Demo')
@@ -245,6 +266,54 @@
         with self.assertRaises(jinja2.TemplateSyntaxError):
             self.generator.render('wrong-template.jinja')
 
+        logger = logging.getLogger('xmlschema-codegen')
+
+        with self.assertLogs(logger, level=logging.DEBUG):
+            self.generator.render('unknown')
+
+    def test_render_to_files(self):
+        with tempfile.TemporaryDirectory() as outdir:
+            files = self.generator.render_to_files('name_filter_test.jinja', output_dir=outdir)
+            self.assertListEqual(files, os.path.join(outdir, 'name_filter_test'))
+
+            files = self.generator.render_to_files(
+                'name_filter_test.jinja', 'namespace_filter_test.jinja', output_dir=outdir)
+            self.assertListEqual(files, os.path.join(outdir, 'namespace_filter_test'))
+
+        with tempfile.TemporaryDirectory() as outdir:
+            files = self.generator.render_to_files(
+                'name_filter_test.jinja', 'namespace_filter_test.jinja', output_dir=outdir
+            )
+            self.assertSetEqual(set(files), {
+                os.path.join(outdir, 'name_filter_test'),
+                os.path.join(outdir, 'namespace_filter_test'),
+            })
+
+        with tempfile.TemporaryDirectory() as outdir:
+            files = self.generator.render_to_files('name*', output_dir=outdir)
+
+            self.assertSetEqual(set(files), {
+                os.path.join(outdir, 'name_filter_test'),
+                os.path.join(outdir, 'namespace_filter_test'),
+            })
+
+        with tempfile.TemporaryDirectory() as outdir:
+            with self.assertRaises(TypeError):
+                self.generator.render_to_files(
+                    'name_filter_test.jinja', False, output_dir=outdir)
+
+            with self.assertRaises(jinja2.TemplateSyntaxError):
+                self.generator.render_to_files('wrong-template.jinja', output_dir=outdir)
+
+            logger = logging.getLogger('xmlschema-codegen')
+
+            with self.assertLogs(logger, level=logging.DEBUG):
+                with self.assertRaises(jinja2.TemplateSyntaxError):
+                    self.generator.render_to_files('*', output_dir=outdir)
+
+            with self.assertLogs(logger, level=logging.DEBUG):
+                self.generator.render_to_files('unknown', output_dir=outdir)
+
     def test_language_type_filter(self):
         self.assertListEqual(self.generator.render('demo_type_filter_test.jinja'), 'str')
 
@@ -277,45 +346,206 @@
             with self.assertRaises(KeyError):
                 self.generator.filters'instance_filter'(dt)
 
+    def test_map_type(self):
+        self.assertEqual(self.generator.map_type(None), '')
+        self.assertEqual(self.generator.map_type(self.schema.elements'root'), 'str')
+        self.assertEqual(self.generator.map_type(self.schema.types'type1'), '')
+        self.assertEqual(self.generator.map_type(self.schema.types'type2'), '')
+        self.assertEqual(self.generator.map_type(self.schema.types'type4'), 'str')
+        self.assertEqual(self.generator.map_type(self.schema.types'type5'), 'float')
+        self.assertEqual(self.generator.map_type(self.schema.types'type6'), 'float')
+
+        date_type = self.schema.meta_schema.types'date'
+        self.assertEqual(self.generator.map_type(date_type), '')
+
     def test_name_filter(self):
         xsd_element = self.schema.elements'root'
         self.assertEqual(self.generator.filters'name'(xsd_element), 'root')
         self.assertListEqual(self.generator.render('name_filter_test.jinja'), 'root')
 
+        self.assertEqual(self.generator.name(None), 'none')
+        self.assertEqual(self.generator.name(''), '')
+        self.assertEqual(self.generator.name('foo'), 'foo')
+        self.assertEqual(self.generator.name('{http://xmlschema.test/ns}foo'), 'foo')
+        self.assertEqual(self.generator.name('ns:foo'), 'foo')
+        self.assertEqual(self.generator.name('0:foo'), '')
+        self.assertEqual(self.generator.name('1'), 'none')
+
+        FakeElement = namedtuple('XsdElement', 'local_name name')
+        fake_element = FakeElement(1, 2)
+        self.assertEqual(self.generator.name(fake_element), '')
+
     def test_qname_filter(self):
         xsd_element = self.schema.elements'root'
         self.assertEqual(self.generator.filters'qname'(xsd_element), 'tns__root')
         self.assertListEqual(self.generator.render('qname_filter_test.jinja'), 'tns__root')
 
+        self.assertEqual(self.generator.qname(None), 'none')
+        self.assertEqual(self.generator.qname(''), '')
+        self.assertEqual(self.generator.qname('{wrong'), 'none')
+        self.assertEqual(self.generator.qname('foo'), 'foo')
+        self.assertEqual(self.generator.qname('{http://xmlschema.test/ns}foo'), 'tns__foo')
+        self.assertEqual(self.generator.qname('{http://unknown.test/ns}foo'), 'foo')
+        self.assertEqual(self.generator.qname('ns:foo'), 'ns__foo')
+        self.assertEqual(self.generator.qname('0:foo'), 'none')
+        self.assertEqual(self.generator.qname('1'), 'none')
+
     def test_namespace_filter(self):
         xsd_element = self.schema.elements'root'
         tns = 'http://xmlschema.test/ns'
         self.assertEqual(self.generator.filters'namespace'(xsd_element), tns)
         self.assertListEqual(self.generator.render('namespace_filter_test.jinja'), tns)
 
+        self.assertEqual(self.generator.namespace(None), '')
+        self.assertEqual(self.generator.namespace(''), '')
+        self.assertEqual(self.generator.namespace('{wrong'), '')
+        self.assertEqual(self.generator.namespace('foo'), '')

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_converters.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_converters.py Changed

@@ -35,10 +35,14 @@
         cls.col_xsd_filename = cls.casepath('examples/collection/collection.xsd')
         cls.col_xml_filename = cls.casepath('examples/collection/collection.xml')
         cls.col_xml_root = ElementTree.parse(cls.col_xml_filename).getroot()
-        cls.col_lxml_root = lxml_etree.parse(cls.col_xml_filename).getroot()
         cls.col_nsmap = fetch_namespaces(cls.col_xml_filename)
         cls.col_namespace = cls.col_nsmap'col'
 
+        if lxml_etree is not None:
+            cls.col_lxml_root = lxml_etree.parse(cls.col_xml_filename).getroot()
+        else:
+            cls.col_lxml_root = None
+
     @classmethod
     def casepath(cls, relative_path):
         return str(Path(__file__).parent.joinpath('test_cases', relative_path))
@@ -196,9 +200,10 @@
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
 
         # Decode from lxml.etree.Element tree
-        obj2 = col_schema.decode(self.col_lxml_root)
-        self.assertIn("'@xmlns:col'", repr(obj2))
-        self.assertEqual(obj1, obj2)
+        if self.col_lxml_root is not None:
+            obj2 = col_schema.decode(self.col_lxml_root)
+            self.assertIn("'@xmlns:col'", repr(obj2))
+            self.assertEqual(obj1, obj2)
 
         # Decode from ElementTree.Element tree providing namespaces
         obj2 = col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap)
@@ -232,10 +237,11 @@
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
 
         # Decode from lxml.etree.Element tree
-        obj2 = col_schema.decode(self.col_lxml_root, preserve_root=True)
-        self.assertIn("'col:collection'", repr(obj2))
-        self.assertIn("'@xmlns:col'", repr(obj2))
-        self.assertEqual(obj1, obj2)
+        if self.col_lxml_root is not None:
+            obj2 = col_schema.decode(self.col_lxml_root, preserve_root=True)
+            self.assertIn("'col:collection'", repr(obj2))
+            self.assertIn("'@xmlns:col'", repr(obj2))
+            self.assertEqual(obj1, obj2)
 
         # Decode from ElementTree.Element tree providing namespaces
         obj2 = col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap, preserve_root=True)
@@ -270,9 +276,10 @@
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
 
         # Decode from lxml.etree.Element tree
-        obj2 = col_schema.decode(self.col_lxml_root)
-        self.assertIn("'@xmlns:col'", repr(obj2))
-        self.assertEqual(obj1, obj2)
+        if self.col_lxml_root is not None:
+            obj2 = col_schema.decode(self.col_lxml_root)
+            self.assertIn("'@xmlns:col'", repr(obj2))
+            self.assertEqual(obj1, obj2)
 
         # Decode from ElementTree.Element tree providing namespaces
         obj2 = col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap)
@@ -306,10 +313,11 @@
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
 
         # Decode from lxml.etree.Element tree
-        obj2 = col_schema.decode(self.col_lxml_root, preserve_root=True)
-        self.assertIn("'col:collection'", repr(obj2))
-        self.assertIn("'@xmlns:col'", repr(obj2))
-        self.assertEqual(obj1, obj2)
+        if self.col_lxml_root is not None:
+            obj2 = col_schema.decode(self.col_lxml_root, preserve_root=True)
+            self.assertIn("'col:collection'", repr(obj2))
+            self.assertIn("'@xmlns:col'", repr(obj2))
+            self.assertEqual(obj1, obj2)
 
         # Decode from ElementTree.Element tree providing namespaces
         obj2 = col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap, preserve_root=True)
@@ -358,7 +366,8 @@
         self.assertEqual(obj1, col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap))
 
         # With lxml.etree namespaces are mapped
-        self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
+        if self.col_lxml_root is not None:
+            self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
 
         root = col_schema.encode(obj2, path='./col:collection', namespaces=self.col_nsmap)
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
@@ -385,7 +394,8 @@
         self.assertEqual(obj1, col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap))
 
         # With lxml.etree namespaces are mapped
-        self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
+        if self.col_lxml_root is not None:
+            self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
 
         root = col_schema.encode(obj2, path='./col:collection', namespaces=self.col_nsmap)
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
@@ -416,7 +426,8 @@
         self.assertEqual(obj1, col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap))
 
         # With lxml.etree namespaces are mapped
-        self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
+        if self.col_lxml_root is not None:
+            self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
 
         root = col_schema.encode(obj2, path='./col:collection', namespaces=self.col_nsmap)
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
@@ -443,7 +454,8 @@
         self.assertEqual(obj1, col_schema.decode(self.col_xml_root, namespaces=self.col_nsmap))
 
         # With lxml.etree namespaces are mapped
-        self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
+        if self.col_lxml_root is not None:
+            self.assertEqual(obj1, col_schema.decode(self.col_lxml_root))
 
         root = col_schema.encode(obj2, path='./col:collection', namespaces=self.col_nsmap)
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))
@@ -479,9 +491,10 @@
         ))
 
         # With lxml.etree namespaces are mapped
-        self.assertIsNone(etree_elements_assert_equal(
-            obj1, col_schema.decode(self.col_lxml_root)
-        ))
+        if self.col_lxml_root is not None:
+            self.assertIsNone(etree_elements_assert_equal(
+                obj1, col_schema.decode(self.col_lxml_root)
+            ))
 
         root = col_schema.encode(obj2, path='./col:collection', namespaces=self.col_nsmap)
         self.assertIsNone(etree_elements_assert_equal(self.col_xml_root, root, strict=False))

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_dataobjects.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_dataobjects.py Changed

@@ -12,13 +12,8 @@
 import xml.etree.ElementTree as ElementTree
 from pathlib import Path
 
-try:
-    import lxml.etree as lxml_etree
-except ImportError:
-    lxml_etree = None
-
-from xmlschema import XMLSchema, fetch_namespaces, etree_tostring, \
-    XMLSchemaValidationError, DataElement, DataElementConverter
+from xmlschema import XMLSchema10, XMLSchema11, fetch_namespaces, etree_tostring, \
+    XMLSchemaValidationError, DataElement, DataElementConverter, XMLResource
 
 from xmlschema.helpers import is_etree_element
 from xmlschema.dataobjects import DataBindingMeta, DataBindingConverter
@@ -43,6 +38,11 @@
         self.assertEqual(DataElement('foo', attrib=attrib).get('a'), 10)
         self.assertIsNone(DataElement('foo', attrib=attrib).get('c'))
 
+        data_element = DataElement('foo')
+        data_element.set('b', 9)
+        self.assertIsNone(data_element.get('a'))
+        self.assertEqual(data_element.get('b'), 9)
+
     def test_namespaces(self):
         self.assertEqual(DataElement('foo').nsmap, {})
         nsmap = {'tns': 'http://xmlschema.test/ns'}
@@ -57,6 +57,7 @@
 
 class TestDataObjects(unittest.TestCase):
 
+    schema_class = XMLSchema10
     converter = DataElementConverter
 
     @classmethod
@@ -64,10 +65,9 @@
         cls.col_xsd_filename = cls.casepath('examples/collection/collection.xsd')
         cls.col_xml_filename = cls.casepath('examples/collection/collection.xml')
         cls.col_xml_root = ElementTree.parse(cls.col_xml_filename).getroot()
-        cls.col_lxml_root = lxml_etree.parse(cls.col_xml_filename).getroot()
         cls.col_nsmap = fetch_namespaces(cls.col_xml_filename)
         cls.col_namespace = cls.col_nsmap'col'
-        cls.col_schema = XMLSchema(cls.col_xsd_filename, converter=cls.converter)
+        cls.col_schema = cls.schema_class(cls.col_xsd_filename, converter=cls.converter)
 
     @classmethod
     def casepath(cls, relative_path):
@@ -97,6 +97,42 @@
         self.assertEqual(col_data1.prefixed_name, 'object')
         self.assertEqual(col_data1.local_name, 'object')
 
+    def test_xsd_version(self):
+        self.assertEqual(DataElement(tag=self.col_xml_root.tag).xsd_version, '1.0')
+
+        xsd_element = self.col_schema.elements'person'
+        data_element = DataElement(tag=self.col_xml_root.tag, xsd_element=xsd_element)
+        self.assertEqual(data_element.xsd_version, self.col_schema.XSD_VERSION)
+
+    def test_xsd_element_binding(self):
+        xsd_element = self.col_schema.elements'person'
+        data_element = DataElement(tag=self.col_xml_root.tag, xsd_element=xsd_element)
+        data_element.xsd_element = xsd_element
+
+        with self.assertRaises(TypeError) as ec:
+            DataElement(tag=xsd_element.name, xsd_element=self.col_schema)
+        self.assertIn("invalid type for attribute 'xsd_element'", str(ec.exception))
+
+        with self.assertRaises(ValueError) as ec:
+            data_element.xsd_element = self.col_schema.elements'collection'
+        self.assertIn('the instance is already bound to another XSD element', str(ec.exception))
+
+    def test_xsd_type_binding(self):
+        xsd_type = self.col_schema.elements'person'.type
+        data_element = DataElement(tag=self.col_xml_root.tag, xsd_type=xsd_type)
+
+        with self.assertRaises(TypeError) as ec:
+            DataElement(tag=self.col_xml_root.tag, xsd_type=self.col_schema)
+        self.assertIn("invalid type for attribute 'xsd_type'", str(ec.exception))
+
+        with self.assertRaises(ValueError) as ec:
+            data_element.xsd_element = self.col_schema.elements'collection'
+        self.assertIn('the instance is already bound to another XSD type', str(ec.exception))
+
+        with self.assertRaises(ValueError) as ec:
+            data_element.xsd_type = self.col_schema.elements'collection'.type
+        self.assertIn('the instance is already bound to another XSD type', str(ec.exception))
+
     def test_mutable_mapping_api(self):
         data_element = DataElement('root')
 
@@ -167,6 +203,9 @@
         self.assertTrue(is_etree_element(obj))
         self.assertIsInstance(etree_tostring(obj), str)
         self.assertIsNone(etree_elements_assert_equal(obj, self.col_xml_root, strict=False))
+        self.assertIsNone(
+            etree_elements_assert_equal(obj, col_data.encode(converter=self.converter))
+        )
 
         with self.assertRaises(ValueError) as ec:
             col_data.xsd_type = col_data0.xsd_type
@@ -210,12 +249,34 @@
         self.assertTrue(xml_source.endswith('</col:collection>'))
 
     def test_validation(self):
+        with self.assertRaises(ValueError) as ec:
+            DataElement(self.col_xml_root).validate()
+        self.assertIn("has no schema bindings", str(ec.exception))
+
         col_data = self.col_schema.decode(self.col_xml_filename)
 
         self.assertIsNone(col_data.validate())
         self.assertTrue(col_data.is_valid())
         self.assertListEqual(list(col_data.iter_errors()), )
 
+        col_data = self.col_schema.decode(self.col_xml_root)
+        self.assertEqual(col_data.nsmap, {})
+        self.assertTrue(col_data.is_valid())
+
+        # FIXME: are namespaces really needed for validation of data elements???
+        #  (that use iter_encode() instead of iter_decode() ...)
+        self.assertTrue(col_data.is_valid(namespaces={
+            'col': 'http://example.com/ns/collection',
+            'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
+        }))
+
+        # Encoding back using the default namespace is simple with
+        # data elements because you still have the original tags.
+        self.assertTrue(col_data.is_valid(namespaces={
+            '': 'http://example.com/ns/collection',
+            'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
+        }))
+
     def test_invalid_value_type(self):
         col_data = self.col_schema.decode(self.col_xml_filename)
         self.assertTrue(col_data.is_valid())
@@ -266,12 +327,36 @@
         self.assertFalse(col_data.is_valid(max_depth=1))
         self.assertFalse(col_data.is_valid(max_depth=2))
 
+    def test_converter_class(self):
+        converter = self.converter()
+        self.assertFalse(converter.lossy)
+        self.assertTrue(converter.losslessly)
+
+        class MyDataElement(DataElement):
+            pass
+
+        col_data = self.col_schema.decode(self.col_xml_filename, converter=converter)
+        self.assertIsInstance(col_data, DataElement)
+        self.assertNotIsInstance(col_data, MyDataElement)
+
+        converter = self.converter(data_element_class=MyDataElement)
+        self.assertIs(converter.data_element_class, MyDataElement)
+        self.assertIs(converter.copy().data_element_class, MyDataElement)
+
+        self.col_schema.maps.clear_bindings()  # needed for DataBindingConverter ...
+        col_data = self.col_schema.decode(self.col_xml_filename, converter=converter)
+        self.assertIsInstance(col_data, MyDataElement)
+
+        with self.assertRaises(ValueError) as ec:
+            converter.element_encode(col_data, col_data0.xsd_element)
+        self.assertEqual("Unmatched tag", str(ec.exception))
+
 
 class TestDataBindings(TestDataObjects):
 
     converter = DataBindingConverter
 
-    def test_data_element_metaclass(self):
+    def test_data_binding_metaclass(self):
         xsd_element = self.col_schema.elements'collection'
         collection_class = DataBindingMeta(xsd_element.local_name.title(), (DataElement,),
                                            {'xsd_element': xsd_element})
@@ -279,7 +364,15 @@
         self.assertEqual(collection_class.__qualname__, 'Collection')
         self.assertIsNone(collection_class.__module__)
         self.assertEqual(collection_class.namespace, 'http://example.com/ns/collection')
-        self.assertEqual(collection_class.xsd_version, '1.0')
+        self.assertEqual(collection_class.xsd_version, self.col_schema.XSD_VERSION)
+
+        with self.assertRaises(AttributeError) as ec:
+            DataBindingMeta(xsd_element.local_name.title(), (DataElement,), {})
+        self.assertIn("attribute 'xsd_element' is required", str(ec.exception))
+
+        with self.assertRaises(TypeError) as ec:
+            DataBindingMeta(xsd_element.local_name.title(), (DataElement,), {'xsd_element': None})
+        self.assertIn("None is not an XSD element", str(ec.exception))
 
     def test_element_binding(self):
         xsd_element = self.col_schema.elements'collection'
@@ -298,7 +391,7 @@
             xsd_element.binding = None
 
     def test_schema_bindings(self):
-        schema = XMLSchema(self.col_xsd_filename)
+        schema = self.schema_class(self.col_xsd_filename)
         schema.maps.create_bindings()
 
         col_element_class = schema.elements'collection'.binding

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_documents.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_documents.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_etree.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_etree.py Changed

@@ -11,7 +11,11 @@
 import unittest
 import os
 import platform
-import lxml.etree
+
+try:
+    import lxml.etree as lxml_etree
+except ImportError:
+    lxml_etree = None
 
 from xmlschema.etree import ElementTree, PyElementTree, ParseError, \
     SafeXMLParser, etree_tostring
@@ -94,8 +98,9 @@
                                  '</root>')
         self.assertEqual(etree_tostring(root, method='text'), '\n  text1\n  text2')
 
+    @unittest.skipIf(lxml_etree is None, 'lxml is not installed ...')
     def test_lxml_element_string_serialization(self):
-        elem = lxml.etree.Element('element')
+        elem = lxml_etree.Element('element')
         self.assertEqual(etree_tostring(elem), '<element/>')
         self.assertEqual(etree_tostring(elem, xml_declaration=True), '<element/>')
 
@@ -119,7 +124,7 @@
         self.assertEqual(etree_tostring(elem, method='html'), '<element></element>')
         self.assertEqual(etree_tostring(elem, method='text'), '')
 
-        root = lxml.etree.XML('<root>\n'
+        root = lxml_etree.XML('<root>\n'
                               '  text1\n'
                               '  <elem>text2</elem>\n'
                               '</root>')
@@ -220,8 +225,9 @@
         self.assertIsNone(etree_elements_assert_equal(e1, e1))
         self.assertIsNone(etree_elements_assert_equal(e1, e2))
 
-        e2 = lxml.etree.XML('<a><b1>text<c1 a="1"/></b1>\n<b2/><b3/></a>\n')
-        self.assertIsNone(etree_elements_assert_equal(e1, e2))
+        if lxml_etree is not None:
+            e2 = lxml_etree.XML('<a><b1>text<c1 a="1"/></b1>\n<b2/><b3/></a>\n')
+            self.assertIsNone(etree_elements_assert_equal(e1, e2))
 
         e2 = ElementTree.XML('<a><b1>text<c1 a="1"/></b1>\n<b2/><b3/><b4/></a>\n')
         with self.assertRaises(AssertionError) as ctx:
@@ -263,8 +269,9 @@
         self.assertIsNone(etree_elements_assert_equal(e1, e2))
         self.assertIsNone(etree_elements_assert_equal(e1, e2, skip_comments=False))
 
-        e2 = lxml.etree.XML('<a><b1>text<c1 a="1"/></b1>\n<b2/><b3/></a>\n')
-        self.assertIsNone(etree_elements_assert_equal(e1, e2))
+        if lxml_etree is not None:
+            e2 = lxml_etree.XML('<a><b1>text<c1 a="1"/></b1>\n<b2/><b3/></a>\n')
+            self.assertIsNone(etree_elements_assert_equal(e1, e2))
 
         e1 = ElementTree.XML('<a><b1>+1</b1></a>')
         e2 = ElementTree.XML('<a><b1>+ 1 </b1></a>')

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_helpers.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_helpers.py Changed

@@ -28,7 +28,7 @@
     base64_binary_validator, hex_binary_validator, \
     int_validator, long_validator, unsigned_byte_validator, \
     unsigned_short_validator, negative_int_validator, error_type_validator
-from xmlschema.validators.models import OccursCounter
+from xmlschema.validators.particles import OccursCalculator
 
 
 class TestHelpers(unittest.TestCase):
@@ -46,13 +46,20 @@
             'a1': 'extension', 'a2': ' restriction', 'a3': '#all', 'a4': 'other',
             'a5': 'restriction extension restriction ', 'a6': 'other restriction'
         })
-        values = ('extension', 'restriction')
+        values = {'extension', 'restriction'}
         self.assertEqual(get_xsd_derivation_attribute(elem, 'a1', values), 'extension')
         self.assertEqual(get_xsd_derivation_attribute(elem, 'a2', values), ' restriction')
-        self.assertEqual(get_xsd_derivation_attribute(elem, 'a3', values), 'extension restriction')
+
+        result = get_xsd_derivation_attribute(elem, 'a3', values)
+        self.assertSetEqual(set(result.strip().split()),
+                            set('extension restriction'.split()))
+
         self.assertRaises(ValueError, get_xsd_derivation_attribute, elem, 'a4', values)
-        self.assertEqual(get_xsd_derivation_attribute(elem, 'a5', values),
-                         'restriction extension restriction ')
+
+        result = get_xsd_derivation_attribute(elem, 'a5', values)
+        self.assertEqual(set(result.strip().split()),
+                         set('restriction extension restriction'.split()))
+
         self.assertRaises(ValueError, get_xsd_derivation_attribute, elem, 'a6', values)
         self.assertEqual(get_xsd_derivation_attribute(elem, 'a7', values), '')
 
@@ -139,42 +146,42 @@
         with self.assertRaises(TypeError):
             list(iter_nested_items(10, 20, list_class=tuple))
 
-    def test_occurs_counter_class(self):
-        counter = OccursCounter()
-        self.assertEqual(repr(counter), 'OccursCounter(0, 0)')
+    def test_occurs_calculator_class(self):
+        counter = OccursCalculator()
+        self.assertEqual(repr(counter), 'OccursCalculator(0, 0)')
 
-        other = OccursCounter()  # Only for test isolation, usually it's a particle.
+        other = OccursCalculator()  # Only for test isolation, usually it's a particle.
         other.min_occurs = 5
         other.max_occurs = 10
 
         counter += other
-        self.assertEqual(repr(counter), 'OccursCounter(5, 10)')
+        self.assertEqual(repr(counter), 'OccursCalculator(5, 10)')
         counter *= other
-        self.assertEqual(repr(counter), 'OccursCounter(25, 100)')
+        self.assertEqual(repr(counter), 'OccursCalculator(25, 100)')
 
-        counter = OccursCounter()
+        counter = OccursCalculator()
         counter.max_occurs = None
-        self.assertEqual(repr(counter), 'OccursCounter(0, None)')
-        self.assertEqual(repr(counter * other), 'OccursCounter(0, None)')
-        self.assertEqual(repr(counter + other), 'OccursCounter(5, None)')
-        self.assertEqual(repr(counter * other), 'OccursCounter(25, None)')
+        self.assertEqual(repr(counter), 'OccursCalculator(0, None)')
+        self.assertEqual(repr(counter * other), 'OccursCalculator(0, None)')
+        self.assertEqual(repr(counter + other), 'OccursCalculator(5, None)')
+        self.assertEqual(repr(counter * other), 'OccursCalculator(25, None)')
 
         counter.reset()
-        self.assertEqual(repr(counter), 'OccursCounter(0, 0)')
+        self.assertEqual(repr(counter), 'OccursCalculator(0, 0)')
 
         counter.max_occurs = None
         other.min_occurs = other.max_occurs = 0
-        self.assertEqual(repr(counter * other), 'OccursCounter(0, 0)')
+        self.assertEqual(repr(counter * other), 'OccursCalculator(0, 0)')
 
         counter.reset()
         other.min_occurs = 0
         other.max_occurs = None
-        self.assertEqual(repr(counter * other), 'OccursCounter(0, 0)')
-        self.assertEqual(repr(counter + other), 'OccursCounter(0, None)')
-        self.assertEqual(repr(counter + other), 'OccursCounter(0, None)')
+        self.assertEqual(repr(counter * other), 'OccursCalculator(0, 0)')
+        self.assertEqual(repr(counter + other), 'OccursCalculator(0, None)')
+        self.assertEqual(repr(counter + other), 'OccursCalculator(0, None)')
 
         counter.max_occurs = 1
-        self.assertEqual(repr(counter * other), 'OccursCounter(0, None)')
+        self.assertEqual(repr(counter * other), 'OccursCalculator(0, None)')
 
     def test_get_namespace(self):
         self.assertEqual(get_namespace(''), '')
@@ -211,8 +218,8 @@
         self.assertEqual(local_name(XSD_SCHEMA), 'schema')
         self.assertEqual(local_name('schema'), 'schema')
         self.assertEqual(local_name(''), '')
-        self.assertEqual(local_name(None), None)
 
+        self.assertRaises(TypeError, local_name, None)
         self.assertRaises(ValueError, local_name, '{ns name')
         self.assertRaises(TypeError, local_name, 1.0)
         self.assertRaises(TypeError, local_name, 0)
@@ -228,7 +235,7 @@
 
         self.assertEqual(get_prefixed_qname('', namespaces), '')
         self.assertEqual(get_prefixed_qname(None, namespaces), None)
-        # self.assertEqual(get_prefixed_qname(0, namespaces), 0)
+        self.assertEqual(get_prefixed_qname('{uri}element', namespaces), '{uri}element')
 
         self.assertEqual(get_prefixed_qname(XSI_TYPE, {}), XSI_TYPE)
         self.assertEqual(get_prefixed_qname(None, {}), None)

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_memory.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_memory.py Changed

@@ -11,8 +11,10 @@
 import unittest
 import os
 import decimal
+import pathlib
 import subprocess
 import sys
+import tempfile
 
 try:
     import memory_profiler
@@ -69,44 +71,62 @@
         lazy_iterparse_mem = self.check_memory_profile(output)
 
         self.assertLess(parse_mem, 2)
-        self.assertLessEqual(lazy_iterparse_mem, parse_mem / decimal.Decimal('1.75'))
-        self.assertLessEqual(lazy_iterparse_mem, iterparse_mem)
+        self.assertLess(lazy_iterparse_mem, parse_mem)
+        self.assertLess(lazy_iterparse_mem, iterparse_mem)
 
     def test_decode_memory_usage(self):
-        test_dir = os.path.dirname(__file__) or '.'
-        xsd10_schema_file = os.path.join(
-            os.path.dirname(os.path.abspath(test_dir)),
-            'xmlschema/schemas/XSD_1.0/XMLSchema.xsd'
-        )
-
-        cmd = sys.executable, os.path.join(test_dir, 'check_memory.py'), '5', xsd10_schema_file
-        output = subprocess.check_output(cmd, universal_newlines=True)
-        decode_mem = self.check_memory_profile(output)
-
-        cmd = sys.executable, os.path.join(test_dir, 'check_memory.py'), '6', xsd10_schema_file
-        output = subprocess.check_output(cmd, universal_newlines=True)
-        lazy_decode_mem = self.check_memory_profile(output)
-
-        self.assertLess(decode_mem, 2.6)
-        self.assertLessEqual(lazy_decode_mem, decode_mem / decimal.Decimal('1.1'))
+        with tempfile.TemporaryDirectory() as dirname:
+            python_script = pathlib.Path(__file__).parent.joinpath('check_memory.py')
+            xsd_file = pathlib.Path(__file__).parent.absolute().joinpath(
+                'test_cases/features/decoder/long-sequence-1.xsd'
+            )
+            xml_file = pathlib.Path(dirname).joinpath('data.xml')
+
+            with xml_file.open('w') as fp:
+                fp.write('<data ')
+                fp.write('xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ')
+                fp.write(f'xsi:noNamespaceSchemaLocation="{xsd_file.as_uri()}">\n')
+                for k in range(1000):
+                    fp.write('<chunk><a><b1/><b2/><b3/></a></chunk>\n')
+                fp.write('</data>\n')
+
+            cmd = sys.executable, python_script, '5', str(xml_file)
+            output = subprocess.check_output(cmd, universal_newlines=True)
+            decode_mem = self.check_memory_profile(output)
+
+            cmd = sys.executable, python_script, '6', str(xml_file)
+            output = subprocess.check_output(cmd, universal_newlines=True)
+            lazy_decode_mem = self.check_memory_profile(output)
+
+        self.assertLessEqual(decode_mem, 2.6)
+        self.assertLessEqual(lazy_decode_mem, 1.8)
 
     def test_validate_memory_usage(self):
-        test_dir = os.path.dirname(__file__) or '.'
-        xsd10_schema_file = os.path.join(
-            os.path.dirname(os.path.abspath(test_dir)),
-            'xmlschema/schemas/XSD_1.0/XMLSchema.xsd'
-        )
-
-        cmd = sys.executable, os.path.join(test_dir, 'check_memory.py'), '7', xsd10_schema_file
-        output = subprocess.check_output(cmd, universal_newlines=True)
-        validate_mem = self.check_memory_profile(output)
-
-        cmd = sys.executable, os.path.join(test_dir, 'check_memory.py'), '8', xsd10_schema_file
-        output = subprocess.check_output(cmd, universal_newlines=True)
-        lazy_validate_mem = self.check_memory_profile(output)
-
-        self.assertLess(validate_mem, 2.6)
-        self.assertLessEqual(lazy_validate_mem, validate_mem / decimal.Decimal('1.1'))
+        with tempfile.TemporaryDirectory() as dirname:
+            python_script = pathlib.Path(__file__).parent.joinpath('check_memory.py')
+            xsd_file = pathlib.Path(__file__).parent.absolute().joinpath(
+                'test_cases/features/decoder/long-sequence-1.xsd'
+            )
+            xml_file = pathlib.Path(dirname).joinpath('data.xml')
+
+            with xml_file.open('w') as fp:
+                fp.write('<data ')
+                fp.write('xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ')
+                fp.write(f'xsi:noNamespaceSchemaLocation="{xsd_file.as_uri()}">\n')
+                for k in range(1000):
+                    fp.write('<chunk><a><b1/><b2/><b3/></a></chunk>\n')
+                fp.write('</data>\n')
+
+            cmd = sys.executable, python_script, '7', str(xml_file)
+            output = subprocess.check_output(cmd, universal_newlines=True)
+            validate_mem = self.check_memory_profile(output)
+
+            cmd = sys.executable, python_script, '8', str(xml_file)
+            output = subprocess.check_output(cmd, universal_newlines=True)
+            lazy_validate_mem = self.check_memory_profile(output)
+
+            self.assertLess(validate_mem, 2.6)
+            self.assertLess(lazy_validate_mem, 1.8)
 
 
 if __name__ == '__main__':

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_namespaces.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_namespaces.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_package.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_package.py Changed

@@ -16,6 +16,7 @@
 import os
 import re
 import importlib
+import pathlib
 
 
 class TestPackaging(unittest.TestCase):
@@ -30,12 +31,10 @@
         )
         cls.get_version = re.compile(r"(?:\brelease|__version__)(?:\s*=\s*)(\'^\'*\'|\"^\"*\")")
 
-    def test_missing_debug_statements(self):
+    def test_forgotten_debug_statements(self):
         # Exclude explicit debug statements written in the code
         exclude = {
-            'regex.py': 240, 241,
-            'codepoints.py': 534,
-            'cli.py': 117, 133, 137, 140,
+            'cli.py': 'print(',
         }
 
         message = "\nFound a debug missing statement at line %d or file %r: %r"
@@ -53,7 +52,7 @@
                 continue
 
             match = self.missing_debug.search(line)
-            if match is None or filename.endswith('/cli.py') and match.group(0) == 'print(':
+            if match is None or match.group(0) in file_excluded:
                 continue
             self.assertIsNone(match, message % (lineno, filename, match.group(0)))
 
@@ -82,6 +81,19 @@
                         message % (lineno, filename, match.group(1).strip('\'\"'), version)
                     )
 
+    def test_elementpath_requirement(self):
+        package_dir = pathlib.Path(__file__).parent.parent
+        ep_requirement = None
+        for line in fileinput.input(str(package_dir.joinpath('requirements-dev.txt'))):
+            if 'elementpath' in line:
+                ep_requirement = line.strip()
+
+        self.assertIsNotNone(ep_requirement, msg="Missing elementpath in requirements-dev.txt")
+
+        for line in fileinput.input(str(package_dir.joinpath('setup.py'))):
+            if 'elementpath' in line:
+                self.assertIn(ep_requirement, line, msg="Unmatched requirement in setup.py")
+
     def test_base_schema_files(self):
         et = importlib.import_module('xml.etree.ElementTree')
         schemas_dir = os.path.join(self.source_dir, 'schemas')

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_resources.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_resources.py Changed

@@ -12,13 +12,15 @@
 
 import unittest
 import os
+import pathlib
 import platform
 import warnings
 from io import StringIO, BytesIO
 from urllib.error import URLError
 from urllib.request import urlopen
 from urllib.parse import urlsplit, uses_relative
-from pathlib import Path, PureWindowsPath, PurePath
+from pathlib import Path, PurePath, PureWindowsPath, PurePosixPath
+from unittest.mock import patch, MagicMock
 
 try:
     import lxml.etree as lxml_etree
@@ -29,16 +31,19 @@
     fetch_schema, fetch_schema_locations, XMLResource, XMLResourceError, XMLSchema
 from xmlschema.etree import ElementTree, etree_element, py_etree_element, is_etree_element
 from xmlschema.names import XSD_NAMESPACE
+import xmlschema.resources
 from xmlschema.resources import is_url, is_local_url, is_remote_url, \
     url_path_is_file, normalize_locations, LazySelector
 from xmlschema.testing import SKIP_REMOTE_TESTS
 
 
-TEST_CASES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_cases/')
+TEST_CASES_DIR = str(pathlib.Path(__file__).absolute().parent.joinpath('test_cases'))
+
+DRIVE_REGEX = '/a-zA-Z:' if platform.system() == 'Windows' else ''
 
 
 def casepath(relative_path):
-    return os.path.join(TEST_CASES_DIR, relative_path)
+    return str(pathlib.Path(TEST_CASES_DIR).joinpath(relative_path))
 
 
 def is_windows_path(path):
@@ -95,6 +100,46 @@
             expected_path = PurePath(expected_parts.path)
         self.assertEqual(path, expected_path, "%r: Paths differ." % url)
 
+    def test_path_from_uri(self):
+        _PurePath = xmlschema.resources._PurePath
+        _PosixPurePath = xmlschema.resources._PurePosixPath
+        _WindowsPurePath = xmlschema.resources._PureWindowsPath
+
+        with self.assertRaises(ValueError) as ec:
+            _PurePath.from_uri('')
+        self.assertEqual(str(ec.exception), 'Empty URI provided!')
+
+        path = _PurePath.from_uri('https://example.com/names/?name=foo')
+        self.assertIsInstance(path, _PosixPurePath)
+        self.assertEqual(str(path), '/names')
+
+        path = _PosixPurePath.from_uri('file:///home/foo/names/?name=foo')
+        self.assertIsInstance(path, _PosixPurePath)
+        self.assertEqual(str(path), '/home/foo/names')
+
+        path = _PosixPurePath.from_uri('file:///home/foo/names#foo')
+        self.assertIsInstance(path, _PosixPurePath)
+        self.assertEqual(str(path), '/home/foo/names')
+
+        path = _PosixPurePath.from_uri('file:///home\\foo\\names#foo')
+        self.assertIsInstance(path, _WindowsPurePath)
+        self.assertTrue(path.as_posix().endswith('/home/foo/names'))
+
+        path = _PosixPurePath.from_uri('file:///c:/home/foo/names/')
+        self.assertIsInstance(path, _WindowsPurePath)
+        self.assertEqual(str(path), r'c:\home\foo\names')
+        self.assertEqual(path.as_uri(), 'file:///c:/home/foo/names')
+
+        path = _PosixPurePath.from_uri('file:c:/home/foo/names/')
+        self.assertIsInstance(path, _WindowsPurePath)
+        self.assertEqual(str(path), r'c:\home\foo\names')
+        self.assertEqual(path.as_uri(), 'file:///c:/home/foo/names')
+
+        with self.assertRaises(ValueError) as ec:
+            _PurePath.from_uri('file://c:/home/foo/names/')
+        self.assertEqual(str(ec.exception), "Invalid URI 'file://c:/home/foo/names/'")
+
+    @unittest.skipIf(platform.system() == 'Windows', "Run only on posix systems")
     def test_normalize_url_posix(self):
         url1 = "https://example.com/xsd/other_schema.xsd"
         self.check_url(normalize_url(url1, base_url="/path_my_schema/schema.xsd"), url1)
@@ -112,19 +157,20 @@
         cwd = os.getcwd()
         cwd_url = 'file://{}/'.format(cwd) if cwd.startswith('/') else 'file:///{}/'.format(cwd)
 
+        self.check_url(normalize_url('other.xsd', keep_relative=True), 'file:other.xsd')
         self.check_url(normalize_url('file:other.xsd', keep_relative=True), 'file:other.xsd')
         self.check_url(normalize_url('file:other.xsd'), cwd_url + 'other.xsd')
-        self.check_url(normalize_url('file:other.xsd', 'http://site/base', True), 'file:other.xsd')
+        self.check_url(normalize_url('file:other.xsd', 'https://site/base', True), 'file:other.xsd')
         self.check_url(normalize_url('file:other.xsd', 'http://site/base'), cwd_url + 'other.xsd')
 
-        self.check_url(normalize_url('dummy path.xsd'), cwd_url + 'dummy path.xsd')
+        self.check_url(normalize_url('dummy path.xsd'), cwd_url + 'dummy%20path.xsd')
         self.check_url(normalize_url('dummy path.xsd', 'http://site/base'),
                        'http://site/base/dummy%20path.xsd')
         self.check_url(normalize_url('dummy path.xsd', 'file://host/home/'),
-                       'file://host/home/dummy path.xsd')
+                       PurePath('//host/home/dummy path.xsd').as_uri())
 
-        url = "file://c:/Downloads/file.xsd"
-        self.check_url(normalize_url(url, base_url="file://d:/Temp/"), url)
+        url = "file:///c:/Downloads/file.xsd"
+        self.check_url(normalize_url(url, base_url="file:///d:/Temp/"), url)
 
     def test_normalize_url_windows(self):
         win_abs_path1 = 'z:\\Dir_1_0\\Dir2-0\\schemas/XSD_1.0/XMLSchema.xsd'
@@ -132,90 +178,217 @@
         self.check_url(normalize_url(win_abs_path1), win_abs_path1)
 
         self.check_url(normalize_url('k:\\Dir3\\schema.xsd', win_abs_path1),
-                       'file:///k:\\Dir3\\schema.xsd')
+                       'file:///k:/Dir3/schema.xsd')
         self.check_url(normalize_url('k:\\Dir3\\schema.xsd', win_abs_path2),
-                       'file:///k:\\Dir3\\schema.xsd')
+                       'file:///k:/Dir3/schema.xsd')
+
         self.check_url(normalize_url('schema.xsd', win_abs_path2),
-                       'file:///z:\\Dir-1.0\\Dir-2_0/schema.xsd')
+                       'file:///z:/Dir-1.0/Dir-2_0/schema.xsd')
         self.check_url(normalize_url('xsd1.0/schema.xsd', win_abs_path2),
-                       'file:///z:\\Dir-1.0\\Dir-2_0/xsd1.0/schema.xsd')
-        self.check_url(normalize_url('file:///\\k:\\Dir A\\schema.xsd'),
-                       'file:///k:\\Dir A\\schema.xsd')
+                       'file:///z:/Dir-1.0/Dir-2_0/xsd1.0/schema.xsd')
+
+        with self.assertRaises(ValueError) as ec:
+            normalize_url('file:///\\k:\\Dir A\\schema.xsd')
+        self.assertIn("Invalid URI", str(ec.exception))
+
+    def test_normalize_url_unc_paths__issue_246(self):
+        url = PureWindowsPath(r'\\host\share\file.xsd').as_uri()
+        self.assertNotEqual(normalize_url(r'\\host\share\file.xsd'), url)  # file://host/share/file.xsd
+        self.assertEqual(normalize_url(r'\\host\share\file.xsd'), url.replace('file://', 'file:////'))
+
+    def test_normalize_url_unc_paths__issue_268(self,):
+        unc_path = r'\\filer01\MY_HOME\dev\XMLSCHEMA\test.xsd'
+        url = PureWindowsPath(unc_path).as_uri()
+        self.assertEqual(str(PureWindowsPath(unc_path)), unc_path)
+        self.assertEqual(url, 'file://filer01/MY_HOME/dev/XMLSCHEMA/test.xsd')
+
+        # Same UNC path as URI with the host inserted in path path.
+        url_host_in_path = url.replace('file://', 'file:////')
+        self.assertEqual(url_host_in_path, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd')
+
+        self.assertEqual(normalize_url(unc_path), url_host_in_path)
+
+        with patch.object(os, 'name', 'nt'):
+            self.assertEqual(os.name, 'nt')
+            path = PurePath(unc_path)
+            self.assertIs(path.__class__, PureWindowsPath)
+            self.assertEqual(path.as_uri(), url)
+
+            self.assertEqual(xmlschema.resources.os.name, 'nt')
+            path = xmlschema.resources._PurePath(unc_path)
+            self.assertIs(path.__class__, xmlschema.resources._PureWindowsPath)
+            self.assertEqual(path.as_uri(), url_host_in_path)
+            self.assertEqual(normalize_url(unc_path), url_host_in_path)
+
+        with patch.object(os, 'name', 'posix'):
+            self.assertEqual(os.name, 'posix')
+            path = PurePath(unc_path)
+            self.assertIs(path.__class__, PurePosixPath)
+            self.assertEqual(str(path), unc_path)
+            self.assertRaises(ValueError, path.as_uri)  # Not recognized as UNC path
+
+            self.assertEqual(xmlschema.resources.os.name, 'posix')
+            path = xmlschema.resources._PurePath(unc_path)
+            self.assertIs(path.__class__, xmlschema.resources._PurePosixPath)
+            self.assertEqual(str(path), unc_path)
+            self.assertNotEqual(path.as_uri(), url)
+            self.assertEqual(normalize_url(unc_path), url_host_in_path)
+
+    def test_normalize_url_with_base_unc_path(self,):
+        base_unc_path = '\\\\filer01\\MY_HOME\\'
+        base_url = PureWindowsPath(base_unc_path).as_uri()
+        self.assertEqual(str(PureWindowsPath(base_unc_path)), base_unc_path)
+        self.assertEqual(base_url, 'file://filer01/MY_HOME/')
+
+        # Same UNC path as URI with the host inserted in path path.
+        base_url_host_in_path = base_url.replace('file://', 'file:////')
+        self.assertEqual(base_url_host_in_path, 'file:////filer01/MY_HOME/')
+
+        self.assertEqual(normalize_url(base_unc_path), base_url_host_in_path)
+
+        with patch.object(os, 'name', 'nt'):
+            self.assertEqual(os.name, 'nt')
+            path = PurePath('dir/file')
+            self.assertIs(path.__class__, PureWindowsPath)
+
+            url = normalize_url(r'dev\XMLSCHEMA\test.xsd', base_url=base_unc_path)
+            self.assertEqual(url, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd')
+
+            url = normalize_url(r'dev\XMLSCHEMA\test.xsd', base_url=base_url)
+            self.assertEqual(url, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd')

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_schemas.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_schemas.py Changed

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_typing.py Added

@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+#
+# Copyright (c), 2018-2020, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+"""Tests about static typing of xmlschema objects."""
+
+import unittest
+import subprocess
+import re
+from pathlib import Path
+
+try:
+    import mypy
+except ImportError:
+    mypy = None
+
+
+@unittest.skipIf(mypy is None, "mypy is not installed")
+class TestTyping(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.cases_dir = Path(__file__).parent.joinpath('test_cases/mypy')
+        cls.config_file = Path(__file__).parent.parent.joinpath('mypy.ini')
+        cls.error_pattern = re.compile(r'Found \d+ error', re.IGNORECASE)
+
+    def check_mypy_output(self, testfile, *options):
+        cmd = 'mypy', '--config-file', str(self.config_file), testfile
+        if options:
+            cmd.extend(str(opt) for opt in options)
+        process = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        self.assertEqual(process.stderr, b'')
+        output = process.stdout.decode('utf-8').strip()
+        output_lines = output.split('\n')
+
+        self.assertGreater(len(output_lines), 0, msg=output)
+        self.assertNotRegex(output_lines-1, self.error_pattern, msg=output)
+        return output_lines
+
+    def test_simple_types(self):
+        case_path = self.cases_dir.joinpath('simple_types.py')
+        output_lines = self.check_mypy_output(case_path, '--strict', '--no-warn-unused-ignores')
+        self.assertTrue(output_lines0.startswith('Success:'), msg='\n'.join(output_lines))
+
+
+if __name__ == '__main__':
+    unittest.main()

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_validation.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_validation.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/test_wsdl.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/test_wsdl.py Changed

@@ -11,7 +11,7 @@
 """Tests concerning WSDL documents. Examples from WSDL 1.1 definition document."""
 
 import unittest
-import os
+import pathlib
 
 from xmlschema import XMLSchemaValidationError, XMLSchema10, XMLSchema11
 from xmlschema.etree import ElementTree, ParseError
@@ -20,11 +20,11 @@
     WsdlInput, SoapHeader
 
 
-TEST_CASES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_cases/')
+TEST_CASES_DIR = str(pathlib.Path(__file__).absolute().parent.joinpath('test_cases'))
 
 
 def casepath(relative_path):
-    return os.path.join(TEST_CASES_DIR, relative_path)
+    return str(pathlib.Path(TEST_CASES_DIR).joinpath(relative_path))
 
 
 WSDL_DOCUMENT_EXAMPLE = """<?xml version="1.0"?>
@@ -895,6 +895,22 @@
             WsdlBinding(elem, wsdl_document)
         self.assertIn("missing fault 'exception'", str(ctx.exception))
 
+    def test_loading_from_unrelated_dirs__issue_237(self):
+        relpath = str(pathlib.Path(__file__).parent.joinpath(
+            'test_cases/issues/issue_237/dir1/stockquoteservice.wsdl'
+        ))
+        wsdl_document = Wsdl11Document(relpath)
+        self.assertIn('http://example.com/stockquote/schemas', wsdl_document.imports)
+        self.assertEqual(
+            wsdl_document.imports'http://example.com/stockquote/schemas'.name,
+            'stockquote.xsd'
+        )
+        self.assertIn('http://example.com/stockquote/definitions', wsdl_document.imports)
+        self.assertEqual(
+            wsdl_document.imports'http://example.com/stockquote/definitions'.name,
+            'stockquote.wsdl'
+        )
+
 
 if __name__ == '__main__':
     import platform

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validation/test_decoding.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validation/test_decoding.py Changed

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 #
 # Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
@@ -10,7 +11,9 @@
 #
 import unittest
 import os
+import json
 from decimal import Decimal
+from collections.abc import MutableMapping, MutableSequence, Set
 import base64
 
 try:
@@ -23,10 +26,11 @@
 from xmlschema import XMLSchemaValidationError, ParkerConverter, BadgerFishConverter, \
     AbderaConverter, JsonMLConverter, ColumnarConverter
 
+from xmlschema.names import XSD_STRING
 from xmlschema.etree import ElementTree
 from xmlschema.converters import UnorderedConverter
 from xmlschema.validators import XMLSchema11
-from xmlschema.testing import XsdValidatorTestCase
+from xmlschema.testing import XsdValidatorTestCase, etree_elements_assert_equal
 
 VEHICLES_DICT = {
     '@xmlns:vh': 'http://example.com/vehicles',
@@ -326,6 +330,17 @@
 }
 
 
+def iter_nested_iterables(obj):
+    if not isinstance(obj, (MutableMapping, MutableSequence, Set, tuple)):
+        yield obj
+    else:
+        for item in obj.values() if isinstance(obj, MutableMapping) else obj:
+            if not isinstance(item, (MutableMapping, MutableSequence, Set, tuple)):
+                yield item
+            else:
+                yield from iter_nested_iterables(item)
+
+
 class TestDecoding(XsdValidatorTestCase):
     TEST_CASES_DIR = os.path.join(os.path.dirname(__file__), '../test_cases')
 
@@ -394,7 +409,7 @@
 
     def test_date_decoding(self):
         # Issue #136
-        schema = xmlschema.XMLSchema("""<?xml version="1.0" encoding="utf-8"?>
+        schema = self.schema_class("""<?xml version="1.0" encoding="utf-8"?>
             <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
                 <xs:element name="Date">
                     <xs:simpleType>
@@ -569,9 +584,51 @@
         xd = self.vh_schema.to_dict(xt, '/vh:vehicles/vh:bikes', namespaces=self.vh_namespaces)
         self.assertEqual(xd'vh:bike', VEHICLES_DICT'vh:bikes''vh:bike')
 
+    def test_max_depth_argument(self):
+        schema = self.schema_class(self.col_xsd_file)
+        self.assertEqual(
+            schema.decode(self.col_xml_file, max_depth=1),
+            {'@xmlns:col': 'http://example.com/ns/collection',
+             '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+             '@xsi:schemaLocation': 'http://example.com/ns/collection collection.xsd'})
+
+        xmlschema.limits.MAX_XML_DEPTH = 1
+        with self.assertRaises(XMLSchemaValidationError):
+            schema.decode(self.col_xml_file)
+        xmlschema.limits.MAX_XML_DEPTH = 9999
+
+        self.assertEqual(
+            schema.decode(self.col_xml_file, max_depth=2),
+            {'@xmlns:col': 'http://example.com/ns/collection',
+             '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+             '@xsi:schemaLocation': 'http://example.com/ns/collection collection.xsd',
+             'object': {'@id': 'b0836217462', '@available': True},
+                        {'@id': 'b0836217463', '@available': True}})
+
+    def test_value_hook_argument(self):
+        schema = self.schema_class(self.col_xsd_file)
+
+        def ascii_strings(value, xsd_type):
+            try:
+                if not isinstance(value, str) or \
+                        xsd_type.primitive_type.name != XSD_STRING:
+                    return value
+            except AttributeError:
+                return value
+            else:
+                return value.encode('utf-8')
+
+        obj = schema.decode(self.col_xml_file, value_hook=ascii_strings)
+        self.assertNotEqual(obj, schema.decode(self.col_xml_file))
+        root = schema.encode(obj)
+        self.assertIsNone(etree_elements_assert_equal(
+            root, ElementTree.parse(self.col_xml_file).getroot(), strict=False
+        ))
+        self.assertEqual(obj'object'0'title', b'The Umbrellas')
+
     def test_non_global_schema_path(self):
         # Issue #157
-        xs = xmlschema.XMLSchema("""<?xml version="1.0" encoding="UTF-8"?>
+        xs = self.schema_class("""<?xml version="1.0" encoding="UTF-8"?>
         <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
                 xmlns:foo="http://example.com/foo" 
                 targetNamespace="http://example.com/foo">
@@ -635,6 +692,11 @@
         self.assertEqual(xs.decode('<dt>2001-04-15</dt>', datetime_types=True),
                          datatypes.Date10.fromstring('2001-04-15'))
 
+        xs = self.get_schema('<xs:attribute name="dt" type="xs:date"/>')
+        self.assertEqual(xs.attributes'dt'.decode('2001-04-15'), '2001-04-15')
+        self.assertEqual(xs.attributes'dt'.decode('2001-04-15', datetime_types=True),
+                         datatypes.Date10.fromstring('2001-04-15'))
+
     def test_duration_type(self):
         xs = self.get_schema('<xs:element name="td" type="xs:duration"/>')
         self.assertEqual(xs.decode('<td>P5Y3MT60H30.001S</td>'), 'P5Y3MT60H30.001S')
@@ -703,22 +765,66 @@
         xsd_string = self.casepath('issues/issue_022/xsd_string.xsd')
         xml_string_1 = self.casepath('issues/issue_022/xml_string_1.xml')
         xml_string_2 = self.casepath('issues/issue_022/xml_string_2.xml')
-        xsd_schema = xmlschema.XMLSchema(xsd_string)
+        xsd_schema = self.schema_class(xsd_string)
         xml_data_1 = xsd_schema.to_dict(xml_string_1)
         xml_data_2 = xsd_schema.to_dict(xml_string_2)
         self.assertTrue(isinstance(xml_data_1'bar', type(xml_data_2'bar')),
                         msg="XSD with an array that return a single element from "
                             "xml must still yield a list.")
 
-    def test_any_type(self):
-        any_type = xmlschema.XMLSchema.meta_schema.types'anyType'
+    def test_any_type_decoding(self):
+        any_type = self.schema_class.meta_schema.types'anyType'
         xml_data_1 = ElementTree.Element('dummy')
         self.assertIsNone(any_type.decode(xml_data_1))
         xml_data_2 = ElementTree.fromstring('<root>\n    <child_1/>\n    <child_2/>\n</root>')
-        self.assertIsNone(any_type.decode(xml_data_2))  # Currently no decoding yet
+
+        # Fix for processContents='lax' (issue 273, previously result was None)
+        self.assertEqual(any_type.decode(xml_data_2), {'child_1': None, 'child_2': None})
+
+    def test_skip_wildcard_decoding(self):
+        schema = self.schema_class("""<?xml version="1.0" encoding="UTF-8"?>
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:element name="foo">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:any processContents="skip"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:schema>""")
+
+        self.assertIsNone(schema.decode('<foo><bar/></foo>'))
+
+        obj = schema.decode('<foo><bar/></foo>', process_skipped=True)
+        self.assertEqual(obj, {'bar': None})
+
+        root = schema.encode(obj)
+        self.assertEqual(root.tag, 'foo')
+        self.assertEqual(len(root), 0)
+
+        root = schema.encode(obj, process_skipped=True)
+        self.assertEqual(root.tag, 'foo')
+        self.assertEqual(len(root), 1)
+        self.assertEqual(root0.tag, 'bar')
+
+    def test_any_type_decoding__issue_273(self):
+        schema = self.schema_class(self.casepath('issues/issue_273/issue_273.xsd'))
+        data = schema.to_dict(self.casepath('issues/issue_273/issue_273.xml'))
+
+        self.assertDictEqual(data, {
+            '@x': 'QA01_sequence',
+            '@y': 2500,
+            'QA01': 
+                {'qa01_elem01': '13',
+                 'qa01_elem02': '5139',
+                 'qa01_elem03': '170',
+                 'qa01_elem04': {'@these': 'attributes', '@get': 'dropped', '$': '0'},
+                 'qa01_elem05': '56',
+                 'qa01_elem06': '11141178'
+                 }})
 
     def test_choice_model_decoding__issue_041(self):
-        schema = xmlschema.XMLSchema(self.casepath('issues/issue_041/issue_041.xsd'))
+        schema = self.schema_class(self.casepath('issues/issue_041/issue_041.xsd'))
         data = schema.to_dict(self.casepath('issues/issue_041/issue_041.xml'))
         self.assertEqual(data, {
             '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
@@ -728,7 +834,7 @@
         })
 
     def test_cdata_decoding(self):
-        schema = xmlschema.XMLSchema(self.casepath('issues/issue_046/issue_046.xsd'))
+        schema = self.schema_class(self.casepath('issues/issue_046/issue_046.xsd'))
         xml_file = self.casepath('issues/issue_046/issue_046.xml')
         self.assertEqual(

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validation/test_encoding.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validation/test_encoding.py Changed

@@ -13,12 +13,18 @@
 import unittest
 from textwrap import dedent
 
+try:
+    import lxml.etree as lxml_etree
+except ImportError:
+    lxml_etree = None
+
 from elementpath import datatypes
 
 from xmlschema import XMLSchemaEncodeError, XMLSchemaValidationError
 from xmlschema.converters import UnorderedConverter
 from xmlschema.etree import etree_element, etree_tostring, ElementTree
 from xmlschema.helpers import local_name, is_etree_element
+from xmlschema.resources import XMLResource
 from xmlschema.validators.exceptions import XMLSchemaChildrenValidationError
 from xmlschema.validators import XMLSchema11
 from xmlschema.testing import XsdValidatorTestCase
@@ -305,8 +311,10 @@
         message_lines = 
         try:
             schema.encode(rotation_data)
-        except Exception as err:
+        except XMLSchemaValidationError as err:
             message_lines = str(err).split('\n')
+            self.assertIsNone(err.source)
+            self.assertIsNone(err.path)
 
         self.assertTrue(message_lines, msg="Empty error message!")
         self.assertEqual(message_lines-4, 'Instance:')
@@ -318,6 +326,11 @@
                    'roll="0.0" pitch="0.0" yaw="-1.0" />'
         self.assertEqual(message_lines-2.strip(), text)
 
+        # With 'lax' validation a dummy resource is assigned to source attribute
+        _, errors = schema.encode(rotation_data, validation='lax')
+        self.assertIsInstance(errors0.source, XMLResource)
+        self.assertEqual(errors0.path, '/{http://www.example.org/Rotation/}rotation')
+
     def test_max_occurs_sequence(self):
         # Issue #119
         schema = self.get_schema("""
@@ -568,6 +581,85 @@
         self.assertIsNone(elem.text)
         self.assertEqual(elem.attrib, {'b1': 'false', 'b2': 'false', 'b3': 'false'})
 
+    def test_encode_sub_tree(self):
+        """Test encoding data of a non-root element"""
+        data = {
+            "@id": "PAR",
+            "name": "Pierre-Auguste Renoir",
+            "born": "1841-02-25",
+            "dead": "1919-12-03",
+            "qualification": "painter",
+        }
+        elem = self.col_schema.encode(
+            data,
+            path=".//author",
+            namespaces=self.col_namespaces,
+        )
+        self.assertEqual(
+            etree_tostring(elem),
+            dedent(
+                """\
+                <author id="PAR">
+                    <name>Pierre-Auguste Renoir</name>
+                    <born>1841-02-25</born>
+                    <dead>1919-12-03</dead>
+                    <qualification>painter</qualification>
+                </author>"""
+            )
+        )
+
+    @unittest.skipIf(lxml_etree is None, "The lxml library is not available.")
+    def test_lxml_encode(self):
+        """Test encode with etree_element_class=lxml.etree.Element"""
+        xd = {
+            "@xmlns:col": "http://example.com/ns/collection",
+            "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
+            "@xsi:schemaLocation": "http://example.com/ns/collection collection.xsd",
+            "object": 
+                {
+                    "@id": "b0836217463",
+                    "@available": True,
+                    "position": 2,
+                    "title": None,
+                    "year": "1925",
+                    "author": {
+                        "@id": "JM",
+                        "name": "Joan Miró",
+                        "born": "1893-04-20",
+                        "dead": "1983-12-25",
+                        "qualification": "painter, sculptor and ceramicist",
+                    },
+                },
+            ,
+        }
+
+        elem = self.col_schema.encode(
+            xd,
+            path="./col:collection",
+            namespaces=self.col_namespaces,
+            etree_element_class=lxml_etree.Element,
+        )
+
+        self.assertEqual(
+            etree_tostring(elem, namespaces=self.col_namespaces),
+            dedent(
+                """\
+                <col:collection xmlns:col="http://example.com/ns/collection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://example.com/ns/collection collection.xsd">
+                    <object id="b0836217463" available="true">
+                        <position>2</position>
+                        <title/>
+                        <year>1925</year>
+                        <author id="JM">
+                            <name>Joan Miró</name>
+                            <born>1893-04-20</born>
+                            <dead>1983-12-25</dead>
+                            <qualification>painter, sculptor and ceramicist</qualification>
+                        </author>
+                    </object>
+                </col:collection>"""
+            )
+        )
+
 
 class TestEncoding11(TestEncoding):
     schema_class = XMLSchema11

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validation/test_validation.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validation/test_validation.py Changed

@@ -113,24 +113,60 @@
 
     def test_max_depth_argument(self):
         schema = self.schema_class(self.col_xsd_file)
-        self.assertEqual(
-            schema.decode(self.col_xml_file, max_depth=1),
-            {'@xmlns:col': 'http://example.com/ns/collection',
-             '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-             '@xsi:schemaLocation': 'http://example.com/ns/collection collection.xsd'})
-
-        xmlschema.limits.MAX_XML_DEPTH = 1
-        with self.assertRaises(XMLSchemaValidationError):
-            schema.decode(self.col_xml_file)
-        xmlschema.limits.MAX_XML_DEPTH = 9999
-
-        self.assertEqual(
-            schema.decode(self.col_xml_file, max_depth=2),
-            {'@xmlns:col': 'http://example.com/ns/collection',
-             '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-             '@xsi:schemaLocation': 'http://example.com/ns/collection collection.xsd',
-             'object': {'@id': 'b0836217462', '@available': True},
-                        {'@id': 'b0836217463', '@available': True}})
+        invalid_col_xml_file = self.casepath('examples/collection/collection-1_error.xml')
+        self.assertFalse(schema.is_valid(invalid_col_xml_file))
+        self.assertTrue(schema.is_valid(invalid_col_xml_file, max_depth=1))
+        self.assertTrue(schema.is_valid(invalid_col_xml_file, max_depth=2))
+        self.assertFalse(schema.is_valid(invalid_col_xml_file, max_depth=3))
+
+        root = ElementTree.parse(invalid_col_xml_file).getroot()
+        xsd_element = schema.elements'collection'
+        self.assertFalse(xsd_element.is_valid(root))
+        self.assertTrue(xsd_element.is_valid(root, max_depth=1))
+        self.assertTrue(xsd_element.is_valid(root, max_depth=2))
+        self.assertFalse(xsd_element.is_valid(root, max_depth=3))
+
+        # Need to provide namespace explicitly because the default namespace
+        # is set with xpathDefaultNamespace, that is '' in this case.
+        xsd_element = schema.find('collection/object', namespaces={'': schema.target_namespace})
+
+        self.assertTrue(xsd_element.is_valid(root0))
+        self.assertFalse(xsd_element.is_valid(root1))
+        self.assertTrue(xsd_element.is_valid(root1, max_depth=1))
+        self.assertFalse(xsd_element.is_valid(root1, max_depth=2))
+
+    def test_extra_validator(self):
+        # Related to issue 227
+
+        def bikes_validator(elem, xsd_element_):
+            if elem.tag == '{http://example.com/vehicles}bike' and \
+                    xsd_element_.name == elem.tag and \
+                    elem.attrib'make' != 'Harley-Davidson':
+                raise XMLSchemaValidationError(xsd_element_, elem, 'not an Harley-Davidson')
+
+        with self.assertRaises(XMLSchemaValidationError) as ec:
+            self.vh_schema.validate(self.vh_xml_file, extra_validator=bikes_validator)
+        self.assertIn('Reason: not an Harley-Davidson', str(ec.exception))
+
+        root = ElementTree.parse(self.vh_xml_file).getroot()
+        xsd_element = self.vh_schema.elements'vehicles'
+        with self.assertRaises(XMLSchemaValidationError) as ec:
+            xsd_element.validate(root, extra_validator=bikes_validator)
+        self.assertIn('Reason: not an Harley-Davidson', str(ec.exception))
+
+        with self.assertRaises(XMLSchemaValidationError) as ec:
+            self.vh_schema.decode(self.vh_xml_file, extra_validator=bikes_validator)
+        self.assertIn('Reason: not an Harley-Davidson', str(ec.exception))
+
+        def bikes_validator(elem, xsd_element_):
+            if elem.tag == '{http://example.com/vehicles}bike' and \
+                    xsd_element_.name == elem.tag and \
+                    elem.attrib'make' != 'Harley-Davidson':
+                yield XMLSchemaValidationError(xsd_element_, elem, 'not an Harley-Davidson')
+
+        with self.assertRaises(XMLSchemaValidationError) as ec:
+            self.vh_schema.validate(self.vh_xml_file, extra_validator=bikes_validator)
+        self.assertIn('Reason: not an Harley-Davidson', str(ec.exception))
 
     def test_issue_064(self):
         self.check_validity(self.st_schema, '<name xmlns="ns"></name>', False)
@@ -240,6 +276,21 @@
         with self.assertRaises(ElementTree.ParseError):
             schema.is_valid(malformed_xml_file)
 
+    def test_issue_238__validate_bytes_strings(self):
+        schema = xmlschema.XMLSchema(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+              <xs:element name="value" type="xs:int"/>
+            </xs:schema>"""))
+
+        self.assertTrue(schema.is_valid('<value>11</value>'))
+        self.assertTrue(schema.is_valid(b'<value>\n11\n</value>'))
+
+        with open(self.col_xml_file, 'rb') as fp:
+            col_xml_data = fp.read()
+
+        self.assertIsInstance(col_xml_data, bytes)
+        self.assertTrue(self.col_schema.is_valid(col_xml_data))
+
 
 class TestValidation11(TestValidation):
     schema_class = XMLSchema11

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_attributes.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_attributes.py Changed

@@ -9,9 +9,10 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 import unittest
+from textwrap import dedent
 
 from xmlschema import XMLSchemaParseError, XMLSchemaValidationError
-from xmlschema.validators import XMLSchema11, XsdAttribute
+from xmlschema.validators import XMLSchema11, XsdAttribute, XsdAttributeGroup
 from xmlschema.testing import XsdValidatorTestCase
 from xmlschema.names import XSI_NAMESPACE, XSD_ANY_SIMPLE_TYPE, XSD_STRING
 
@@ -104,8 +105,10 @@
             </xs:attributeGroup>
             <xs:attribute name="phone" type="xs:string" default="555-0100"/>
         </xs:schema>""")
-        self.assertTrue(schema.attribute_groups'contact''phone'.qualified)
-        self.assertEqual(schema.attribute_groups'contact''phone'.default, '555-0100')
+
+        xsd_attribute = schema.attribute_groups'contact''phone'
+        self.assertTrue(xsd_attribute.qualified)
+        self.assertEqual(xsd_attribute.default, '555-0100')
 
         schema = self.check_schema("""
         <xs:attributeGroup name="extra">
@@ -113,8 +116,10 @@
         </xs:attributeGroup>
         <xs:attribute name="phone" type="xs:string" fixed="555-0100"/>
         """)
-        self.assertEqual(schema.attribute_groups'extra''phone'.fixed, '555-0100')
-        self.assertIsNone(schema.attribute_groups'extra''phone'.annotation)
+
+        xsd_attribute = schema.attribute_groups'extra''phone'
+        self.assertEqual(xsd_attribute.fixed, '555-0100')
+        self.assertIsNone(xsd_attribute.annotation)
 
         schema = self.check_schema("""
         <xs:attributeGroup name="extra">
@@ -124,8 +129,10 @@
         </xs:attributeGroup>
         <xs:attribute name="phone" type="xs:string" fixed="555-0100"/>
         """)
-        self.assertEqual(schema.attribute_groups'extra''phone'.fixed, '555-0100')
-        self.assertIsNotNone(schema.attribute_groups'extra''phone'.annotation)
+
+        xsd_attribute = schema.attribute_groups'extra''phone'
+        self.assertEqual(xsd_attribute.fixed, '555-0100')
+        self.assertIsNotNone(xsd_attribute.annotation)
 
         self.check_schema("""
         <xs:attributeGroup name="extra">
@@ -295,6 +302,63 @@
             self.assertEqual(ctx.exception.message,
                              "xs:ID key attributes cannot have a fixed value")
 
+    def test_attribute_group_mapping(self):
+        schema = self.get_schema("""
+            <xs:attributeGroup name="attrs">
+                <xs:attribute name="a1" type="xs:string"/>
+                <xs:attribute name="a2" type="xs:string"/>
+            </xs:attributeGroup>""")
+
+        attribute_group = schema.attribute_groups'attrs'
+        self.assertEqual(repr(attribute_group), "XsdAttributeGroup(name='attrs')")
+
+        with self.assertRaises(ValueError) as ec:
+            attribute_group'a3' = attribute_group'a2'
+        self.assertEqual("'a2' name and key 'a3' mismatch", str(ec.exception))
+
+        xsd_attribute = attribute_group'a2'
+        del attribute_group'a2'
+        self.assertNotIn('a2', attribute_group)
+        attribute_group'a2' = xsd_attribute
+
+    def test_attribute_group_reference(self):
+        schema = self.get_schema("""
+            <xs:attributeGroup name="alpha">
+                <xs:attribute name="name" type="xs:string"/>
+                <xs:attributeGroup ref="beta"/>
+            </xs:attributeGroup>
+            <xs:attributeGroup name="beta">
+                <xs:attribute name="foo" type="xs:string"/>
+                <xs:attribute name="bar" type="xs:string"/>
+            </xs:attributeGroup>""")
+
+        # ref="beta" does not imply a reference but only a copy
+        # of the attributes of referred attribute group.
+        attribute_group = schema.attribute_groups'alpha'
+        self.assertNotIn('beta', attribute_group)
+        self.assertEqual(len(attribute_group), 3)
+        self.assertIn('name', attribute_group)
+        self.assertIn('foo', attribute_group)
+        self.assertIn('bar', attribute_group)
+
+    def test_missing_attribute_group_name(self):
+        schema = self.get_schema("""
+            <xs:attributeGroup>
+                <xs:annotation/>
+                <xs:attribute name="a1" type="xs:string"/>
+                <xs:attribute name="a2" type="xs:string"/>
+            </xs:attributeGroup>""", validation='lax')
+
+        self.assertEqual(len(schema.all_errors), 2)
+        self.assertTrue(isinstance(schema.all_errors0, XMLSchemaParseError))
+        self.assertIn("missing required attribute 'name'", str(schema.all_errors0))
+        self.assertTrue(isinstance(schema.all_errors1, XMLSchemaParseError))
+        self.assertIn("missing key field '@name'", str(schema.all_errors1))
+
+        self.assertEqual(len(schema.attribute_groups), 0)
+        attribute_group = XsdAttributeGroup(schema.root0, schema, parent=None)
+        self.assertIsNone(attribute_group.name)
+
     def test_missing_attribute_group_reference(self):
         self.check_schema("""
         <xs:attributeGroup name="alpha">
@@ -303,7 +367,18 @@
         </xs:attributeGroup>
         """, XMLSchemaParseError)
 
-        schema = self.check_schema("""
+        self.check_schema("""
+        <xs:attributeGroup name="alpha">
+            <xs:attribute name="name" type="xs:string"/>
+            <xs:attributeGroup ref="x:beta"/>  
+        </xs:attributeGroup>
+        <xs:attributeGroup name="beta">
+            <xs:attribute name="foo" type="xs:string"/>
+            <xs:attribute name="bar" type="xs:string"/>
+        </xs:attributeGroup>
+        """, XMLSchemaParseError)
+
+        schema = self.get_schema("""
             <xs:attributeGroup name="alpha">
                 <xs:attribute name="name" type="xs:string"/>
                 <xs:attributeGroup name="beta"/>  
@@ -311,6 +386,61 @@
             """, validation='lax')
         self.assertTrue(isinstance(schema.all_errors1, XMLSchemaParseError))
 
+    def test_attribute_wildcards(self):
+        schema = self.get_schema("""
+            <xs:attributeGroup name="attrs">
+                <xs:attribute name="a1" type="xs:string"/>
+                <xs:attribute name="a2" type="xs:string"/>
+                <xs:anyAttribute namespace="other"/>
+            </xs:attributeGroup>""")
+
+        attribute_group = schema.attribute_groups'attrs'
+        self.assertEqual(len(attribute_group), 3)
+        self.assertIn(None, attribute_group)
+
+        schema = self.get_schema("""
+            <xs:attributeGroup name="attrs">
+                <xs:attribute name="a1" type="xs:string"/>
+                <xs:attribute name="a2" type="xs:string"/>
+                <xs:anyAttribute namespace="other"/>
+                <xs:anyAttribute namespace="#all"/>
+                <xs:attribute name="a3" type="xs:string"/>
+            </xs:attributeGroup>""", validation='lax')
+
+        self.assertEqual(len(schema.all_errors), 3)
+        self.assertTrue(isinstance(schema.all_errors0, XMLSchemaParseError))
+        self.assertIn("Unexpected child with tag 'xs:anyAttribute'", str(schema.all_errors0))
+        self.assertTrue(isinstance(schema.all_errors1, XMLSchemaParseError))
+        self.assertIn("more anyAttribute declarations", str(schema.all_errors1))
+        self.assertTrue(isinstance(schema.all_errors2, XMLSchemaParseError))
+        self.assertIn("another declaration after anyAttribute", str(schema.all_errors2))
+
+    def test_duplicated_attribute(self):
+        with self.assertRaises(XMLSchemaParseError) as ec:
+            self.get_schema("""
+                <xs:attributeGroup name="attrs">
+                    <xs:attribute name="a1" type="xs:string"/>
+                    <xs:attribute name="a2" type="xs:string"/>
+                    <xs:attribute name="a2" type="xs:string"/>
+                </xs:attributeGroup>""")
+
+        self.assertIn("multiple declaration for attribute 'a2'", str(ec.exception))
+
+    def test_duplicated_attribute_group_ref(self):
+        with self.assertRaises(XMLSchemaParseError) as ec:
+            self.get_schema("""
+                <xs:attributeGroup name="attrs">
+                    <xs:attribute name="a1" type="xs:string"/>
+                    <xs:attributeGroup ref="other"/>
+                    <xs:attributeGroup ref="other"/>
+                </xs:attributeGroup>
+                <xs:attributeGroup name="other">
+                    <xs:attribute name="a2" type="xs:string"/>
+                    <xs:attribute name="a3" type="xs:string"/>
+                </xs:attributeGroup>""")
+
+        self.assertIn("duplicated attributeGroup 'other'", str(ec.exception))
+
     def test_scope_property(self):
         schema = self.check_schema("""
         <xs:attribute name="global_attr" type="xs:string"/>
@@ -402,6 +532,51 @@
 
     schema_class = XMLSchema11

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_complex_types.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_complex_types.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_exceptions.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_exceptions.py Changed

@@ -11,7 +11,11 @@
 import unittest
 import os
 import io
-import lxml.etree
+
+try:
+    import lxml.etree as lxml_etree
+except ImportError:
+    lxml_etree = None
 
 from xmlschema import XMLSchema, XMLResource
 from xmlschema.etree import ElementTree
@@ -54,18 +58,23 @@
         self.assertEqual(error.msg, 'unknown error')
 
         error = XMLSchemaValidatorError(xs, 'unknown error', elem=xs.root)
-        lines = str(error).split('\n')
+        output = str(error)
+        lines = output.split('\n')
+
+        self.assertGreater(len(lines), 10, msg=output)
+        self.assertEqual(lines0, 'unknown error:', msg=output)
+        self.assertEqual(lines2, 'Schema:', msg=output)
+        self.assertRegex(lines4.strip(), '^<(xs:)?schema ', msg=output)
+        self.assertRegex(lines-2.strip(), '</(xs:|xsd:)?schema>$', msg=output)
 
-        self.assertEqual(lines0, 'unknown error:')
-        self.assertEqual(lines2, 'Schema:')
-        self.assertTrue(lines4.strip().startswith('<xs:schema '))
-        self.assertEqual(lines-2.strip(), '</xs:schema>')
+    @unittest.skipIf(lxml_etree is None, 'lxml is not installed ...')
+    def test_exception_repr_lxml(self):
 
         schema = XMLSchema("""
             <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                 <xs:element name="root" type="xs:integer"/>
             </xs:schema>""")
-        root = lxml.etree.XML('<root a="10"/>')
+        root = lxml_etree.XML('<root a="10"/>')
 
         with self.assertRaises(XMLSchemaValidationError) as ctx:
             schema.validate(root)
@@ -114,19 +123,21 @@
         self.assertEqual(ctx.exception.source, resource)
         self.assertEqual(ctx.exception.path, '/root')
 
-    def test_properties(self):
+    @unittest.skipIf(lxml_etree is None, 'lxml is not installed ...')
+    def test_sourceline_property(self):
         schema = XMLSchema("""
             <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                 <xs:element name="root" type="xs:integer"/>
             </xs:schema>""")
 
-        root = lxml.etree.XML('<root a="10"/>')
+        root = lxml_etree.XML('<root a="10"/>')
         with self.assertRaises(XMLSchemaValidationError) as ctx:
             schema.validate(root)
 
         self.assertEqual(ctx.exception.sourceline, 1)
         self.assertEqual(ctx.exception.root, root)
 
+    def test_other_properties(self):
         xsd_file = os.path.join(CASES_DIR, 'examples/vehicles/vehicles.xsd')
         xs = XMLSchema(xsd_file)
 
@@ -211,7 +222,7 @@
             schema.validate('<a><b1/></a>')
 
         lines = str(ctx.exception).split('\n')
-        self.assertTrue(lines2.endswith("Tag b2 expected."))
+        self.assertTrue(lines2.endswith("Tag 'b2' expected."))
 
 
 if __name__ == '__main__':

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_facets.py Added

@@ -0,0 +1,1308 @@
+#!/usr/bin/env python
+#
+# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+import unittest
+import decimal
+import pathlib
+from xml.etree import ElementTree
+from textwrap import dedent
+
+from xmlschema import XMLSchema10, XMLSchema11, XMLSchemaValidationError, \
+    XMLSchemaParseError
+from xmlschema.names import XSD_NAMESPACE, XSD_LENGTH, XSD_MIN_LENGTH, XSD_MAX_LENGTH, \
+    XSD_WHITE_SPACE, XSD_MIN_INCLUSIVE, XSD_MIN_EXCLUSIVE, XSD_MAX_INCLUSIVE, \
+    XSD_MAX_EXCLUSIVE, XSD_TOTAL_DIGITS, XSD_FRACTION_DIGITS, XSD_ENUMERATION, \
+    XSD_PATTERN, XSD_ASSERTION
+
+
+class TestXsdFacets(unittest.TestCase):
+
+    schema_class = XMLSchema10
+
+    @classmethod
+    def setUpClass(cls):
+        cls.st_xsd_file = pathlib.Path(__file__).absolute().parent.parent.joinpath(
+            'test_cases/features/decoder/simple-types.xsd'
+        )
+        cls.st_schema = cls.schema_class(cls.st_xsd_file.as_uri())
+
+    def test_white_space_facet(self):
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:simpleType name="string1">
+                    <xs:restriction base="xs:string">
+                        <xs:whiteSpace value="preserve"/>
+                    </xs:restriction>
+                </xs:simpleType>
+                <xs:simpleType name="string2">
+                    <xs:restriction base="xs:string">
+                        <xs:whiteSpace value="replace"/>
+                    </xs:restriction>
+                </xs:simpleType>
+                <xs:simpleType name="string3">
+                    <xs:restriction base="xs:string">
+                        <xs:whiteSpace value="collapse"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:schema>"""))
+
+        xsd_type = schema.types'string1'
+        self.assertEqual(xsd_type.white_space, 'preserve')
+        white_space_facet = xsd_type.get_facet(XSD_WHITE_SPACE)
+        self.assertIsNone(white_space_facet(' \t alpha\n  beta '))
+
+        xsd_type = schema.types'string2'
+        self.assertEqual(xsd_type.white_space, 'replace')
+        white_space_facet = xsd_type.get_facet(XSD_WHITE_SPACE)
+        self.assertIsNone(white_space_facet('  alpha  beta '))
+
+        with self.assertRaises(XMLSchemaValidationError) as ec:
+            white_space_facet(' \t alpha\n  beta ')
+        self.assertIn('Reason: value contains tabs or newlines', str(ec.exception))
+
+        xsd_type = schema.types'string3'
+        self.assertEqual(xsd_type.white_space, 'collapse')
+        white_space_facet = xsd_type.get_facet(XSD_WHITE_SPACE)
+        self.assertIsNone(white_space_facet('alpha beta'))
+
+        with self.assertRaises(XMLSchemaValidationError) as ec:
+            white_space_facet('  alpha  beta ')
+        self.assertIn('Reason: value contains non collapsed white spaces', str(ec.exception))
+
+        with self.assertRaises(XMLSchemaParseError) as ec:
+            self.schema_class(dedent("""\
+                <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                    <xs:simpleType name="string1">
+                        <xs:restriction base="xs:string">
+                            <xs:whiteSpace value="invalid"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:schema>"""))
+
+        self.assertIn(
+            "value must be one of 'preserve', 'replace', 'collapse'", str(ec.exception)
+        )
+
+    def test_white_space_restriction(self):
+        valid_derivations = 
+            ('preserve', 'preserve'), ('preserve', 'replace'), ('preserve', 'collapse'),
+            ('replace', 'replace'), ('replace', 'collapse'), ('collapse', 'collapse'),
+        
+        for base_value, value in valid_derivations:
+            schema = self.schema_class(dedent(f"""\
+                <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                    <xs:simpleType name="string1">
+                        <xs:restriction base="xs:string">
+                            <xs:whiteSpace value="{base_value}"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                    <xs:simpleType name="string2">
+                        <xs:restriction base="string1">
+                            <xs:whiteSpace value="{value}"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:schema>"""))
+
+            self.assertEqual(schema.types'string1'.white_space, base_value)
+            self.assertEqual(schema.types'string2'.white_space, value)
+
+        invalid_derivations = 
+            ('replace', 'preserve'), ('collapse', 'preserve'), ('collapse', 'replace')
+        
+        for base_value, value in invalid_derivations:
+            with self.assertRaises(XMLSchemaParseError):
+                self.schema_class(dedent(f"""\
+                    <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                        <xs:simpleType name="string1">
+                            <xs:restriction base="xs:string">
+                                <xs:whiteSpace value="{base_value}"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                        <xs:simpleType name="string2">
+                            <xs:restriction base="string1">
+                                <xs:whiteSpace value="{value}"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:schema>"""))
+
+    def test_length_facet(self):
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:simpleType name="username">
+                    <xs:restriction base="xs:NCName">
+                        <xs:length value="8"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:schema>"""))
+
+        length_facet = schema.types'username'.get_facet(XSD_LENGTH)
+        self.assertIsNone(length_facet('a' * 8))
+
+        for value in '', 'a' * 7, 'a' * 9:
+            with self.assertRaises(XMLSchemaValidationError) as ec:
+                length_facet(value)
+            self.assertIn('Reason: length has to be 8', str(ec.exception))
+
+    def test_length_facet_restriction(self):
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:simpleType name="username">
+                    <xs:restriction base="xs:NCName">
+                        <xs:length value="8"/>
+                    </xs:restriction>
+                </xs:simpleType>
+                <xs:simpleType name="username2">
+                    <xs:restriction base="username">
+                        <xs:length value="8"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:schema>"""))
+
+        length_facet = schema.types'username'.get_facet(XSD_LENGTH)
+        self.assertIsNone(length_facet('a' * 8))
+        length_facet2 = schema.types'username2'.get_facet(XSD_LENGTH)
+        self.assertIsNone(length_facet2('a' * 8))
+        self.assertIsNot(length_facet, length_facet2)
+
+        # Not applied on xs:QName: https://www.w3.org/Bugs/Public/show_bug.cgi?id=4009
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:simpleType name="qname1">
+                    <xs:restriction base="xs:QName">
+                        <xs:length value="8"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:schema>"""))
+
+        length_facet = schema.types'qname1'.get_facet(XSD_LENGTH)
+        self.assertIsNone(length_facet('a' * 8))
+        self.assertIsNone(length_facet('a' * 10))
+
+        with self.assertRaises(XMLSchemaParseError) as ec:
+            self.schema_class(dedent("""\
+                <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                    <xs:simpleType name="username">
+                        <xs:restriction base="xs:NCName">
+                            <xs:length value="8"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                    <xs:simpleType name="username2">
+                        <xs:restriction base="username">
+                            <xs:length value="12"/>
+                        </xs:restriction>

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_global_maps.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_global_maps.py Changed

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_groups.py Added

@@ -0,0 +1,347 @@
+#!/usr/bin/env python
+#
+# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+import unittest
+from typing import Any, Union, List, Optional
+
+from xmlschema import XMLSchemaModelError, XMLSchemaModelDepthError
+from xmlschema.exceptions import XMLSchemaValueError
+from xmlschema.validators.particles import ParticleMixin
+from xmlschema.validators.groups import XsdGroup
+
+
+class ModelGroup(XsdGroup):
+    """A subclass for testing XSD models, that disables element parsing and schema bindings."""
+
+    def __init__(self, model: str, min_occurs: int = 1, max_occurs: Optionalint = 1) -> None:
+        ParticleMixin.__init__(self, min_occurs, max_occurs)
+        if model not in {'sequence', 'choice', 'all'}:
+            raise XMLSchemaValueError("invalid model {!r} for a group".format(model))
+        self._group: ListUnionParticleMixin, 'ModelGroup' = 
+        self.model: str = model
+
+    def __repr__(self) -> str:
+        return '%s(model=%r, occurs=%r)' % (self.__class__.__name__, self.model, self.occurs)
+
+    append: Any
+
+
+class TestXsdGroups(unittest.TestCase):
+
+    def test_model_group_init(self):
+        group = ModelGroup('sequence')
+        self.assertEqual(group.model, 'sequence')
+
+        with self.assertRaises(ValueError):
+            ModelGroup('mixed')
+
+    def test_model_group_repr(self):
+        group = ModelGroup('choice')
+        self.assertEqual(repr(group), "ModelGroup(model='choice', occurs=(1, 1))")
+
+    def test_model_group_container(self):
+        # group: ListGroupItemType
+        group = ModelGroup('choice')
+
+        group.append(('a',))
+        self.assertListEqual(group:, ('a',))
+
+        group0 = ('a', 'b')
+        self.assertListEqual(group:, ('a', 'b'))
+
+        group.append(('c',))
+        self.assertListEqual(group:, ('a', 'b'), ('c',))
+
+        del group0
+        self.assertListEqual(group:, ('c',))
+
+    def test_is_empty(self):
+        group = ModelGroup('all')
+        self.assertTrue(group.is_empty())
+        group.append(('A',))
+        self.assertFalse(group.is_empty())
+
+    def test_is_pointless(self):
+        root_group = ModelGroup('choice')
+        group = ModelGroup('sequence')
+        root_group.append(group)
+
+        self.assertTrue(group.is_pointless(parent=root_group))
+        group.append(('A',))
+        self.assertTrue(group.is_pointless(parent=root_group))
+        group.append(('B',))
+        self.assertFalse(group.is_pointless(parent=root_group))
+
+        root_group = ModelGroup('sequence')
+        group = ModelGroup('choice')
+        root_group.append(group)
+
+        self.assertTrue(group.is_pointless(parent=root_group))
+        group.append(('A',))
+        self.assertTrue(group.is_pointless(parent=root_group))
+        group.append(('B',))
+        self.assertFalse(group.is_pointless(parent=root_group))
+
+        root_group = ModelGroup('choice')
+        group = ModelGroup('choice')
+        root_group.append(group)
+
+        self.assertTrue(group.is_pointless(parent=root_group))
+        group.append(('A',))
+        self.assertTrue(group.is_pointless(parent=root_group))
+        group.append(('B',))
+        self.assertTrue(group.is_pointless(parent=root_group))
+
+    def test_effective_min_occurs(self):
+        group = ModelGroup('sequence')
+        self.assertEqual(group.effective_min_occurs, 0)
+        group.append(ParticleMixin())
+        self.assertEqual(group.effective_min_occurs, 1)
+        group.append(ParticleMixin())
+        group0.min_occurs = 0
+        self.assertEqual(group.effective_min_occurs, 1)
+        group.model = 'choice'
+        self.assertEqual(group.effective_min_occurs, 0)
+        group1.min_occurs = 0
+        group.model = 'sequence'
+        self.assertEqual(group.effective_min_occurs, 0)
+        group.model = 'choice'
+        group0.min_occurs = group1.min_occurs = 1
+        self.assertEqual(group.effective_min_occurs, 1)
+
+    def test_effective_max_occurs(self):
+        group = ModelGroup('sequence')
+        self.assertEqual(group.effective_max_occurs, 0)
+        group.append(ParticleMixin())
+        self.assertEqual(group.effective_max_occurs, 1)
+        group.append(ParticleMixin(max_occurs=2))
+        self.assertEqual(group.effective_max_occurs, 1)
+        group0.min_occurs = group0.max_occurs = 0
+        self.assertEqual(group.effective_max_occurs, 2)
+        group1.min_occurs = group1.max_occurs = 0
+        self.assertEqual(group.effective_max_occurs, 0)
+
+        group.append(ParticleMixin())
+        self.assertEqual(group.effective_max_occurs, 1)
+        group2.min_occurs = 0
+        self.assertEqual(group.effective_max_occurs, 1)
+        group0.max_occurs = None
+        self.assertIsNone(group.effective_max_occurs)
+        group2.min_occurs = 1
+
+        group = ModelGroup('choice')
+        group.append(ParticleMixin())
+        self.assertEqual(group.effective_max_occurs, 1)
+        group.append(ParticleMixin())
+        group0.min_occurs = group0.max_occurs = 0
+        self.assertEqual(group.effective_max_occurs, 1)
+        group0.max_occurs = None
+        self.assertIsNone(group.effective_max_occurs)
+
+        group = ModelGroup('sequence')
+        group.append(ParticleMixin())
+        self.assertEqual(group.effective_max_occurs, 1)
+        group0.max_occurs = None
+        self.assertIsNone(group.effective_max_occurs)
+        group0.max_occurs = 1
+        self.assertEqual(group.effective_max_occurs, 1)
+        group.max_occurs = None
+        self.assertIsNone(group.effective_max_occurs)
+
+    def test_has_occurs_restriction(self):
+        group = ModelGroup('sequence')
+        other = ModelGroup('sequence')
+        other.append(ParticleMixin())
+        self.assertTrue(group.has_occurs_restriction(other))
+        group.append(ParticleMixin())
+        self.assertTrue(group.has_occurs_restriction(other))
+
+        for model in 'sequence', 'all', 'choice':
+            group = ModelGroup(model)
+            group.append(ParticleMixin())
+            self.assertTrue(group.has_occurs_restriction(other=ParticleMixin()))
+            self.assertFalse(group.has_occurs_restriction(other=ParticleMixin(2, 2)))
+            self.assertTrue(group.has_occurs_restriction(other=ParticleMixin(1, None)))
+            group.max_occurs = None
+            self.assertFalse(group.has_occurs_restriction(other=ParticleMixin()))
+            self.assertTrue(group.has_occurs_restriction(other=ParticleMixin(1, None)))
+
+    def test_iter_model(self):
+        # Model group with pointless inner groups
+        root_group = group = ModelGroup('sequence')
+        for k in range(3):
+            for _ in range(k + 1):
+                group.append(ParticleMixin())
+            group.append(ModelGroup('sequence'))
+            group = group-1
+
+        particles = e for e in root_group.iter_model()
+        self.assertEqual(len(particles), 6)
+        for e in particles:
+            self.assertIsInstance(e, ParticleMixin)
+            self.assertNotIsInstance(e, ModelGroup)
+
+        # Model group with no-pointless inner groups
+        root_group = group = ModelGroup('sequence')
+        for k in range(3):
+            for _ in range(k + 1):
+                group.append(ParticleMixin())
+            group.append(ModelGroup('sequence', max_occurs=None))
+            group = group-1
+
+        particles = e for e in root_group.iter_model()

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_identities.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_identities.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_models.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_models.py Changed

@@ -12,14 +12,34 @@
 import unittest
 import os.path
 from textwrap import dedent
+from typing import Any, Union, List, Optional
 
 from xmlschema import XMLSchema10, XMLSchema11
-from xmlschema.validators import XsdElement, ModelVisitor, XMLSchemaValidationError
-from xmlschema.validators.particles import ParticleMixin, ModelGroup
-from xmlschema.validators.models import distinguishable_paths
+from xmlschema.exceptions import XMLSchemaValueError
+from xmlschema.validators.exceptions import XMLSchemaValidationError
+from xmlschema.validators.particles import ParticleMixin
+from xmlschema.validators.models import distinguishable_paths, ModelVisitor
+from xmlschema.validators.groups import XsdGroup
+from xmlschema.validators.elements import XsdElement
 from xmlschema.testing import XsdValidatorTestCase
 
 
+class ModelGroup(XsdGroup):
+    """A subclass for testing XSD models, that disables element parsing and schema bindings."""
+
+    def __init__(self, model: str, min_occurs: int = 1, max_occurs: Optionalint = 1) -> None:
+        ParticleMixin.__init__(self, min_occurs, max_occurs)
+        if model not in {'sequence', 'choice', 'all'}:
+            raise XMLSchemaValueError("invalid model {!r} for a group".format(model))
+        self._group: ListUnionParticleMixin, 'ModelGroup' = 
+        self.model: str = model
+
+    def __repr__(self) -> str:
+        return '%s(model=%r, occurs=%r)' % (self.__class__.__name__, self.model, self.occurs)
+
+    append: Any
+
+
 class TestModelValidation(XsdValidatorTestCase):
 
     TEST_CASES_DIR = os.path.join(os.path.dirname(__file__), '../test_cases')

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_particles.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_particles.py Changed

@@ -11,10 +11,9 @@
 import os
 import unittest
 
-from xmlschema import XMLSchema10, XMLSchemaParseError, \
-    XMLSchemaModelError, XMLSchemaModelDepthError
+from xmlschema import XMLSchema10, XMLSchemaParseError
 from xmlschema.etree import ElementTree
-from xmlschema.validators.particles import ParticleMixin, ModelGroup
+from xmlschema.validators.particles import ParticleMixin
 
 CASES_DIR = os.path.join(os.path.dirname(__file__), '../test_cases')
 
@@ -27,8 +26,8 @@
         cls.schema = XMLSchema10(xsd_file)
 
     def test_occurs_property(self):
-        self.assertListEqual(self.schema.elements'cars'.occurs, 1, 1)
-        self.assertListEqual(self.schema.elements'cars'.type.content0.occurs, 0, None)
+        self.assertEqual(self.schema.elements'cars'.occurs, (1, 1))
+        self.assertEqual(self.schema.elements'cars'.type.content0.occurs, (0, None))
 
     def test_effective_min_occurs_property(self):
         self.assertEqual(self.schema.elements'cars'.effective_min_occurs, 1)
@@ -121,6 +120,11 @@
         self.assertTrue(xsd_group9.has_occurs_restriction(xsd_group1))
         self.assertTrue(xsd_group9.has_occurs_restriction(xsd_group2))
 
+    def test_default_parse_error(self):
+        with self.assertRaises(ValueError) as ctx:
+            ParticleMixin().parse_error('unexpected error')
+        self.assertEqual(str(ctx.exception), 'unexpected error')
+
     def test_parse_particle(self):
         schema = XMLSchema10("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                      <xs:element name="root"/>
@@ -166,313 +170,10 @@
                       str(ctx.exception))
 
 
-class TestModelGroup(unittest.TestCase):
-
-    def test_model_group_init(self):
-        group = ModelGroup('sequence')
-        self.assertEqual(group.model, 'sequence')
-
-        with self.assertRaises(ValueError):
-            ModelGroup('mixed')
-
-    def test_model_group_repr(self):
-        group = ModelGroup('choice')
-        self.assertEqual(repr(group), "ModelGroup(model='choice', occurs=1, 1)")
-
-    def test_model_group_container(self):
-        group = ModelGroup('choice')
-
-        group.append(('a',))
-        self.assertListEqual(group:, ('a',))
-
-        group0 = ('a', 'b')
-        self.assertListEqual(group:, ('a', 'b'))
-
-        group.append(('c',))
-        self.assertListEqual(group:, ('a', 'b'), ('c',))
-
-        del group0
-        self.assertListEqual(group:, ('c',))
-
-    def test_is_empty(self):
-        group = ModelGroup('all')
-        self.assertTrue(group.is_empty())
-        group.append(('A',))
-        self.assertFalse(group.is_empty())
-
-    def test_is_pointless(self):
-        root_group = ModelGroup('choice')
-        group = ModelGroup('sequence')
-        root_group.append(group)
-
-        self.assertTrue(group.is_pointless(parent=root_group))
-        group.append(('A',))
-        self.assertTrue(group.is_pointless(parent=root_group))
-        group.append(('B',))
-        self.assertFalse(group.is_pointless(parent=root_group))
-
-        root_group = ModelGroup('sequence')
-        group = ModelGroup('choice')
-        root_group.append(group)
-
-        self.assertTrue(group.is_pointless(parent=root_group))
-        group.append(('A',))
-        self.assertTrue(group.is_pointless(parent=root_group))
-        group.append(('B',))
-        self.assertFalse(group.is_pointless(parent=root_group))
-
-        root_group = ModelGroup('choice')
-        group = ModelGroup('choice')
-        root_group.append(group)
-
-        self.assertTrue(group.is_pointless(parent=root_group))
-        group.append(('A',))
-        self.assertTrue(group.is_pointless(parent=root_group))
-        group.append(('B',))
-        self.assertTrue(group.is_pointless(parent=root_group))
-
-    def test_effective_min_occurs(self):
-        group = ModelGroup('sequence')
-        self.assertEqual(group.effective_min_occurs, 0)
-        group.append(ParticleMixin())
-        self.assertEqual(group.effective_min_occurs, 1)
-        group.append(ParticleMixin())
-        group0.min_occurs = 0
-        self.assertEqual(group.effective_min_occurs, 1)
-        group.model = 'choice'
-        self.assertEqual(group.effective_min_occurs, 0)
-        group1.min_occurs = 0
-        group.model = 'sequence'
-        self.assertEqual(group.effective_min_occurs, 0)
-        group.model = 'choice'
-        group0.min_occurs = group1.min_occurs = 1
-        self.assertEqual(group.effective_min_occurs, 1)
-
-    def test_effective_max_occurs(self):
-        group = ModelGroup('sequence')
-        self.assertEqual(group.effective_max_occurs, 0)
-        group.append(ParticleMixin())
-        self.assertEqual(group.effective_max_occurs, 1)
-        group.append(ParticleMixin(max_occurs=2))
-        self.assertEqual(group.effective_max_occurs, 1)
-        group0.min_occurs = group0.max_occurs = 0
-        self.assertEqual(group.effective_max_occurs, 2)
-        group1.min_occurs = group1.max_occurs = 0
-        self.assertEqual(group.effective_max_occurs, 0)
-
-        group.append(ParticleMixin())
-        self.assertEqual(group.effective_max_occurs, 1)
-        group2.min_occurs = 0
-        self.assertEqual(group.effective_max_occurs, 1)
-        group0.max_occurs = None
-        self.assertIsNone(group.effective_max_occurs)
-        group2.min_occurs = 1
-
-        group = ModelGroup('choice')
-        group.append(ParticleMixin())
-        self.assertEqual(group.effective_max_occurs, 1)
-        group.append(ParticleMixin())
-        group0.min_occurs = group0.max_occurs = 0
-        self.assertEqual(group.effective_max_occurs, 1)
-        group0.max_occurs = None
-        self.assertIsNone(group.effective_max_occurs)
-
-        group = ModelGroup('sequence')
-        group.append(ParticleMixin())
-        self.assertEqual(group.effective_max_occurs, 1)
-        group0.max_occurs = None
-        self.assertIsNone(group.effective_max_occurs)
-        group0.max_occurs = 1
-        self.assertEqual(group.effective_max_occurs, 1)
-        group.max_occurs = None
-        self.assertIsNone(group.effective_max_occurs)
-
-    def test_has_occurs_restriction(self):
-        group = ModelGroup('sequence')
-        other = ModelGroup('sequence')
-        other.append(ParticleMixin())
-        self.assertTrue(group.has_occurs_restriction(other))
-        group.append(ParticleMixin())
-        self.assertTrue(group.has_occurs_restriction(other))
-
-        for model in 'sequence', 'all', 'choice':
-            group = ModelGroup(model)
-            group.append(ParticleMixin())
-            self.assertTrue(group.has_occurs_restriction(other=ParticleMixin()))
-            self.assertFalse(group.has_occurs_restriction(other=ParticleMixin(2, 2)))
-            self.assertTrue(group.has_occurs_restriction(other=ParticleMixin(1, None)))
-            group.max_occurs = None
-            self.assertFalse(group.has_occurs_restriction(other=ParticleMixin()))
-            self.assertTrue(group.has_occurs_restriction(other=ParticleMixin(1, None)))
-
-    def test_iter_model(self):
-        # Model group with pointless inner groups
-        root_group = group = ModelGroup('sequence')
-        for k in range(3):
-            for _ in range(k + 1):
-                group.append(ParticleMixin())
-            group.append(ModelGroup('sequence'))
-            group = group-1
-
-        particles = e for e in root_group.iter_model()
-        self.assertEqual(len(particles), 6)
-        for e in particles:
-            self.assertIsInstance(e, ParticleMixin)
-            self.assertNotIsInstance(e, ModelGroup)
-
-        # Model group with no-pointless inner groups
-        root_group = group = ModelGroup('sequence')
-        for k in range(3):
-            for _ in range(k + 1):
-                group.append(ParticleMixin())
-            group.append(ModelGroup('sequence', max_occurs=None))

_service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_schemas.py Added

@@ -0,0 +1,955 @@
+#!/usr/bin/env python
+#
+# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+import unittest
+import logging
+import tempfile
+import warnings
+import pathlib
+import pickle
+import platform
+import glob
+import os
+import re
+from textwrap import dedent
+
+from xmlschema import XMLSchemaParseError, XMLSchemaIncludeWarning, XMLSchemaImportWarning
+from xmlschema.names import XML_NAMESPACE, LOCATION_HINTS, SCHEMAS_DIR, XSD_ELEMENT, XSI_TYPE
+from xmlschema.etree import etree_element
+from xmlschema.validators import XMLSchemaBase, XMLSchema10, XMLSchema11, \
+    XsdGlobals, Xsd11Attribute
+from xmlschema.testing import SKIP_REMOTE_TESTS, XsdValidatorTestCase
+from xmlschema.validators.schemas import logger
+
+
+class CustomXMLSchema(XMLSchema10):
+    pass
+
+
+class TestXMLSchema10(XsdValidatorTestCase):
+    TEST_CASES_DIR = os.path.join(os.path.dirname(__file__), '../test_cases')
+    maxDiff = None
+
+    class CustomXMLSchema(XMLSchema10):
+        pass
+
+    def test_schema_validation(self):
+        schema = self.schema_class(self.vh_xsd_file)
+        self.assertEqual(schema.validation, 'strict')
+
+        schema = self.schema_class(self.vh_xsd_file, validation='lax')
+        self.assertEqual(schema.validation, 'lax')
+
+        schema = self.schema_class(self.vh_xsd_file, validation='skip')
+        self.assertEqual(schema.validation, 'skip')
+
+        with self.assertRaises(ValueError):
+            self.schema_class(self.vh_xsd_file, validation='none')
+
+    def test_schema_string_repr(self):
+        schema = self.schema_class(self.vh_xsd_file)
+        tmpl = "%s(name='vehicles.xsd', namespace='http://example.com/vehicles')"
+        self.assertEqual(str(schema), tmpl % self.schema_class.__name__)
+
+    def test_schema_copy(self):
+        schema = self.vh_schema.copy()
+        self.assertNotEqual(id(self.vh_schema), id(schema))
+        self.assertNotEqual(id(self.vh_schema.namespaces), id(schema.namespaces))
+        self.assertNotEqual(id(self.vh_schema.maps), id(schema.maps))
+
+    def test_schema_location_hints(self):
+        with warnings.catch_warnings(record=True):
+            warnings.simplefilter("always")
+            schema = self.schema_class(dedent("""\
+                <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://xmlschema.test/ns schema.xsd">
+                  <xs:element name="root" />
+                </xs:schema>"""))
+
+        self.assertEqual(schema.schema_location, ("http://xmlschema.test/ns", "schema.xsd"))
+        self.assertIsNone(schema.no_namespace_schema_location)
+
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:noNamespaceSchemaLocation="schema.xsd">
+              <xs:element name="root" />
+            </xs:schema>"""))
+
+        self.assertEqual(schema.schema_location, )
+        self.assertEqual(schema.no_namespace_schema_location, 'schema.xsd')
+
+    def test_target_prefix(self):
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                targetNamespace="http://xmlschema.test/ns">
+              <xs:element name="root" />
+            </xs:schema>"""))
+
+        self.assertEqual(schema.target_prefix, '')
+
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:tns="http://xmlschema.test/ns"
+                targetNamespace="http://xmlschema.test/ns">
+              <xs:element name="root" />
+            </xs:schema>"""))
+
+        self.assertEqual(schema.target_prefix, 'tns')
+
+    def test_builtin_types(self):
+        self.assertIn('string', self.schema_class.builtin_types())
+
+        with self.assertRaises(RuntimeError):
+            self.schema_class.meta_schema.builtin_types()
+
+    def test_resolve_qname(self):
+        schema = self.schema_class(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">    
+              <xs:element name="root" />
+            </xs:schema>"""))
+
+        self.assertEqual(schema.resolve_qname('xs:element'), XSD_ELEMENT)
+        self.assertEqual(schema.resolve_qname('xsi:type'), XSI_TYPE)
+
+        self.assertEqual(schema.resolve_qname(XSI_TYPE), XSI_TYPE)
+        self.assertEqual(schema.resolve_qname('element'), 'element')
+        self.assertRaises(ValueError, schema.resolve_qname, '')
+        self.assertRaises(ValueError, schema.resolve_qname, 'xsi:a type ')
+        self.assertRaises(ValueError, schema.resolve_qname, 'xml::lang')
+
+    def test_global_group_definitions(self):
+        schema = self.check_schema("""
+            <xs:group name="wrong_child">
+              <xs:element name="foo"/>
+            </xs:group>""", validation='lax')
+        self.assertEqual(len(schema.errors), 1)
+
+        self.check_schema('<xs:group name="empty" />', XMLSchemaParseError)
+        self.check_schema('<xs:group name="empty"><xs:annotation/></xs:group>', XMLSchemaParseError)
+
+    def test_wrong_includes_and_imports(self):
+
+        with warnings.catch_warnings(record=True) as context:
+            warnings.simplefilter("always")
+            self.check_schema("""
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="ns">
+                <xs:include schemaLocation="example.xsd" />
+                <xs:import schemaLocation="example.xsd" />
+                <xs:redefine schemaLocation="example.xsd"/>
+                <xs:import namespace="http://missing.example.test/" />
+                <xs:import/>
+            </xs:schema>
+            """)
+            self.assertEqual(len(context), 3, "Wrong number of include/import warnings")
+            self.assertEqual(context0.category, XMLSchemaIncludeWarning)
+            self.assertEqual(context1.category, XMLSchemaIncludeWarning)
+            self.assertEqual(context2.category, XMLSchemaImportWarning)
+            self.assertTrue(str(context0.message).startswith("Include"))
+            self.assertTrue(str(context1.message).startswith("Redefine"))
+            self.assertTrue(str(context2.message).startswith("Import of namespace"))
+
+    def test_wrong_references(self):
+        # Wrong namespace for element type's reference
+        self.check_schema("""
+        <xs:element name="dimension" type="xs:dimensionType"/>
+        <xs:simpleType name="dimensionType">
+          <xs:restriction base="xs:short"/>
+        </xs:simpleType>
+        """, XMLSchemaParseError)
+
+    def test_annotations(self):
+        schema = self.check_schema("""
+            <xs:element name='foo'>
+                <xs:annotation />
+            </xs:element>""")
+        xsd_element = schema.elements'foo'
+        self.assertIsNone(xsd_element._annotation)  # lazy annotation
+        self.assertIsNotNone(xsd_element.annotation)
+        self.assertIs(xsd_element.annotation, xsd_element._annotation)
+
+        self.check_schema("""
+        <xs:simpleType name='Magic'>
+            <xs:annotation />
+            <xs:annotation />
+            <xs:restriction base='xs:string'>
+                <xs:enumeration value='A'/>
+            </xs:restriction>
+        </xs:simpleType>""", XMLSchemaParseError)
+
+        schema = self.check_schema("""
+        <xs:simpleType name='Magic'>
+            <xs:annotation>
+                <xs:documentation> stuff </xs:documentation>
+            </xs:annotation>
+            <xs:restriction base='xs:string'>
+                <xs:enumeration value='A'/>
+            </xs:restriction>
+        </xs:simpleType>""")
+
+        xsd_type = schema.types"Magic"

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_simple_types.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_simple_types.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/tests/validators/test_xsdbase.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tests/validators/test_xsdbase.py Changed

@@ -12,11 +12,15 @@
 import os
 import platform
 import re
-import lxml.etree
 from textwrap import dedent
 
-from xmlschema.validators import XsdValidator, XsdComponent, XMLSchema10, \
-    XMLSchema11, XMLSchemaParseError, XMLSchemaValidationError, XsdGroup, XsdSimpleType
+try:
+    import lxml.etree as lxml_etree
+except ImportError:
+    lxml_etree = None
+
+from xmlschema.validators import XsdValidator, XsdComponent, XMLSchema10, XMLSchema11, \
+    XMLSchemaParseError, XMLSchemaValidationError, XsdAnnotation, XsdGroup, XsdSimpleType
 from xmlschema.names import XSD_NAMESPACE, XSD_ELEMENT, XSD_ANNOTATION, XSD_ANY_TYPE
 from xmlschema.etree import ElementTree
 from xmlschema.dataobjects import DataElement
@@ -159,6 +163,25 @@
         with self.assertRaises(ValueError):
             XsdComponent(elem=ElementTree.Element('A'), schema=self.schema)
 
+    def test_errors(self):
+        schema = XMLSchema10(dedent("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:element name="root" type="xs:string">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string"/>
+                </xs:simpleType>
+            </xs:element>
+        </xs:schema>"""), validation='lax')
+
+        xsd_element = schema.elements'root'
+        self.assertEqual(len(schema.all_errors), 1)
+        self.assertEqual(len(xsd_element.errors), 1)
+
+        xsd_element.elem.attrib.pop('type')
+        xsd_element.elem = xsd_element.elem
+
+        self.assertEqual(len(schema.all_errors), 0)
+        self.assertEqual(len(xsd_element.errors), 0)
+
     def test_is_override(self):
         self.assertFalse(self.schema.elements'cars'.is_override())
         self.assertFalse(self.schema.elements'cars'.type.content0.is_override())
@@ -421,7 +444,7 @@
         self.assertIn('name="car" type="vh:vehicleType"', cars_dump)
         self.assertIsInstance(ElementTree.XML(cars_dump), ElementTree.Element)
 
-    def test_annotation(self):
+    def test_annotations(self):
         schema = XMLSchema10("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                      <xs:element name="root">
                          <xs:annotation/>
@@ -429,14 +452,24 @@
                  </xs:schema>""")
         self.assertTrue(schema.elements'root'.annotation.built)
 
-        root = lxml.etree.XML("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+        schema = XMLSchema10("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                      <xs:element name="root">
-                        
-                        <xs:annotation/>
+                         <xs:simpleType>
+                             <xs:restriction base="xs:string"/>
+                         </xs:simpleType>
                      </xs:element>
                  </xs:schema>""")
-        schema = XMLSchema10(root)
-        self.assertTrue(schema.elements'root'.annotation.built)
+        self.assertIsNone(schema.elements'root'.annotation)
+
+        if lxml_etree is not None:
+            root = lxml_etree.XML("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                         <xs:element name="root">
+                            
+                            <xs:annotation/>
+                         </xs:element>
+                     </xs:schema>""")
+            schema = XMLSchema10(root)
+            self.assertTrue(schema.elements'root'.annotation.built)
 
         schema = XMLSchema10("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                      <xs:element name="root">
@@ -448,6 +481,7 @@
                  </xs:schema>""")
         self.assertEqual(len(schema.all_errors), 0)
 
+        # XSD annotation errors found with meta-schema validation
         schema = XMLSchema10("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
                      <xs:element name="root">
                          <xs:annotation>
@@ -459,83 +493,94 @@
                  </xs:schema>""", validation='lax')
         self.assertEqual(len(schema.all_errors), 3)
 
+        # Lazy XSD annotation build (errors not counted in schema.all_errors)
+        xsd_element = schema.elements'root'
+        self.assertNotIn('_annotation', xsd_element.__dict__)
+        annotation = xsd_element.annotation
+        self.assertIsInstance(annotation, XsdAnnotation)
+        self.assertIn('_annotation', xsd_element.__dict__)
+        self.assertEqual(len(schema.all_errors), 3)
+        self.assertEqual(len(annotation.errors), 2)
+        self.assertIsNone(annotation.annotation)
+
 
 class TestXsdType(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.schema = XMLSchema10("""<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-                     <xs:simpleType name="emptyType">
-                         <xs:restriction base="xs:string">
-                             <xs:length value="0"/>
+        cls.schema = XMLSchema10(dedent("""\
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            
+                 <xs:simpleType name="emptyType">
+                     <xs:restriction base="xs:string">
+                         <xs:length value="0"/>
+                     </xs:restriction>
+                 </xs:simpleType>
+
+                 <xs:complexType name="emptyType2">
+                     <xs:attribute name="foo" type="xs:string"/>
+                 </xs:complexType>        
+
+                 <xs:simpleType name="idType">
+                     <xs:restriction base="xs:ID"/>
+                 </xs:simpleType>
+
+                 <xs:simpleType name="decimalType">
+                     <xs:restriction base="xs:decimal"/>
+                 </xs:simpleType>
+
+                 <xs:simpleType name="dateTimeType">
+                     <xs:restriction base="xs:dateTime"/>
+                 </xs:simpleType>
+                 
+                 <xs:simpleType name="fooType">
+                     <xs:restriction base="xs:string"/>
+                 </xs:simpleType>
+
+                 <xs:simpleType name="fooListType">
+                     <xs:list itemType="xs:string"/>
+                 </xs:simpleType>
+
+                 <xs:simpleType name="fooUnionType">
+                     <xs:union memberTypes="xs:string xs:anyURI"/>
+                 </xs:simpleType>
+                 
+                 <xs:complexType name="barType">
+                     <xs:sequence>
+                         <xs:element name="node"/>
+                     </xs:sequence>
+                 </xs:complexType>        
+
+                 <xs:complexType name="barExtType">
+                     <xs:complexContent>
+                         <xs:extension base="barType">
+                             <xs:sequence>
+                                 <xs:element name="node"/>
+                             </xs:sequence>
+                         </xs:extension>
+                     </xs:complexContent>
+                 </xs:complexType>        
+
+                 <xs:complexType name="barResType">
+                     <xs:complexContent>
+                         <xs:restriction base="barType">
+                             <xs:sequence>
+                                 <xs:element name="node"/>
+                             </xs:sequence>
                          </xs:restriction>
-                     </xs:simpleType>
-
-                     <xs:complexType name="emptyType2">
-                         <xs:attribute name="foo" type="xs:string"/>
-                     </xs:complexType>        
+                     </xs:complexContent>
+                 </xs:complexType>        
 
-                     <xs:simpleType name="idType">
-                         <xs:restriction base="xs:ID"/>
-                     </xs:simpleType>
+                 <xs:complexType name="mixedType" mixed="true">
+                     <xs:sequence>
+                         <xs:element name="node" type="xs:string"/>
+                     </xs:sequence>
+                 </xs:complexType>        
 
-                     <xs:simpleType name="decimalType">
-                         <xs:restriction base="xs:decimal"/>
-                     </xs:simpleType>
-
-                     <xs:simpleType name="dateTimeType">
-                         <xs:restriction base="xs:dateTime"/>
-                     </xs:simpleType>

_service:tar_scm:xmlschema-1.5.2.tar.gz/tox.ini -> _service:tar_scm:xmlschema-1.9.2.tar.gz/tox.ini Changed

@@ -4,21 +4,21 @@
 # and then run "tox" from this directory.
 
 tox
-envlist = py{36,37,38,39}, pypy3, ep21{2,3,4}, ep220, docs, flake8, coverage
+envlist = py{36,37,38,39,310}, pypy3, ep{240},
+    docs, flake8, mypy-py{36,37,38,39,310}, coverage, pytest
 skip_missing_interpreters = true
 toxworkdir = {homedir}/.tox/xmlschema
 
 testenv
 deps =
-    elementpath>=2.1.2, <3.0.0
+    elementpath>=2.4.0, <3.0.0
     lxml
-    py{37,38,39}: memory_profiler
-    codegen: jinja2
+    jinja2
+    py{38,39}: memory_profiler
     docs: Sphinx
     docs: sphinx_rtd_theme
     flake8: flake8
     coverage: coverage
-    coverage: jinja2
 commands =
     python -m unittest tests/test_etree_import.py -k before
     python -m unittest tests/test_etree_import.py -k after
@@ -36,24 +36,9 @@
 testenv:pypy3
 commands = python -m unittest
 
-testenv:ep212
+testenv:ep240
 deps =
-    elementpath==2.1.2
-    lxml
-
-testenv:ep213
-deps =
-    elementpath==2.1.3
-    lxml
-
-testenv:ep214
-deps =
-    elementpath==2.1.4
-    lxml
-
-testenv:ep220
-deps =
-    elementpath==2.2.0
+    elementpath==2.4.0
     lxml
 
 testenv:docs
@@ -67,7 +52,26 @@
 
 testenv:flake8
 commands =
-    flake8 --ignore=F811,W503 xmlschema
+    flake8 xmlschema
+
+testenv:mypy-py{36,37}
+deps =
+    mypy==0.930
+    elementpath==2.4.0
+    lxml-stubs
+    jinja2
+commands =
+    mypy --config-file {toxinidir}/mypy.ini xmlschema
+
+testenv:mypy-py{38,39,310}
+deps =
+    mypy==0.930
+    elementpath==2.4.0
+    lxml-stubs
+    jinja2
+commands =
+    mypy --config-file {toxinidir}/mypy.ini xmlschema
+    python tests/test_typing.py
 
 testenv:coverage
 commands =
@@ -78,6 +82,18 @@
     coverage run -a -m unittest
     coverage report -m
 
+testenv:pytest
+deps =
+    pytest
+    pytest-randomly
+    elementpath>=2.4.0, <3.0.0
+    lxml
+    jinja2
+    mypy==0.930
+    lxml-stubs
+commands =
+    pytest tests -ra
+
 testenv:build
 deps =
     setuptools

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema.egg-info/PKG-INFO -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema.egg-info/PKG-INFO Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema.egg-info/SOURCES.txt -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema.egg-info/SOURCES.txt Changed

@@ -34,6 +34,7 @@
 tests/test_package.py
 tests/test_resources.py
 tests/test_schemas.py
+tests/test_typing.py
 tests/test_validation.py
 tests/test_w3c_suite.py
 tests/test_wsdl.py
@@ -46,6 +47,7 @@
 tests/templates/filters/sort_types_filter_test.jinja
 tests/templates/filters/type_name_filter_test.jinja
 tests/templates/filters/type_qname_filter_test.jinja
+tests/templates/filters/unknown_filter_test.jinja
 tests/templates/filters/wrong-template.jinja
 tests/test_cases/testfiles
 tests/test_cases/examples/collection/collection-1_error.xml
@@ -84,6 +86,9 @@
 tests/test_cases/features/decoder/data.xml
 tests/test_cases/features/decoder/data2.xml
 tests/test_cases/features/decoder/data3.xml
+tests/test_cases/features/decoder/data4-mixed.xml
+tests/test_cases/features/decoder/long-sequence-1.xsd
+tests/test_cases/features/decoder/mixed-content.xsd
 tests/test_cases/features/decoder/simple-types.xsd
 tests/test_cases/features/derivations/complex-extensions.xsd
 tests/test_cases/features/derivations/complex-with-simple-content-restriction.xsd
@@ -208,6 +213,34 @@
 tests/test_cases/issues/issue_222/issue_222.xsd
 tests/test_cases/issues/issue_223/issue_223.xml
 tests/test_cases/issues/issue_223/issue_223.xsd
+tests/test_cases/issues/issue_237/dir1/issue_237.xsd
+tests/test_cases/issues/issue_237/dir1/stockquoteservice.wsdl
+tests/test_cases/issues/issue_237/dir2/issue_237a.xsd
+tests/test_cases/issues/issue_237/dir2/issue_237b.xsd
+tests/test_cases/issues/issue_237/dir2/stockquote.wsdl
+tests/test_cases/issues/issue_237/dir2/stockquote.xsd
+tests/test_cases/issues/issue_243/issue_243.xml
+tests/test_cases/issues/issue_243/issue_243.xsd
+tests/test_cases/issues/issue_245/issue_245-valid.xml
+tests/test_cases/issues/issue_245/issue_245.xml
+tests/test_cases/issues/issue_245/issue_245.xsd
+tests/test_cases/issues/issue_259/issue_259-1.xsd
+tests/test_cases/issues/issue_259/issue_259-2.xsd
+tests/test_cases/issues/issue_265/issue_265-1.xsd
+tests/test_cases/issues/issue_265/issue_265-2-invalid.xsd
+tests/test_cases/issues/issue_265/issue_265-2-override.xsd
+tests/test_cases/issues/issue_266/issue_266-1.xml
+tests/test_cases/issues/issue_266/issue_266-1.xsd
+tests/test_cases/issues/issue_266/issue_266-2.xml
+tests/test_cases/issues/issue_266/issue_266-2.xsd
+tests/test_cases/issues/issue_266/issue_266b-1.xsd
+tests/test_cases/issues/issue_266/issue_266b-2.xsd
+tests/test_cases/issues/issue_273/issue_273.xml
+tests/test_cases/issues/issue_273/issue_273.xsd
+tests/test_cases/issues/issue_276/dummy.xml
+tests/test_cases/issues/issue_276/schema.xsd
+tests/test_cases/mypy/schema_source.py
+tests/test_cases/mypy/simple_types.py
 tests/test_cases/resources/dummy file #2.txt
 tests/test_cases/resources/dummy file.txt
 tests/test_cases/resources/external_entity.xml
@@ -226,16 +259,19 @@
 tests/validators/test_complex_types.py
 tests/validators/test_elements.py
 tests/validators/test_exceptions.py
+tests/validators/test_facets.py
 tests/validators/test_global_maps.py
+tests/validators/test_groups.py
 tests/validators/test_identities.py
 tests/validators/test_models.py
 tests/validators/test_notations.py
 tests/validators/test_particles.py
-tests/validators/test_schema_class.py
+tests/validators/test_schemas.py
 tests/validators/test_simple_types.py
 tests/validators/test_wildcards.py
 tests/validators/test_xsdbase.py
 xmlschema/__init__.py
+xmlschema/aliases.py
 xmlschema/cli.py
 xmlschema/dataobjects.py
 xmlschema/documents.py
@@ -245,6 +281,7 @@
 xmlschema/limits.py
 xmlschema/names.py
 xmlschema/namespaces.py
+xmlschema/py.typed
 xmlschema/resources.py
 xmlschema/xpath.py
 xmlschema.egg-info/PKG-INFO
@@ -302,7 +339,7 @@
 xmlschema/validators/models.py
 xmlschema/validators/notations.py
 xmlschema/validators/particles.py
-xmlschema/validators/schema.py
+xmlschema/validators/schemas.py
 xmlschema/validators/simple_types.py
 xmlschema/validators/wildcards.py
 xmlschema/validators/xsdbase.py
\ No newline at end of file

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema.egg-info/requires.txt -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema.egg-info/requires.txt Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/__init__.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/__init__.py Changed

@@ -10,16 +10,16 @@
 #
 from . import limits
 from .exceptions import XMLSchemaException, XMLResourceError, XMLSchemaNamespaceError
-from .etree import etree_tostring
+from .etree import ElementData, etree_tostring
 from .resources import normalize_url, normalize_locations, fetch_resource, \
     fetch_namespaces, fetch_schema_locations, fetch_schema, XMLResource
 from .xpath import ElementPathMixin
-from .converters import ElementData, XMLSchemaConverter, \
+from .converters import XMLSchemaConverter, \
     UnorderedConverter, ParkerConverter, BadgerFishConverter, \
     AbderaConverter, JsonMLConverter, ColumnarConverter
 from .dataobjects import DataElement, DataElementConverter, DataBindingConverter
-from .documents import validate, is_valid, iter_errors, to_dict, to_json, \
-    from_json, XmlDocument
+from .documents import validate, is_valid, iter_errors, iter_decode, \
+    to_dict, to_json, from_json, XmlDocument
 
 from .validators import (
     XMLSchemaValidatorError, XMLSchemaParseError, XMLSchemaNotBuiltError,
@@ -30,7 +30,7 @@
     XsdComponent, XsdType, XsdElement, XsdAttribute
 )
 
-__version__ = '1.5.2'
+__version__ = '1.9.2'
 __author__ = "Davide Brunato"
 __contact__ = "brunato@sissa.it"
 __copyright__ = "Copyright 2016-2021, SISSA"
@@ -45,11 +45,12 @@
     'ElementPathMixin', 'ElementData', 'XMLSchemaConverter', 'UnorderedConverter',
     'ParkerConverter', 'BadgerFishConverter', 'AbderaConverter', 'JsonMLConverter',
     'ColumnarConverter', 'DataElement', 'DataElementConverter', 'DataBindingConverter',
-    'validate', 'is_valid', 'iter_errors', 'to_dict', 'to_json', 'from_json', 'XmlDocument',
-    'XMLSchemaValidatorError', 'XMLSchemaParseError', 'XMLSchemaNotBuiltError',
-    'XMLSchemaModelError', 'XMLSchemaModelDepthError', 'XMLSchemaValidationError',
-    'XMLSchemaDecodeError', 'XMLSchemaEncodeError', 'XMLSchemaChildrenValidationError',
-    'XMLSchemaIncludeWarning', 'XMLSchemaImportWarning', 'XMLSchemaTypeTableWarning',
+    'validate', 'is_valid', 'iter_errors', 'iter_decode', 'to_dict', 'to_json',
+    'from_json', 'XmlDocument', 'XMLSchemaValidatorError', 'XMLSchemaParseError',
+    'XMLSchemaNotBuiltError', 'XMLSchemaModelError', 'XMLSchemaModelDepthError',
+    'XMLSchemaValidationError', 'XMLSchemaDecodeError', 'XMLSchemaEncodeError',
+    'XMLSchemaChildrenValidationError', 'XMLSchemaIncludeWarning',
+    'XMLSchemaImportWarning', 'XMLSchemaTypeTableWarning',
     'XsdGlobals', 'XMLSchemaBase', 'XMLSchema', 'XMLSchema10', 'XMLSchema11',
     'XsdComponent', 'XsdType', 'XsdElement', 'XsdAttribute',

_service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/aliases.py Added

@@ -0,0 +1,111 @@
+#
+# Copyright (c), 2021, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+"""
+Type aliases for static typing analysis. In a type checking context the aliases
+are defined from effective classes imported from package modules. In a runtime
+context the aliases cannot be set from the same bases, due to circular imports,
+so they are set with a common dummy subscriptable type to keep compatibility.
+"""
+from typing import TYPE_CHECKING, Optional, TypeVar
+
+__all__ = 'ElementType', 'ElementTreeType', 'XMLSourceType', 'NamespacesType',
+           'NormalizedLocationsType', 'LocationsType', 'NsmapType', 'ParentMapType',
+           'LazyType', 'SchemaType', 'BaseXsdType', 'SchemaElementType',
+           'SchemaAttributeType', 'SchemaGlobalType', 'GlobalMapType', 'ModelGroupType',
+           'ModelParticleType', 'XPathElementType', 'AtomicValueType', 'NumericValueType',
+           'DateTimeType', 'SchemaSourceType', 'ConverterType', 'ComponentClassType',
+           'ExtraValidatorType', 'DecodeType', 'IterDecodeType', 'JsonDecodeType',
+           'EncodeType', 'IterEncodeType', 'DecodedValueType', 'EncodedValueType'
+
+if TYPE_CHECKING:
+    from pathlib import Path
+    from decimal import Decimal
+    from typing import Callable, Dict, List, IO, Iterator, MutableMapping, Tuple, Type, Union
+
+    from elementpath.datatypes import NormalizedString, QName, Float10, Integer, \
+        Time, Base64Binary, HexBinary, AnyURI, Duration
+    from elementpath.datatypes.datetime import OrderedDateTime
+
+    from .etree import ElementTree
+    from .resources import XMLResource
+    from .converters import XMLSchemaConverter
+    from .validators import XMLSchemaValidationError, XsdComponent, XMLSchemaBase, \
+        XsdComplexType, XsdSimpleType, XsdElement, XsdAnyElement, XsdAttribute, \
+        XsdAnyAttribute, XsdAssert, XsdGroup, XsdAttributeGroup, XsdNotation
+
+    ##
+    # Type aliases for ElementTree
+    ElementType = ElementTree.Element
+    ElementTreeType = ElementTree.ElementTree
+    XMLSourceType = Unionstr, bytes, Path, IOstr, IObytes, ElementType, ElementTreeType
+    NamespacesType = MutableMappingstr, str
+
+    ##
+    # Type aliases for XML resources
+    NormalizedLocationsType = ListTuplestr, str
+    LocationsType = UnionTupleTuplestr, str, ..., Dictstr, str, NormalizedLocationsType
+    NsmapType = UnionListTuplestr, str, MutableMappingstr, str
+    ParentMapType = DictElementType, OptionalElementType
+    LazyType = Unionbool, int
+
+    ##
+    # Type aliases for XSD components
+    SchemaSourceType = Unionstr, bytes, Path, IOstr, IObytes, XMLResource,
+                             ElementTree.Element, ElementTree.ElementTree
+    SchemaType = XMLSchemaBase
+    BaseXsdType = UnionXsdSimpleType, XsdComplexType
+    SchemaElementType = UnionXsdElement, XsdAnyElement
+    SchemaAttributeType = UnionXsdAttribute, XsdAnyAttribute
+    SchemaGlobalType = UnionXsdNotation, BaseXsdType, XsdElement,
+                             XsdAttribute, XsdAttributeGroup, XsdGroup
+
+    ModelGroupType = XsdGroup
+    ModelParticleType = UnionXsdElement, XsdAnyElement, XsdGroup
+    ComponentClassType = UnionNone, TypeXsdComponent, TupleTypeXsdComponent, ...
+    XPathElementType = UnionXsdElement, XsdAnyElement, XsdAssert
+
+    C = TypeVar('C')
+    GlobalMapType = Dictstr, UnionC, TupleElementType, SchemaType
+
+    ##
+    # Type aliases for datatypes
+    AtomicValueType = Unionstr, int, float, Decimal, bool, Integer, Float10, NormalizedString,
+                            AnyURI, HexBinary, Base64Binary, QName, Duration, OrderedDateTime, Time
+    NumericValueType = Unionstr, bytes, int, float, Decimal
+    DateTimeType = UnionOrderedDateTime, Time
+
+    ##
+    # Type aliases for validation/decoding/encoding
+    ConverterType = UnionTypeXMLSchemaConverter, XMLSchemaConverter
+    ExtraValidatorType = CallableElementType, SchemaType,
+                                  OptionalIteratorXMLSchemaValidationError
+
+    D = TypeVar('D')
+    DecodeType = UnionOptionalD, TupleOptionalD, ListXMLSchemaValidationError
+    IterDecodeType = IteratorUnionD, XMLSchemaValidationError
+
+    E = TypeVar('E')
+    EncodeType = UnionE, TupleE, ListXMLSchemaValidationError
+    IterEncodeType = IteratorUnionE, XMLSchemaValidationError
+
+    JsonDecodeType = Unionstr, None, TupleXMLSchemaValidationError, ...,
+                           TupleUnionstr, None, TupleXMLSchemaValidationError, ...
+
+    DecodedValueType = UnionNone, AtomicValueType, ListAtomicValueType
+    EncodedValueType = UnionNone, str, Liststr
+
+else:
+    # In runtime use a dummy subscriptable type for compatibility
+    T = TypeVar('T')
+    DummyType = OptionalT
+
+    module_globals = globals()
+    for name in __all__:
+        module_globalsname = DummyType

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/cli.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/cli.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/__init__.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/__init__.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/abdera.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/abdera.py Changed

@@ -8,9 +8,15 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableMapping, MutableSequence
+from typing import TYPE_CHECKING, Any, Optional, List, Dict, Type, Union
 
 from ..exceptions import XMLSchemaValueError
-from .default import ElementData, XMLSchemaConverter
+from ..etree import ElementData
+from ..aliases import NamespacesType, BaseXsdType
+from .default import XMLSchemaConverter
+
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class AbderaConverter(XMLSchemaConverter):
@@ -24,17 +30,23 @@
     :param dict_class: Dictionary class to use for decoded data. Default is `dict`.
     :param list_class: List class to use for decoded data. Default is `list`.
     """
-    def __init__(self, namespaces=None, dict_class=None, list_class=None, **kwargs):
+    __slots__ = ()
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 dict_class: OptionalTypeDictstr, Any = None,
+                 list_class: OptionalTypeListAny = None,
+                 **kwargs: Any) -> None:
         kwargs.update(attr_prefix='', text_key='', cdata_prefix=None)
         super(AbderaConverter, self).__init__(
             namespaces, dict_class, list_class, **kwargs
         )
 
     @property
-    def lossy(self):
+    def lossy(self) -> bool:
         return True  # Loss cdata parts
 
-    def element_decode(self, data, xsd_element, xsd_type=None, level=0):
+    def element_decode(self, data: ElementData, xsd_element: 'XsdElement',
+                       xsd_type: OptionalBaseXsdType = None, level: int = 0) -> Any:
         xsd_type = xsd_type or xsd_element.type
         if xsd_type.simple_type is not None:
             children = data.text if data.text is not None and data.text != '' else None
@@ -72,7 +84,7 @@
         else:
             return children if children is not None else self.list()
 
-    def element_encode(self, obj, xsd_element, level=0):
+    def element_encode(self, obj: Any, xsd_element: 'XsdElement', level: int = 0) -> ElementData:
         tag = xsd_element.qualified_name if level == 0 else xsd_element.name
 
         if not isinstance(obj, MutableMapping):
@@ -80,7 +92,9 @@
                 obj = None
             return ElementData(tag, obj, None, {})
         else:
-            attributes = {}
+            attributes: Dictstr, Any = {}
+            children: UnionListAny, MutableMappingstr, Any
+
             try:
                 attributes.update((self.unmap_qname(k, xsd_element.attributes), v)
                                   for k, v in obj'attributes'.items())
@@ -107,11 +121,16 @@
                         for item in value:
                             content.append((ns_name, item))
                     else:
+                        xsd_group = xsd_element.type.model_group
+                        if xsd_group is None:
+                            xsd_group = xsd_element.any_type.model_group
+                            assert xsd_group is not None
+
                         ns_name = self.unmap_qname(name)
-                        for xsd_child in xsd_element.type.content.iter_elements():
+                        for xsd_child in xsd_group.iter_elements():
                             matched_element = xsd_child.match(ns_name, resolve=True)
                             if matched_element is not None:
-                                if matched_element.type.is_list():
+                                if matched_element.type and matched_element.type.is_list():
                                     content.append((ns_name, value))
                                 else:
                                     content.extend((ns_name, item) for item in value)

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/badgerfish.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/badgerfish.py Changed

@@ -8,8 +8,14 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableMapping, MutableSequence
+from typing import TYPE_CHECKING, Any, Optional, List, Dict, Type, Union, Tuple
 
-from .default import ElementData, XMLSchemaConverter
+from ..etree import ElementData
+from ..aliases import NamespacesType, BaseXsdType
+from .default import XMLSchemaConverter
+
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class BadgerFishConverter(XMLSchemaConverter):
@@ -23,17 +29,23 @@
     :param dict_class: Dictionary class to use for decoded data. Default is `dict`.
     :param list_class: List class to use for decoded data. Default is `list`.
     """
-    def __init__(self, namespaces=None, dict_class=None, list_class=None, **kwargs):
+    __slots__ = ()
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 dict_class: OptionalTypeDictstr, Any = None,
+                 list_class: OptionalTypeListAny = None,
+                 **kwargs: Any) -> None:
         kwargs.update(attr_prefix='@', text_key='$', cdata_prefix='$')
         super(BadgerFishConverter, self).__init__(
             namespaces, dict_class, list_class, **kwargs
         )
 
     @property
-    def lossy(self):
+    def lossy(self) -> bool:
         return False
 
-    def element_decode(self, data, xsd_element, xsd_type=None, level=0):
+    def element_decode(self, data: ElementData, xsd_element: 'XsdElement',
+                       xsd_type: OptionalBaseXsdType = None, level: int = 0) -> Any:
         xsd_type = xsd_type or xsd_element.type
         dict_class = self.dict
 
@@ -43,11 +55,12 @@
         if has_local_root:
             result_dict'@xmlns' = dict_class()
 
-        if xsd_type.simple_type is not None:
+        xsd_group = xsd_type.model_group
+        if xsd_group is None:
             if data.text is not None and data.text != '':
                 result_dict'$' = data.text
         else:
-            has_single_group = xsd_type.content.is_single()
+            has_single_group = xsd_group.is_single()
             for name, value, xsd_child in self.map_content(data.content):
                 try:
                     if '@xmlns' in value:
@@ -91,7 +104,7 @@
         else:
             return dict_class(('@xmlns', dict_class(self)), (tag, result_dict))
 
-    def element_encode(self, obj, xsd_element, level=0):
+    def element_encode(self, obj: Any, xsd_element: 'XsdElement', level: int = 0) -> ElementData:
         tag = xsd_element.qualified_name if level == 0 else xsd_element.name
 
         if not self.strip_namespaces:
@@ -109,7 +122,7 @@
                 element_data = obj
 
         text = None
-        content = 
+        content: ListTupleUnionstr, int, Any = 
         attributes = {}
 
         for name, value in element_data.items():
@@ -130,11 +143,16 @@
                 for item in value:
                     content.append((ns_name, item))
             else:
+                xsd_group = xsd_element.type.model_group
+                if xsd_group is None:
+                    xsd_group = xsd_element.any_type.model_group
+                    assert xsd_group is not None
+
                 ns_name = self.unmap_qname(name)
-                for xsd_child in xsd_element.type.content.iter_elements():
+                for xsd_child in xsd_group.iter_elements():
                     matched_element = xsd_child.match(ns_name, resolve=True)
                     if matched_element is not None:
-                        if matched_element.type.is_list():
+                        if matched_element.type and matched_element.type.is_list():
                             content.append((ns_name, value))
                         else:
                             content.extend((ns_name, item) for item in value)

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/columnar.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/columnar.py Changed

@@ -8,9 +8,15 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableMapping, MutableSequence
+from typing import TYPE_CHECKING, Any, Optional, List, Dict, Type, Tuple
 
 from ..exceptions import XMLSchemaTypeError, XMLSchemaValueError
-from .default import ElementData, XMLSchemaConverter
+from ..etree import ElementData
+from ..aliases import NamespacesType, BaseXsdType
+from .default import XMLSchemaConverter
+
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class ColumnarConverter(XMLSchemaConverter):
@@ -23,17 +29,22 @@
     :param attr_prefix: used as separator string for renaming the decoded attributes. \
     Can be the empty string (the default) or a single/double underscore.
     """
-    def __init__(self, namespaces=None, dict_class=None, list_class=None,
-                 attr_prefix='', **kwargs):
+    __slots__ = ()
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 dict_class: OptionalTypeDictstr, Any = None,
+                 list_class: OptionalTypeListAny = None,
+                 attr_prefix: Optionalstr = '',
+                 **kwargs: Any) -> None:
         kwargs.update(text_key=None, cdata_prefix=None)
         super(ColumnarConverter, self).__init__(namespaces, dict_class, list_class,
                                                 attr_prefix=attr_prefix, **kwargs)
 
     @property
-    def lossy(self):
+    def lossy(self) -> bool:
         return True  # Loss cdata parts
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name: str, value: Any) -> None:
         if name != 'attr_prefix':
             super(ColumnarConverter, self).__setattr__(name, value)
         elif not isinstance(value, str):
@@ -45,10 +56,16 @@
         else:
             super(XMLSchemaConverter, self).__setattr__(name, value)
 
-    def element_decode(self, data, xsd_element, xsd_type=None, level=0):
+    def element_decode(self, data: ElementData, xsd_element: 'XsdElement',
+                       xsd_type: OptionalBaseXsdType = None, level: int = 0) -> Any:
+        result_dict: Any
+
         xsd_type = xsd_type or xsd_element.type
         if data.attributes:
-            pfx = xsd_element.local_name + self.attr_prefix
+            if self.attr_prefix:
+                pfx = xsd_element.local_name + self.attr_prefix
+            else:
+                pfx = xsd_element.local_name
             result_dict = self.dict((pfx + self.map_qname(k), v) for k, v in data.attributes)
         else:
             result_dict = self.dict()
@@ -66,13 +83,13 @@
                     name = name2 + len(xsd_child.namespace):
 
                 if xsd_child.is_single():
-                    if hasattr(xsd_child, 'type') and xsd_child.type.simple_type is not None:
+                    if xsd_child.type is not None and xsd_child.type.simple_type is not None:
                         for k in value:
                             result_dictk = valuek
                     else:
                         result_dictname = value
                 else:
-                    if hasattr(xsd_child, 'type') and xsd_child.type.simple_type is not None \
+                    if xsd_child.type is not None and xsd_child.type.simple_type is not None \
                             and not xsd_child.attributes:
                         if len(xsd_element.findall('*')) == 1:
                             try:
@@ -99,7 +116,7 @@
         else:
             return result_dict
 
-    def element_encode(self, obj, xsd_element, level=0):
+    def element_encode(self, obj: Any, xsd_element: 'XsdElement', level: int = 0) -> ElementData:
         if level != 0:
             tag = xsd_element.local_name
         else:
@@ -118,9 +135,9 @@
                 return ElementData(xsd_element.name, None, obj, {})
 
         text = None
-        content = 
+        content: ListTupleOptionalstr, MutableSequenceAny = 
         attributes = {}
-        pfx = tag + self.attr_prefix
+        pfx = tag + self.attr_prefix if self.attr_prefix else tag
 
         for name, value in obj.items():
             if name == tag:
@@ -135,11 +152,16 @@
                 ns_name = self.unmap_qname(name)
                 content.extend((ns_name, item) for item in value)
             else:
+                xsd_group = xsd_element.type.model_group
+                if xsd_group is None:
+                    xsd_group = xsd_element.any_type.model_group
+                    assert xsd_group is not None
+
                 ns_name = self.unmap_qname(name)
-                for xsd_child in xsd_element.type.content.iter_elements():
+                for xsd_child in xsd_group.iter_elements():
                     matched_element = xsd_child.match(ns_name, resolve=True)
                     if matched_element is not None:
-                        if matched_element.type.is_list():
+                        if matched_element.type and matched_element.type.is_list():
                             content.append((xsd_child.name, value))
                         else:
                             content.extend((xsd_child.name, item) for item in value)

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/default.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/default.py Changed

@@ -7,25 +7,18 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
-from collections import namedtuple
 from collections.abc import MutableMapping, MutableSequence
+from typing import TYPE_CHECKING, cast, Any, Dict, Iterator, Iterable, \
+    List, Optional, Type, Tuple, Union
 
 from ..exceptions import XMLSchemaTypeError
 from ..names import XSI_NAMESPACE
-from ..etree import etree_element
+from ..etree import etree_element, ElementData
+from ..aliases import NamespacesType, ElementType, BaseXsdType
 from ..namespaces import NamespaceMapper
 
-
-ElementData = namedtuple('ElementData', 'tag', 'text', 'content', 'attributes')
-"""
-Namedtuple for Element data interchange between decoders and converters.
-The field *tag* is a string containing the Element's tag, *text* can be `None`
-or a string representing the Element's text, *content* can be `None`, a list
-containing the Element's children or a dictionary containing element name to
-list of element contents for the Element's children (used for unordered input
-data), *attributes* can be `None` or a dictionary containing the Element's
-attributes.
-"""
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class XMLSchemaConverter(NamespaceMapper):
@@ -55,12 +48,13 @@
     :param strip_namespaces: if set to `True` removes namespace declarations from data and \
     namespace information from names, during decoding or encoding. Defaults to `False`.
     :param preserve_root: if set to `True` the root element is preserved, wrapped into a \
-    single-item dictionary. Applicable only to default converter and to :class:`ParkerConverter`.
+    single-item dictionary. Applicable only to default converter, to \
+    :class:`UnorderedConverter` and to :class:`ParkerConverter`.
     :param force_dict: if set to `True` complex elements with simple content are decoded \
-    with a dictionary also if there are no decoded attributes. Applicable to default converter \
-    only. Defaults to `False`.
+    with a dictionary also if there are no decoded attributes. Applicable only to default \
+    converter and to :class:`UnorderedConverter`. Defaults to `False`.
     :param force_list: if set to `True` child elements are decoded within a list in any case. \
-    Applicable to default converter only. Defaults to `False`.
+    Applicable only to default converter and to :class:`UnorderedConverter`. Defaults to `False`.
 
     :ivar dict: dictionary class to use for decoded data.
     :ivar list: list class to use for decoded data.
@@ -73,16 +67,29 @@
     :ivar force_dict: force dictionary for complex elements with simple content
     :ivar force_list: force list for child elements
     """
+    ns_prefix: str
+    dict: TypeDictstr, Any = dict
+    list: TypeListAny = list
 
-    dict = dict
-    list = list
+    etree_element_class: TypeElementType
     etree_element_class = etree_element
-    ns_prefix = None
 
-    def __init__(self, namespaces=None, dict_class=None, list_class=None,
-                 etree_element_class=None, text_key='$', attr_prefix='@',
-                 cdata_prefix=None, indent=4, strip_namespaces=False,
-                 preserve_root=False, force_dict=False, force_list=False, **kwargs):
+    __slots__ = ('text_key', 'ns_prefix', 'attr_prefix', 'cdata_prefix',
+                 'indent', 'preserve_root', 'force_dict', 'force_list')
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 dict_class: OptionalTypeDictstr, Any = None,
+                 list_class: OptionalTypeListAny = None,
+                 etree_element_class: OptionalTypeElementType = None,
+                 text_key: Optionalstr = '$',
+                 attr_prefix: Optionalstr = '@',
+                 cdata_prefix: Optionalstr = None,
+                 indent: int = 4,
+                 strip_namespaces: bool = False,
+                 preserve_root: bool = False,
+                 force_dict: bool = False,
+                 force_list: bool = False,
+                 **kwargs: Any) -> None:
 
         super(XMLSchemaConverter, self).__init__(namespaces, strip_namespaces)
 
@@ -96,20 +103,19 @@
         self.text_key = text_key
         self.attr_prefix = attr_prefix
         self.cdata_prefix = cdata_prefix
+        self.ns_prefix = 'xmlns' if attr_prefix is None else f'{attr_prefix}xmlns'
+
         self.indent = indent
         self.preserve_root = preserve_root
         self.force_dict = force_dict
         self.force_list = force_list
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name: str, value: Any) -> None:
         if name in {'attr_prefix', 'text_key', 'cdata_prefix'}:
             if value is not None and not isinstance(value, str):
                 msg = '{} must be a str or None, not {}'
                 raise XMLSchemaTypeError(msg.format(name, type(value).__name__))
 
-            if name == 'attr_prefix':
-                self.ns_prefix = (value or '') + 'xmlns'
-
         elif name in {'strip_namespaces', 'preserve_root', 'force_dict', 'force_list'}:
             if not isinstance(value, bool):
                 msg = '{} must be a bool, not {}'
@@ -133,12 +139,12 @@
         super(XMLSchemaConverter, self).__setattr__(name, value)
 
     @property
-    def lossy(self):
+    def lossy(self) -> bool:
         """The converter ignores some kind of XML data during decoding/encoding."""
         return self.cdata_prefix is None or self.text_key is None or self.attr_prefix is None
 
     @property
-    def losslessly(self):
+    def losslessly(self) -> bool:
         """
         The XML data is decoded without loss of quality, neither on data nor on data model
         shape. Only losslessly converters can be always used to encode to an XML data that
@@ -146,7 +152,7 @@
         """
         return False
 
-    def copy(self, **kwargs):
+    def copy(self, **kwargs: Any) -> 'XMLSchemaConverter':
         return type(self)(
             namespaces=kwargs.get('namespaces', self._namespaces),
             dict_class=kwargs.get('dict_class', self.dict),
@@ -162,7 +168,8 @@
             force_list=kwargs.get('force_list', self.force_list),
         )
 
-    def map_attributes(self, attributes):
+    def map_attributes(self, attributes: IterableTuplestr, Any) \
+            -> IteratorTuplestr, Any:
         """
         Creates an iterator for converting decoded attributes to a data structure with
         appropriate prefixes. If the instance has a not-empty map of namespaces registers
@@ -181,7 +188,8 @@
             for name, value in attributes:
                 yield self.map_qname(name), value
 
-    def map_content(self, content):
+    def map_content(self, content: IterableTuplestr, Any, Any) \
+            -> IteratorTuplestr, Any, Any:
         """
         A generator function for converting decoded content to a data structure.
         If the instance has a not-empty map of namespaces registers the mapped URIs
@@ -203,7 +211,11 @@
                 if self.cdata_prefix is not None:
                     yield '%s%s' % (self.cdata_prefix, name), value, xsd_child
 
-    def etree_element(self, tag, text=None, children=None, attrib=None, level=0):
+    def etree_element(self, tag: str,
+                      text: Optionalstr = None,
+                      children: OptionalListElementType = None,
+                      attrib: OptionalDictstr, str = None,
+                      level: int = 0) -> ElementType:
         """
         Builds an ElementTree's Element using arguments and the element class and
         the indent spacing stored in the converter instance.
@@ -213,7 +225,7 @@
         :param children: the list of Element children/subelements.
         :param attrib: a dictionary with Element attributes.
         :param level: the level related to the encoding process (0 means the root).
-        :return: an instance of the Element class setted for the converter instance.
+        :return: an instance of the Element class is set for the converter instance.
         """
         if type(self.etree_element_class) is type(etree_element):
             if attrib is None:
@@ -221,9 +233,11 @@
             else:
                 elem = self.etree_element_class(tag, self.dict(attrib))
         else:
-            nsmap = {prefix if prefix else None: uri for prefix, uri in self._namespaces.items()}
-            elem = self.etree_element_class(tag, nsmap=nsmap)
-            elem.attrib.update(attrib)
+            # FIXME: need a more refined check
+            nsmap = {prefix if prefix else None: uri
+                     for prefix, uri in self._namespaces.items() if uri}
+            elem = self.etree_element_class(tag, nsmap=nsmap)  # type: ignorearg-type
+            elem.attrib.update(attrib)  # type: ignorearg-type
 
         if children:
             elem.extend(children)
@@ -235,14 +249,15 @@
 
         return elem
 
-    def element_decode(self, data, xsd_element, xsd_type=None, level=0):
+    def element_decode(self, data: ElementData, xsd_element: 'XsdElement',
+                       xsd_type: OptionalBaseXsdType = None, level: int = 0) -> Any:
         """

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/jsonml.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/jsonml.py Changed

@@ -8,9 +8,15 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableSequence
+from typing import TYPE_CHECKING, Any, Optional, List, Dict, Type
 
 from ..exceptions import XMLSchemaValueError
-from .default import ElementData, XMLSchemaConverter
+from ..etree import ElementData
+from ..aliases import NamespacesType, BaseXsdType
+from .default import XMLSchemaConverter
+
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class JsonMLConverter(XMLSchemaConverter):
@@ -24,21 +30,27 @@
     :param dict_class: Dictionary class to use for decoded data. Default is `dict`.
     :param list_class: List class to use for decoded data. Default is `list`.
     """
-    def __init__(self, namespaces=None, dict_class=None, list_class=None, **kwargs):
+    __slots__ = ()
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 dict_class: OptionalTypeDictstr, Any = None,
+                 list_class: OptionalTypeListAny = None,
+                 **kwargs: Any) -> None:
         kwargs.update(attr_prefix='', text_key='', cdata_prefix='')
         super(JsonMLConverter, self).__init__(
             namespaces, dict_class, list_class, **kwargs
         )
 
     @property
-    def lossy(self):
+    def lossy(self) -> bool:
         return False
 
     @property
-    def losslessly(self):
+    def losslessly(self) -> bool:
         return True
 
-    def element_decode(self, data, xsd_element, xsd_type=None, level=0):
+    def element_decode(self, data: ElementData, xsd_element: 'XsdElement',
+                       xsd_type: OptionalBaseXsdType = None, level: int = 0) -> Any:
         xsd_type = xsd_type or xsd_element.type
         result_list = self.list()
         result_list.append(self.map_qname(data.tag))
@@ -61,8 +73,9 @@
 
         return result_list
 
-    def element_encode(self, obj, xsd_element, level=0):
-        attributes = {}
+    def element_encode(self, obj: Any, xsd_element: 'XsdElement', level: int = 0) -> ElementData:
+        attributes: Dictstr, Any = {}
+
         if not isinstance(obj, MutableSequence) or not obj:
             raise XMLSchemaValueError("Wrong data format, a not empty list required: %r." % obj)

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/parker.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/parker.py Changed

@@ -8,8 +8,14 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableMapping, MutableSequence
+from typing import TYPE_CHECKING, Any, Optional, List, Dict, Type
 
-from .default import ElementData, XMLSchemaConverter
+from ..etree import ElementData
+from ..aliases import NamespacesType, BaseXsdType
+from .default import XMLSchemaConverter
+
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class ParkerConverter(XMLSchemaConverter):
@@ -25,8 +31,12 @@
     :param preserve_root: If `True` the root element will be preserved. For default \
     the Parker convention remove the document root element, returning only the value.
     """
-    def __init__(self, namespaces=None, dict_class=None, list_class=None,
-                 preserve_root=False, **kwargs):
+    __slots__ = ()
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 dict_class: OptionalTypeDictstr, Any = None,
+                 list_class: OptionalTypeListAny = None,
+                 preserve_root: bool = False, **kwargs: Any) -> None:
         kwargs.update(attr_prefix=None, text_key='', cdata_prefix=None)
         super(ParkerConverter, self).__init__(
             namespaces, dict_class, list_class,
@@ -34,10 +44,11 @@
         )
 
     @property
-    def lossy(self):
+    def lossy(self) -> bool:
         return True
 
-    def element_decode(self, data, xsd_element, xsd_type=None, level=0):
+    def element_decode(self, data: ElementData, xsd_element: 'XsdElement',
+                       xsd_type: OptionalBaseXsdType = None, level: int = 0) -> Any:
         xsd_type = xsd_type or xsd_element.type
         preserve_root = self.preserve_root
         if xsd_type.simple_type is not None:
@@ -75,7 +86,8 @@
             else:
                 return result_dict if result_dict else None
 
-    def element_encode(self, obj, xsd_element, level=0):
+    def element_encode(self, obj: Any, xsd_element: 'XsdElement', level: int = 0) -> ElementData:
+        name: str = xsd_element.name
         if not isinstance(obj, MutableMapping):
             if obj == '':
                 obj = None
@@ -88,13 +100,18 @@
                 return ElementData(xsd_element.name, None, None, {})
             elif self.preserve_root:
                 try:
-                    items = objself.map_qname(xsd_element.name)
+                    items = objself.map_qname(name)
                 except KeyError:
                     return ElementData(xsd_element.name, None, None, {})
             else:
                 items = obj
 
             try:
+                xsd_group = xsd_element.type.model_group
+                if xsd_group is None:
+                    xsd_group = xsd_element.any_type.model_group
+                    assert xsd_group is not None
+
                 content = 
                 for name, value in obj.items():
                     ns_name = self.unmap_qname(name)
@@ -104,10 +121,10 @@
                         for item in value:
                             content.append((ns_name, item))
                     else:
-                        for xsd_child in xsd_element.type.content.iter_elements():
+                        for xsd_child in xsd_group.iter_elements():
                             matched_element = xsd_child.match(ns_name, resolve=True)
                             if matched_element is not None:
-                                if matched_element.type.is_list():
+                                if matched_element.type and matched_element.type.is_list():
                                     content.append((ns_name, value))
                                 else:
                                     content.extend((ns_name, item) for item in value)

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/converters/unordered.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/converters/unordered.py Changed

@@ -8,8 +8,13 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableMapping, MutableSequence
+from typing import TYPE_CHECKING, cast, Any, Dict, Union
 
-from .default import ElementData, XMLSchemaConverter
+from ..etree import ElementData
+from .default import XMLSchemaConverter
+
+if TYPE_CHECKING:
+    from ..validators import XsdElement
 
 
 class UnorderedConverter(XMLSchemaConverter):
@@ -22,7 +27,9 @@
     As the order of the input dictionary is not preserved, character data
     between sibling elements are interleaved between tags.
     """
-    def element_encode(self, obj, xsd_element, level=0):
+    __slots__ = ()
+
+    def element_encode(self, obj: Any, xsd_element: 'XsdElement', level: int = 0) -> ElementData:
         """
         Extracts XML decoded data from a data structure for encoding into an ElementTree.
 
@@ -31,12 +38,12 @@
         :param level: the level related to the encoding process (0 means the root).
         :return: an ElementData instance.
         """
-        if level != 0:
+        if level:
             tag = xsd_element.name
         else:
             tag = xsd_element.qualified_name
             if self.preserve_root and isinstance(obj, MutableMapping):
-                match_local_name = self.strip_namespaces or self.default_namespace
+                match_local_name = cast(bool, self.strip_namespaces or self.default_namespace)
                 match = xsd_element.get_matching_item(obj, self.ns_prefix, match_local_name)
                 if match is not None:
                     obj = match
@@ -44,6 +51,8 @@
         if not isinstance(obj, MutableMapping):
             if xsd_element.type.simple_type is not None:
                 return ElementData(tag, obj, None, {})
+            elif xsd_element.type.mixed and isinstance(obj, (str, bytes)):
+                return ElementData(tag, None, (1, obj), {})
             else:
                 return ElementData(tag, None, obj, {})
 
@@ -57,7 +66,7 @@
         # in a list to retain that structure. Character data are not wrapped into
         # lists because they because they are divided from the rest of the content
         # into the unordered mode generator function of the ModelVisitor class.
-        content_lu = {}
+        content_lu: DictUnionint, str, Any = {}
 
         for name, value in obj.items():
             if name == self.text_key:
@@ -82,12 +91,17 @@
             elif isinstance(value0, (MutableMapping, MutableSequence)):
                 content_luself.unmap_qname(name) = value
             else:
+                xsd_group = xsd_element.type.model_group
+                if xsd_group is None:
+                    xsd_group = xsd_element.any_type.model_group
+                    assert xsd_group is not None
+
                 # `value` is a list but not a list of lists or list of dicts.
                 ns_name = self.unmap_qname(name)
-                for xsd_child in xsd_element.type.content.iter_elements():
+                for xsd_child in xsd_group.iter_elements():
                     matched_element = xsd_child.match(ns_name, resolve=True)
                     if matched_element is not None:
-                        if matched_element.type.is_list():
+                        if matched_element.type and matched_element.type.is_list():
                             content_luself.unmap_qname(name) = value
                         else:
                             content_luself.unmap_qname(name) = value

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/dataobjects.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/dataobjects.py Changed

@@ -7,18 +7,30 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
-from abc import ABCMeta
-from collections.abc import MutableSequence
+import sys
+if sys.version_info < (3, 7):
+    from typing import GenericMeta as ABCMeta
+else:
+    from abc import ABCMeta
+
+from itertools import count
+from typing import TYPE_CHECKING, cast, overload, Any, Dict, List, Iterator, \
+    Optional, Union, Tuple, Type, MutableMapping, MutableSequence
 from elementpath import XPathContext, XPath2Parser
 
 from .exceptions import XMLSchemaAttributeError, XMLSchemaTypeError, XMLSchemaValueError
-from .etree import etree_tostring
+from .etree import ElementData, etree_tostring
+from .aliases import ElementType, XMLSourceType, NamespacesType, BaseXsdType, DecodeType
 from .helpers import get_namespace, get_prefixed_qname, local_name, raw_xml_encode
-from .converters import ElementData, XMLSchemaConverter
+from .converters import XMLSchemaConverter
+from .resources import XMLResource
 from . import validators
 
+if TYPE_CHECKING:
+    from .validators import XMLSchemaValidationError, XsdElement
 
-class DataElement(MutableSequence):
+
+class DataElement(MutableSequence'DataElement'):
     """
     Data Element, an Element like object with decoded data and schema bindings.
 
@@ -30,13 +42,24 @@
     :param xsd_type: an optional XSD type association. Can be provided \
     also if the instance is not bound with an XSD element.
     """
-    value = None
-    tail = None
-    xsd_element = None
-    xsd_type = None
-    _encoder = None
+    _children: List'DataElement'
+    tag: str
+    attrib: Dictstr, Any
+    nsmap: Dictstr, str
+
+    value: OptionalAny = None
+    tail: Optionalstr = None
+    xsd_element: Optional'XsdElement' = None
+    xsd_type: OptionalBaseXsdType = None
+    _encoder: Optional'XsdElement' = None
+
+    def __init__(self, tag: str,
+                 value: OptionalAny = None,
+                 attrib: OptionalDictstr, Any = None,
+                 nsmap: OptionalMutableMappingstr, str = None,
+                 xsd_element: Optional'XsdElement' = None,
+                 xsd_type: OptionalBaseXsdType = None) -> None:
 
-    def __init__(self, tag, value=None, attrib=None, nsmap=None, xsd_element=None, xsd_type=None):
         super(DataElement, self).__init__()
         self._children = 
         self.tag = tag
@@ -45,9 +68,9 @@
 
         if value is not None:
             self.value = value
-        if attrib:
+        if attrib is not None:
             self.attrib.update(attrib)
-        if nsmap:
+        if nsmap is not None:
             self.nsmap.update(nsmap)
 
         if xsd_element is not None:
@@ -58,43 +81,49 @@
         elif self.xsd_element is not None:
             self._encoder = self.xsd_element
 
-    def __getitem__(self, i):
+    @overload
+    def __getitem__(self, i: int) -> 'DataElement': ...
+
+    @overload
+    def __getitem__(self, s: slice) -> MutableSequence'DataElement': ...
+
+    def __getitem__(self, i: Unionint, slice) \
+            -> Union'DataElement', MutableSequence'DataElement':
         return self._childreni
 
-    def __setitem__(self, i, child):
-        assert isinstance(child, DataElement)
+    def __setitem__(self, i: Unionint, slice, child: Any) -> None:
         self._childreni = child
 
-    def __delitem__(self, i):
+    def __delitem__(self, i: Unionint, slice) -> None:
         del self._childreni
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._children)
 
-    def insert(self, i, child):
+    def insert(self, i: int, child: 'DataElement') -> None:
         assert isinstance(child, DataElement)
         self._children.insert(i, child)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '%s(tag=%r)' % (self.__class__.__name__, self.tag)
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator'DataElement':
         yield from self._children
 
-    def __setattr__(self, key, value):
+    def __setattr__(self, key: str, value: Any) -> None:
         if key == 'xsd_element':
             if not isinstance(value, validators.XsdElement):
-                msg = "attribute 'xsd_element' must be an {!r} instance"
-                raise XMLSchemaTypeError(msg.format(validators.XsdElement))
-            elif self.xsd_element is not None and self.xsd_element is not value:
+                raise XMLSchemaTypeError("invalid type for attribute 'xsd_element'")
+            elif self.xsd_element is value:
+                pass
+            elif self.xsd_element is not None:
                 raise XMLSchemaValueError("the instance is already bound to another XSD element")
             elif self.xsd_type is not None and self.xsd_type is not value.type:
                 raise XMLSchemaValueError("the instance is already bound to another XSD type")
 
         elif key == 'xsd_type':
-            if not isinstance(value, validators.XsdType):
-                msg = "attribute 'xsd_type' must be an {!r} instance"
-                raise XMLSchemaTypeError(msg.format(validators.XsdType))
+            if not isinstance(value, (validators.XsdSimpleType, validators.XsdComplexType)):
+                raise XMLSchemaTypeError("invalid type for attribute 'xsd_type'")
             elif self.xsd_type is not None and self.xsd_type is not value:
                 raise XMLSchemaValueError("the instance is already bound to another XSD type")
             elif self.xsd_element is None or value is not self.xsd_element.type:
@@ -108,50 +137,53 @@
         super(DataElement, self).__setattr__(key, value)
 
     @property
-    def text(self):
+    def text(self) -> Optionalstr:
         """The string value of the data element."""
         return raw_xml_encode(self.value)
 
-    def get(self, key, default=None):
+    def get(self, key: str, default: Any = None) -> Any:
         """Gets a data element attribute."""
         return self.attrib.get(key, default)
 
-    def set(self, key, value):
+    def set(self, key: str, value: Any) -> None:
         """Sets a data element attribute."""
         self.attribkey = value
 
     @property
-    def xsd_version(self):
+    def xsd_version(self) -> str:
         return '1.0' if self.xsd_element is None else self.xsd_element.xsd_version
 
     @property
-    def namespace(self):
+    def namespace(self) -> str:
         """The element's namespace."""
         if self.xsd_element is None:
             return get_namespace(self.tag)
         return get_namespace(self.tag) or self.xsd_element.target_namespace
 
     @property
-    def name(self):
+    def name(self) -> str:
         """The element's name, that matches the tag."""
         return self.tag
 
     @property
-    def prefixed_name(self):
+    def prefixed_name(self) -> str:
         """The prefixed name, or the tag if no prefix is defined for its namespace."""
         return get_prefixed_qname(self.tag, self.nsmap)
 
     @property
-    def local_name(self):
+    def local_name(self) -> str:
         """The local part of the tag."""
         return local_name(self.tag)
 
-    def validate(self, use_defaults=True, namespaces=None, max_depth=None):
+    def validate(self, use_defaults: bool = True,
+                 namespaces: OptionalNamespacesType = None,
+                 max_depth: Optionalint = None) -> None:
         """
         Validates the XML data object.

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/documents.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/documents.py Changed

@@ -8,79 +8,104 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 import json
-from collections.abc import Iterator
+from io import IOBase, TextIOBase
+from typing import Any, Dict, List, Optional, Type, Union, Tuple, \
+    IO, BinaryIO, TextIO, Iterator
 
 from .exceptions import XMLSchemaTypeError, XMLSchemaValueError, XMLResourceError
 from .names import XSD_NAMESPACE, XSI_TYPE
 from .etree import ElementTree, etree_tostring
+from .aliases import ElementType, XMLSourceType, NamespacesType, LocationsType, \
+    LazyType, SchemaSourceType, ConverterType, DecodeType, EncodeType, \
+    JsonDecodeType
 from .helpers import is_etree_document
 from .resources import fetch_schema_locations, XMLResource
 from .validators import XMLSchema10, XMLSchemaBase, XMLSchemaValidationError
 
 
-def get_context(source, schema=None, cls=None, locations=None, base_url=None,
-                defuse='remote', timeout=300, lazy=False, dummy_schema=False):
+def get_context(xml_document: UnionXMLSourceType, XMLResource,
+                schema: OptionalUnionXMLSchemaBase, SchemaSourceType = None,
+                cls: OptionalTypeXMLSchemaBase = None,
+                locations: OptionalLocationsType = None,
+                base_url: Optionalstr = None,
+                defuse: str = 'remote',
+                timeout: int = 300,
+                lazy: LazyType = False,
+                dummy_schema: bool = False) -> TupleXMLResource, XMLSchemaBase:
     """
     Get the XML document validation/decode context.
 
     :return: an XMLResource instance and a schema instance.
     """
+    resource: XMLResource
+    kwargs: DictAny, Any
+
     if cls is None:
         cls = XMLSchema10
-    if not isinstance(source, XMLResource):
-        source = XMLResource(source, base_url, defuse=defuse, timeout=timeout, lazy=lazy)
-    if isinstance(schema, XMLSchemaBase) and source.namespace in schema.maps.namespaces:
-        return source, schema
-    if isinstance(source, XmlDocument) and source.schema is not None:
-        return source, source.schema
+    elif not issubclass(cls, XMLSchemaBase):
+        raise XMLSchemaTypeError(f"invalid schema class {cls}")
+
+    if isinstance(xml_document, XMLResource):
+        resource = xml_document
+    else:
+        resource = XMLResource(xml_document, base_url, defuse=defuse,
+                               timeout=timeout, lazy=lazy)
+
+    if isinstance(schema, XMLSchemaBase) and resource.namespace in schema.maps.namespaces:
+        return resource, schema
+    if isinstance(resource, XmlDocument) and isinstance(resource.schema, XMLSchemaBase):
+        return resource, resource.schema
 
     try:
-        schema_location, locations = fetch_schema_locations(source, locations, base_url=base_url)
+        schema_location, locations = fetch_schema_locations(resource, locations, base_url=base_url)
     except ValueError:
         if schema is None:
-            if XSI_TYPE in source.root.attrib:
-                schema = cls.meta_schema
+            if XSI_TYPE in resource.root.attrib and cls.meta_schema is not None:
+                return resource, cls.meta_schema
             elif dummy_schema:
-                return source, get_dummy_schema(source, cls)
+                return resource, get_dummy_schema(resource, cls)
             else:
                 msg = "no schema can be retrieved for the provided XML data"
                 raise XMLSchemaValueError(msg) from None
 
-        elif not isinstance(schema, XMLSchemaBase):
-            schema = cls(schema, validation='strict', locations=locations,
-                         base_url=base_url, defuse=defuse, timeout=timeout)
+        elif isinstance(schema, XMLSchemaBase):
+            return resource, schema
+        else:
+            return resource, cls(schema, locations=locations, base_url=base_url,
+                                 defuse=defuse, timeout=timeout)
     else:
-        schema = cls(schema or schema_location, validation='strict', locations=locations,
-                     defuse=defuse, timeout=timeout)
-
-    return source, schema
+        kwargs = dict(locations=locations, defuse=defuse, timeout=timeout)
+        if schema is None or isinstance(schema, XMLSchemaBase):
+            return resource, cls(schema_location, **kwargs)
+        else:
+            return resource, cls(schema, **kwargs)
 
 
-def get_dummy_schema(xml_resource, schema_class):
-    tag = xml_resource.root.tag
+def get_dummy_schema(resource: XMLResource, cls: TypeXMLSchemaBase) -> XMLSchemaBase:
+    tag = resource.root.tag
     if tag.startswith('{'):
         namespace, name = tag1:.split('}')
     else:
         namespace, name = '', tag
 
     if namespace:
-        return schema_class(
+        return cls(
             '<xs:schema xmlns:xs="{0}" targetNamespace="{1}">\n'
             '    <xs:element name="{2}"/>\n'
             '</xs:schema>'.format(XSD_NAMESPACE, namespace, name)
         )
     else:
-        return schema_class(
+        return cls(
             '<xs:schema xmlns:xs="{0}">\n'
             '    <xs:element name="{1}"/>\n'
             '</xs:schema>'.format(XSD_NAMESPACE, name)
         )
 
 
-def get_lazy_json_encoder(errors):
+def get_lazy_json_encoder(errors: ListXMLSchemaValidationError) -> Typejson.JSONEncoder:
 
     class JSONLazyEncoder(json.JSONEncoder):
-        def default(self, obj):
+        def default(self, obj: Any) -> Any:
             if isinstance(obj, Iterator):
                 while True:
                     result = next(obj, None)
@@ -93,9 +118,18 @@
     return JSONLazyEncoder
 
 
-def validate(xml_document, schema=None, cls=None, path=None, schema_path=None,
-             use_defaults=True, namespaces=None, locations=None, base_url=None,
-             defuse='remote', timeout=300, lazy=False):
+def validate(xml_document: UnionXMLSourceType, XMLResource,
+             schema: OptionalXMLSchemaBase = None,
+             cls: OptionalTypeXMLSchemaBase = None,
+             path: Optionalstr = None,
+             schema_path: Optionalstr = None,
+             use_defaults: bool = True,
+             namespaces: OptionalNamespacesType = None,
+             locations: OptionalLocationsType = None,
+             base_url: Optionalstr = None,
+             defuse: str = 'remote',
+             timeout: int = 300,
+             lazy: LazyType = False) -> None:
     """
     Validates an XML document against a schema instance. This function builds an
     :class:`XMLSchema` object for validating the XML document. Raises an
@@ -127,15 +161,24 @@
     :class:`XMLResource` instances.
     :param lazy: optional argument for construct the :class:`XMLResource` instance.
     """
-    source, schema = get_context(
+    source, _schema = get_context(
         xml_document, schema, cls, locations, base_url, defuse, timeout, lazy
     )
-    schema.validate(source, path, schema_path, use_defaults, namespaces)
-
-
-def is_valid(xml_document, schema=None, cls=None, path=None, schema_path=None,
-             use_defaults=True, namespaces=None, locations=None, base_url=None,
-             defuse='remote', timeout=300, lazy=False):
+    _schema.validate(source, path, schema_path, use_defaults, namespaces)
+
+
+def is_valid(xml_document: UnionXMLSourceType, XMLResource,
+             schema: OptionalXMLSchemaBase = None,
+             cls: OptionalTypeXMLSchemaBase = None,
+             path: Optionalstr = None,
+             schema_path: Optionalstr = None,
+             use_defaults: bool = True,
+             namespaces: OptionalNamespacesType = None,
+             locations: OptionalLocationsType = None,
+             base_url: Optionalstr = None,
+             defuse: str = 'remote',
+             timeout: int = 300,
+             lazy: LazyType = False) -> bool:
     """
     Like :meth:`validate` except that do not raises an exception but returns ``True`` if
     the XML document is valid, ``False`` if it's invalid.
@@ -146,9 +189,18 @@
     return schema.is_valid(source, path, schema_path, use_defaults, namespaces)
 
 
-def iter_errors(xml_document, schema=None, cls=None, path=None, schema_path=None,
-                use_defaults=True, namespaces=None, locations=None, base_url=None,
-                defuse='remote', timeout=300, lazy=False):
+def iter_errors(xml_document: UnionXMLSourceType, XMLResource,
+                schema: OptionalXMLSchemaBase = None,
+                cls: OptionalTypeXMLSchemaBase = None,
+                path: Optionalstr = None,
+                schema_path: Optionalstr = None,
+                use_defaults: bool = True,
+                namespaces: OptionalNamespacesType = None,
+                locations: OptionalLocationsType = None,

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/etree.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/etree.py Changed

@@ -11,8 +11,9 @@
 A unified setup module for ElementTree with a safe parser and helper functions.
 """
 import sys
-import importlib
 import re
+from collections import namedtuple
+from typing import Any, MutableMapping, Optional, Union
 
 from .exceptions import XMLSchemaTypeError
 
@@ -26,31 +27,30 @@
 # defining a safer XMLParser.
 #
 if '_elementtree' in sys.modules:
-    # Temporary remove the loaded modules
-    try:
-        ElementTree = sys.modules.pop('xml.etree.ElementTree')
-    except KeyError:
-        # Reimporting xml.etree.ElementTree causes the loading of pure Python
-        # module instead of the optimized C version, so it's better to raise
-        # an error instead of running silently with mismatched modules.
+    if 'xml.etree.ElementTree' not in sys.modules:
         raise RuntimeError("Inconsistent status for ElementTree module: module "
                            "is missing but the C optimized version is imported.")
 
+    import xml.etree.ElementTree as ElementTree
+
+    # Temporary remove the loaded modules
+    sys.modules.pop('xml.etree.ElementTree')
     _cmod = sys.modules.pop('_elementtree')
 
     # Load the pure Python module
-    sys.modules'_elementtree' = None
-    PyElementTree = importlib.import_module('xml.etree.ElementTree')
+    sys.modules'_elementtree' = None  # type: ignoreassignment
+    import xml.etree.ElementTree as PyElementTree
+    import xml.etree
 
     # Restore original modules
     sys.modules'_elementtree' = _cmod
-    sys.modules'xml.etree'.ElementTree = ElementTree
+    xml.etree.ElementTree = ElementTree
     sys.modules'xml.etree.ElementTree' = ElementTree
 
 else:
     # Load the pure Python module
-    sys.modules'_elementtree' = None
-    PyElementTree = importlib.import_module('xml.etree.ElementTree')
+    sys.modules'_elementtree' = None  # type: ignoreassignment
+    import xml.etree.ElementTree as PyElementTree
 
     # Remove the pure Python module from imported modules
     del sys.modules'xml.etree'
@@ -58,7 +58,7 @@
     del sys.modules'_elementtree'
 
     # Load the C optimized ElementTree module
-    ElementTree = importlib.import_module('xml.etree.ElementTree')
+    import xml.etree.ElementTree as ElementTree
 
 
 etree_element = ElementTree.Element
@@ -76,38 +76,56 @@
     :param encoding: if provided, its value overrides the encoding specified \
     in the XML file.
     """
-    def __init__(self, target=None, encoding=None):
+    def __init__(self, target: OptionalAny = None, encoding: Optionalstr = None) -> None:
         super(SafeXMLParser, self).__init__(target=target, encoding=encoding)
         self.parser.EntityDeclHandler = self.entity_declaration
         self.parser.UnparsedEntityDeclHandler = self.unparsed_entity_declaration
         self.parser.ExternalEntityRefHandler = self.external_entity_reference
 
-    def entity_declaration(self, entity_name, is_parameter_entity, value, base,
+    def entity_declaration(self, entity_name, is_parameter_entity, value, base,  # type: ignore
                            system_id, public_id, notation_name):
         raise PyElementTree.ParseError(
             "Entities are forbidden (entity_name={!r})".format(entity_name)
         )
 
-    def unparsed_entity_declaration(self, entity_name, base, system_id,
+    def unparsed_entity_declaration(self, entity_name, base, system_id,  # type: ignore
                                     public_id, notation_name):
         raise PyElementTree.ParseError(
             "Unparsed entities are forbidden (entity_name={!r})".format(entity_name)
         )
 
-    def external_entity_reference(self, context, base, system_id, public_id):
+    def external_entity_reference(self, context, base, system_id, public_id):  # type: ignore
         raise PyElementTree.ParseError(
             "External references are forbidden (system_id={!r}, "
             "public_id={!r})".format(system_id, public_id)
         )  # pragma: no cover (EntityDeclHandler is called before)
 
 
-def is_etree_element(obj):
+ElementData = namedtuple('ElementData', 'tag', 'text', 'content', 'attributes')
+"""
+Namedtuple for Element data interchange between decoders and converters.
+The field *tag* is a string containing the Element's tag, *text* can be `None`
+or a string representing the Element's text, *content* can be `None`, a list
+containing the Element's children or a dictionary containing element name to
+list of element contents for the Element's children (used for unordered input
+data), *attributes* can be `None` or a dictionary containing the Element's
+attributes.
+"""
+
+
+def is_etree_element(obj: Any) -> bool:
     """A checker for valid ElementTree elements that excludes XsdElement objects."""
     return hasattr(obj, 'append') and hasattr(obj, 'tag') and hasattr(obj, 'attrib')
 
 
-def etree_tostring(elem, namespaces=None, indent='', max_lines=None, spaces_for_tab=None,
-                   xml_declaration=None, encoding='unicode', method='xml'):
+def etree_tostring(elem: etree_element,
+                   namespaces: OptionalMutableMappingstr, str = None,
+                   indent: str = '',
+                   max_lines: Optionalint = None,
+                   spaces_for_tab: Optionalint = None,
+                   xml_declaration: Optionalbool = None,
+                   encoding: str = 'unicode',
+                   method: str = 'xml') -> Unionstr, bytes:
     """
     Serialize an Element tree to a string. Tab characters are replaced by whitespaces.
 
@@ -125,7 +143,7 @@
     :param method: is either "xml" (the default), "html" or "text".
     :return: a Unicode string.
     """
-    def reindent(line):
+    def reindent(line: str) -> str:
         if not line:
             return line
         elif line.startswith(min_indent):
@@ -133,6 +151,7 @@
         else:
             return indent + line
 
+    etree_module: Any
     if not is_etree_element(elem):
         raise XMLSchemaTypeError("{!r} is not an Element".format(elem))
 
@@ -141,7 +160,7 @@
     elif not hasattr(elem, 'nsmap'):
         etree_module = ElementTree
     else:
-        etree_module = importlib.import_module('lxml.etree')
+        import lxml.etree as etree_module  # type: ignoreno-redef
 
     if namespaces:
         default_namespace = namespaces.get('')
@@ -200,3 +219,7 @@
     if encoding == 'unicode':
         return '\n'.join(reindent(line) for line in lines)
     return '\n'.join(reindent(line) for line in lines).encode(encoding)
+
+
+__all__ = 'ElementTree', 'PyElementTree', 'ParseError', 'SafeXMLParser', 'etree_element',
+           'py_etree_element', 'ElementData', 'is_etree_element', 'etree_tostring'

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/exceptions.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/exceptions.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/extras/codegen.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/extras/codegen.py Changed

@@ -19,8 +19,11 @@
 from abc import ABC, ABCMeta
 from fnmatch import fnmatch
 from pathlib import Path
+from typing import Optional, List
+
 from jinja2 import Environment, ChoiceLoader, FileSystemLoader, \
     TemplateNotFound, TemplateAssertionError
+from elementpath import datatypes
 
 import xmlschema
 from xmlschema.validators import XsdType, XsdElement, XsdAttribute
@@ -55,10 +58,6 @@
 
 
 logger = logging.getLogger('xmlschema-codegen')
-logging_formatter = logging.Formatter('%(levelname)s %(message)s')
-logging_handler = logging.StreamHandler(sys.stderr)
-logging_handler.setFormatter(logging_formatter)
-logger.addHandler(logging_handler)
 
 
 class GeneratorMeta(ABCMeta):
@@ -126,10 +125,10 @@
     in generator class.
     :param types_map: a dictionary with custom mapping for XSD types.
     """
-    formal_language = None
+    formal_language: Optionalstr = None
     """The formal language associated to the code generator (eg. Python)."""
 
-    searchpaths = None
+    searchpaths: OptionalListstr = None
     """
     Directory paths for searching templates, specified with a list or a tuple.
     Each path must be provided as relative from the directory of the module
@@ -262,7 +261,7 @@
                 logger.info("write file %r", str(output_file))
                 with open(output_file, 'w') as fp:
                     fp.write(result)
-                rendered.append(template.filename)
+                rendered.append(str(output_file))
 
         return rendered
 
@@ -359,43 +358,48 @@
 
             try:
                 if obj0 == '{':
-                    namespace, local_name = obj.split('}')
+                    namespace, local_name = obj1:.split('}')
                     for prefix, uri in self.schema.namespaces.items():
                         if uri == namespace:
-                            qname = '%s:%s' % (uri, local_name)
+                            qname = '%s:%s' % (prefix, local_name)
                             break
                     else:
                         qname = local_name
                 else:
                     qname = obj
-            except (IndexError, ValueError):
+            except IndexError:
+                return ''
+            except ValueError:
                 return unnamed
 
         if not qname or QNAME_PATTERN.match(qname) is None:
             return unnamed
         return qname.replace('.', '_').replace('-', '_').replace(':', sep)
 
-    @staticmethod
     @filter_method
-    def namespace(obj):
+    def namespace(self, obj):
+        """Get the namespace URI of the provided object."""
         try:
             namespace = obj.target_namespace
         except AttributeError:
-            try:
-                obj = obj.name
-            except AttributeError:
-                pass
+            if isinstance(obj, datatypes.QName):
+                return obj.namespace
+            elif not isinstance(obj, str):
+                return ''
 
             try:
-                if not isinstance(obj, str) or obj0 != '{':
+                if obj0 == '{':
+                    namespace, _ = obj1:.split('}')
+                    return namespace
+                elif ':' in obj:
+                    prefix, _ = obj.split(':')
+                    return self.schema.namespaces.get(prefix, '')
+                else:
                     return ''
-                namespace, _ = obj.split('}')
             except (IndexError, ValueError):
                 return ''
         else:
-            if not isinstance(namespace, str):
-                return ''
-        return namespace
+            return namespace if isinstance(namespace, str) else ''
 
     @staticmethod
     @filter_method
@@ -416,9 +420,6 @@
         else:
             name = unnamed
 
-        if not name or NCNAME_PATTERN.match(name) is None:
-            name = unnamed
-
         if name.endswith('Type'):
             name = name:-4
         elif name.endswith('_type'):
@@ -449,9 +450,6 @@
         else:
             qname = unnamed
 
-        if not qname or QNAME_PATTERN.match(qname) is None:
-            qname = unnamed
-
         if qname.endswith('Type'):
             qname = qname:-4
         elif qname.endswith('_type'):
@@ -466,10 +464,11 @@
     @filter_method
     def sort_types(xsd_types, accept_circularity=False):
         """
-        Returns a sorted sequence of XSD types. Sorted types can be used to build code declarations.
+        Returns a sorted sequence of XSD types usable for building type declarations.
 
         :param xsd_types: a sequence with XSD types.
-        :param accept_circularity: if set to `True` circularities are accepted. Defaults to `False`.
+        :param accept_circularity: if set to `True` circularities \
+        are accepted. Defaults to `False`.
         :return: a list with ordered types.
         """
         if not isinstance(xsd_types, (list, tuple)):
@@ -484,7 +483,7 @@
         unordered = {x:  for x in xsd_types if x.is_complex() and not x.has_simple_content()}
 
         for xsd_type in unordered:
-            for e in xsd_type.content_type.iter_elements():
+            for e in xsd_type.content.iter_elements():
                 if e.type in unordered:
                     unorderedxsd_type.append(e.type)
 
@@ -502,7 +501,7 @@
 
             if not deleted:
                 if not accept_circularity:
-                    raise ValueError("Circularity found between {!r}".format(list(unordered)))
+                    raise ValueError("circularity found between {!r}".format(list(unordered)))
                 ordered_types.extend(list(unordered))
                 break
 
@@ -510,23 +509,32 @@
         return ordered_types
 
     def is_derived(self, xsd_type, *names, derivation=None):
+        """
+        Returns `True` if the argument XSD type is derived from any
+        of other types expressed by name, otherwise returns `False`.
+
+        :param xsd_type: an XsdComplexType/XsdSimpleType instance.
+        :param names: positional argument with the names of other \
+        XSD types.
+        :param derivation: the type of derivation, that can be \
+        *extension* or *restriction*, or both with a space separator. \
+        If no value is provided it only checks if it is derived from \
+        or if it is the XSD type itself.
+        """
         for type_name in names:
             if not isinstance(type_name, str) or not type_name:
-                continue
-            elif type_name0 == '{':
-                if xsd_type.is_derived(self.schema.maps.typestype_name, derivation):
-                    return True
-            elif ':' in type_name:
+                continue  # pragma: no cover
+            elif type_name0 != '{' and ':' in type_name:
                 try:
-                    other = self.schema.resolve_qname(type_name)
+                    type_name = self.schema.resolve_qname(type_name)
                 except xmlschema.XMLSchemaException:
                     continue
-                else:
-                    if xsd_type.is_derived(other, derivation):
-                        return True
-            else:
-                if xsd_type.is_derived(self.schema.typestype_name, derivation):
+
+            try:
+                if xsd_type.is_derived(self.schema.maps.typestype_name, derivation):
                     return True
+            except KeyError:

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/extras/templates/python/bindings.py.jinja -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/extras/templates/python/bindings.py.jinja Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/helpers.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/helpers.py Changed

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-2021, SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
 # See the file 'LICENSE' in the root directory of the present
@@ -10,11 +10,11 @@
 import re
 from collections import Counter
 from decimal import Decimal
-from typing import Callable, Dict, Iterator, Optional, Tuple, Union
+from typing import Any, Callable, Iterator, List, MutableMapping, \
+    Optional, Tuple, Union
 from .exceptions import XMLSchemaValueError, XMLSchemaTypeError
 from .names import XSI_SCHEMA_LOCATION, XSI_NONS_SCHEMA_LOCATION
-
-from xml.etree.ElementTree import Element
+from .aliases import ElementType, NamespacesType, AtomicValueType, NumericValueType
 
 ###
 # Helper functions for QNames
@@ -22,23 +22,23 @@
 NAMESPACE_PATTERN = re.compile(r'{(^}*)}')
 
 
-def get_namespace(qname: str, namespaces: OptionalDictstr, str = None) -> str:
+def get_namespace(qname: str, namespaces: OptionalNamespacesType = None) -> str:
     """
     Returns the namespace URI associated with a QName. If a namespace map is
     provided tries to resolve a prefixed QName and then to extract the namespace.
 
     :param qname: an extended QName or a local name or a prefixed QName.
-    :param namespaces: optional dictionary with a map from prefixes to namespace URIs.
+    :param namespaces: optional mapping from prefixes to namespace URIs.
     """
     if not qname:
         return ''
     elif qname0 != '{':
-        if not namespaces:
+        if namespaces is None:
             return ''
         qname = get_extended_qname(qname, namespaces)
 
     try:
-        return NAMESPACE_PATTERN.match(qname).group(1)
+        return NAMESPACE_PATTERN.match(qname).group(1)  # type: ignoreunion-attr
     except (AttributeError, TypeError):
         return ''
 
@@ -75,22 +75,22 @@
     except ValueError:
         raise XMLSchemaValueError("the argument 'qname' has a wrong format: %r" % qname)
     except TypeError:
-        if qname is None:
-            return qname
-        raise XMLSchemaTypeError("the argument 'qname' must be a string-like object or None")
+        raise XMLSchemaTypeError("the argument 'qname' must be a string")
     else:
         return qname
 
 
-def get_prefixed_qname(qname: str, namespaces: Dictstr, str, use_empty: bool = True) -> str:
+def get_prefixed_qname(qname: str,
+                       namespaces: OptionalMutableMappingstr, str,
+                       use_empty: bool = True) -> str:
     """
     Get the prefixed form of a QName, using a namespace map.
 
     :param qname: an extended QName or a local name or a prefixed QName.
-    :param namespaces: a dictionary with a map from prefixes to namespace URIs.
+    :param namespaces: an optional mapping from prefixes to namespace URIs.
     :param use_empty: if `True` use the empty prefix for mapping.
     """
-    if not qname or qname0 != '{':
+    if not namespaces or not qname or qname0 != '{':
         return qname
 
     namespace = get_namespace(qname)
@@ -108,14 +108,17 @@
         return qname
 
 
-def get_extended_qname(qname: str, namespaces: Dictstr, str) -> str:
+def get_extended_qname(qname: str, namespaces: OptionalMutableMappingstr, str) -> str:
     """
     Get the extended form of a QName, using a namespace map.
     Local names are mapped to the default namespace.
 
     :param qname: a prefixed QName or a local name or an extended QName.
-    :param namespaces: a dictionary with a map from prefixes to namespace URIs.
+    :param namespaces: an optional mapping from prefixes to namespace URIs.
     """
+    if not namespaces:
+        return qname
+
     try:
         if qname0 == '{':
             return qname
@@ -151,9 +154,11 @@
     return hasattr(obj, 'getroot') and hasattr(obj, 'parse') and hasattr(obj, 'iter')
 
 
-def etree_iterpath(elem: Element, tag: Optionalstr = None,
-                   path='.', namespaces: OptionalDictstr, str = None,
-                   add_position=False) -> IteratorTupleElement, str:
+def etree_iterpath(elem: ElementType,
+                   tag: Optionalstr = None,
+                   path: str = '.',
+                   namespaces: OptionalNamespacesType = None,
+                   add_position: bool = False) -> IteratorTupleElementType, str:
     """
     Creates an iterator for the element and its subelements that yield elements and paths.
     If tag is not `None` or '*', only elements whose matches tag are returned from the iterator.
@@ -172,10 +177,10 @@
         yield elem, path
 
     if add_position:
-        children_tags = Counter(e.tag for e in elem)
-        positions = Counter(t for t in children_tags if children_tagst > 1)
+        children_tags = Counter(e.tag for e in elem)
+        positions = Counter(t for t in children_tags if children_tagst > 1)
     else:
-        positions = ()
+        positions = Counter()
 
     for child in elem:
         if callable(child.tag):
@@ -194,14 +199,18 @@
         yield from etree_iterpath(child, tag, child_path, namespaces, add_position)
 
 
-def etree_getpath(elem: Element, root: Element, namespaces: OptionalDictstr, str = None,
-                  relative=True, add_position=False, parent_path=False) -> Optionalstr:
+def etree_getpath(elem: ElementType,
+                  root: ElementType,
+                  namespaces: OptionalNamespacesType = None,
+                  relative: bool = True,
+                  add_position: bool = False,
+                  parent_path: bool = False) -> Optionalstr:
     """
     Returns the XPath path from *root* to descendant *elem* element.
 
     :param elem: the descendant element.
     :param root: the root element.
-    :param namespaces: is an optional mapping from namespace prefix to URI.
+    :param namespaces: an optional mapping from namespace prefix to URI.
     :param relative: returns a relative path.
     :param add_position: add context position to child elements that appear multiple times.
     :param parent_path: if set to `True` returns the parent path. Default is `False`.
@@ -222,9 +231,10 @@
         for e, path in etree_iterpath(root, None, path, namespaces, add_position):
             if elem in e:
                 return path
+    return None
 
 
-def etree_iter_location_hints(elem: Element) -> IteratorElement:
+def etree_iter_location_hints(elem: ElementType) -> IteratorTupleAny, Any:
     """Yields schema location hints contained in the attributes of an element."""
     if XSI_SCHEMA_LOCATION in elem.attrib:
         locations = elem.attribXSI_SCHEMA_LOCATION.split()
@@ -236,7 +246,8 @@
             yield '', url
 
 
-def prune_etree(root: Element, selector: CallableElement, bool) -> Optionalbool:
+def prune_etree(root: ElementType, selector: CallableElementType, bool) \
+        -> Optionalbool:
     """
     Removes from an tree structure the elements that verify the selector
     function. The checking and eventual removals are performed using a
@@ -246,7 +257,7 @@
     :param selector: the single argument function to apply on each visited node.
     :return: `True` if the root node verify the selector function, `None` otherwise.
     """
-    def _prune_subtree(elem):
+    def _prune_subtree(elem: ElementType) -> None:
         for child in elem::
             if selector(child):
                 elem.remove(child)
@@ -258,13 +269,10 @@
         del root:
         return True
     _prune_subtree(root)
+    return None
 
 
-def not_whitespace(s: Optionalstr) -> bool:
-    return s and s.strip()
-
-
-def count_digits(number: Unionstr, bytes, int, float, Decimal) -> Tupleint, int:
+def count_digits(number: NumericValueType) -> Tupleint, int:
     """
     Counts the digits of a number.
 
@@ -280,9 +288,9 @@
         number = str(number).lstrip('-+')

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/namespaces.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/namespaces.py Changed

@@ -11,29 +11,33 @@
 This module contains classes for managing maps related to namespaces.
 """
 import re
-from collections.abc import MutableMapping, Mapping
+from typing import Any, Container, Dict, Iterator, List, Optional, MutableMapping, \
+    Mapping, TypeVar
 
 from .exceptions import XMLSchemaValueError, XMLSchemaTypeError
 from .helpers import local_name
+from .aliases import NamespacesType
 
 
 ###
 # Base classes for managing namespaces
 
-class NamespaceResourcesMap(MutableMapping):
+class NamespaceResourcesMap(MutableMappingstr, Any):
     """
     Dictionary for storing information about namespace resources. The values are
-    lists of strings. Setting an existing value appends the string to the value.
+    lists of objects. Setting an existing value appends the object to the value.
     Setting a value with a list sets/replaces the value.
     """
-    def __init__(self, *args, **kwargs):
-        self._store = dict()
+    __slots__ = ('_store',)
+
+    def __init__(self, *args: Any, **kwargs: Any):
+        self._store: Dictstr, ListAny = {}
         self.update(*args, **kwargs)
 
-    def __getitem__(self, uri):
+    def __getitem__(self, uri: str) -> Any:
         return self._storeuri
 
-    def __setitem__(self, uri, value):
+    def __setitem__(self, uri: str, value: Any) -> None:
         if isinstance(value, list):
             self._storeuri = value:
         else:
@@ -42,23 +46,23 @@
             except KeyError:
                 self._storeuri = value
 
-    def __delitem__(self, uri):
+    def __delitem__(self, uri: str) -> None:
         del self._storeuri
 
-    def __iter__(self):
+    def __iter__(self) -> Iteratorstr:
         return iter(self._store)
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._store)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return repr(self._store)
 
-    def clear(self):
+    def clear(self) -> None:
         self._store.clear()
 
 
-class NamespaceMapper(MutableMapping):
+class NamespaceMapper(MutableMappingstr, str):
     """
     A class to map/unmap namespace prefixes to URIs. The mapped namespaces are
     automatically registered when set. Namespaces can be updated overwriting
@@ -70,49 +74,53 @@
     :param strip_namespaces: if set to `True` uses name mapping methods that strip \
     namespace information.
     """
-    def __init__(self, namespaces=None, strip_namespaces=False):
+    __slots__ = '_namespaces', 'strip_namespaces', '__dict__'
+    _namespaces: NamespacesType
+
+    def __init__(self, namespaces: OptionalNamespacesType = None,
+                 strip_namespaces: bool = False):
         if namespaces is None:
             self._namespaces = {}
         else:
             self._namespaces = namespaces
         self.strip_namespaces = strip_namespaces
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name: str, value: str) -> None:
         if name == 'strip_namespaces':
             if value:
-                self.map_qname = self.unmap_qname = self._local_name
+                self.map_qname = self.unmap_qname = self._local_name  # type: ignoreassignment
             elif getattr(self, 'strip_namespaces', False):
-                self.map_qname = self._map_qname
-                self.unmap_qname = self._unmap_qname
+                self.map_qname = self._map_qname  # type: ignoreassignment
+                self.unmap_qname = self._unmap_qname  # type: ignoreassignment
         super(NamespaceMapper, self).__setattr__(name, value)
 
-    def __getitem__(self, prefix):
+    def __getitem__(self, prefix: str) -> str:
         return self._namespacesprefix
 
-    def __setitem__(self, prefix, uri):
+    def __setitem__(self, prefix: str, uri: str) -> None:
         self._namespacesprefix = uri
 
-    def __delitem__(self, prefix):
+    def __delitem__(self, prefix: str) -> None:
         del self._namespacesprefix
 
-    def __iter__(self):
+    def __iter__(self) -> Iteratorstr:
         return iter(self._namespaces)
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._namespaces)
 
     @property
-    def namespaces(self):
+    def namespaces(self) -> NamespacesType:
         return self._namespaces
 
     @property
-    def default_namespace(self):
+    def default_namespace(self) -> Optionalstr:
         return self._namespaces.get('')
 
-    def clear(self):
+    def clear(self) -> None:
         self._namespaces.clear()
 
-    def insert_item(self, prefix, uri):
+    def insert_item(self, prefix: str, uri: str) -> None:
         """
         A method for setting an item that checks the prefix before inserting.
         In case of collision the prefix is changed adding a numerical suffix.
@@ -136,7 +144,7 @@
                 prefix += '0'
         self._namespacesprefix = uri
 
-    def _map_qname(self, qname):
+    def _map_qname(self, qname: str) -> str:
         """
         Converts an extended QName to the prefixed format. Only registered
         namespaces are mapped.
@@ -163,7 +171,8 @@
 
     map_qname = _map_qname
 
-    def _unmap_qname(self, qname, name_table=None):
+    def _unmap_qname(self, qname: str,
+                     name_table: OptionalContainerOptionalstr = None) -> str:
         """
         Converts a QName in prefixed format or a local name to the extended QName format.
         Local names are converted only if a default namespace is included in the instance.
@@ -202,10 +211,10 @@
     unmap_qname = _unmap_qname
 
     @staticmethod
-    def _local_name(qname, *_args, **_kwargs):
+    def _local_name(qname: str, *_args: Any, **_kwargs: Any) -> str:
         return local_name(qname)
 
-    def transfer(self, namespaces):
+    def transfer(self, namespaces: NamespacesType) -> None:
         """
         Transfers compatible prefix/namespace registrations from a dictionary.
         Registrations added to namespace mapper instance are deleted from argument.
@@ -225,12 +234,17 @@
             del namespacesk
 
 
-class NamespaceView(Mapping):
+T = TypeVar('T')
+
+
+class NamespaceView(Mappingstr, T):
     """
     A read-only map for filtered access to a dictionary that stores
     objects mapped from QNames in extended format.
     """
-    def __init__(self, qname_dict, namespace_uri):
+    __slots__ = 'target_dict', 'namespace', '_key_fmt'
+
+    def __init__(self, qname_dict: Dictstr, T, namespace_uri: str):
         self.target_dict = qname_dict
         self.namespace = namespace_uri
         if namespace_uri:
@@ -238,16 +252,16 @@
         else:
             self._key_fmt = '%s'
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str) -> T:
         return self.target_dictself._key_fmt % key
 
-    def __len__(self):

_service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/py.typed Added

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/resources.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/resources.py Changed

@@ -1,4 +1,4 @@
-#
+#
 # Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
@@ -7,37 +7,49 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
+import copy
 import os.path
+import platform
 import re
-from string import ascii_letters
-from elementpath import iter_select, XPath1Parser, XPathContext, XPath2Parser
+import string
 from io import StringIO, BytesIO
-from urllib.request import urlopen, pathname2url
-from urllib.parse import uses_relative, urlsplit, urljoin, urlunsplit
+from pathlib import Path, PurePath, PurePosixPath, PureWindowsPath
+from typing import cast, Any, AnyStr, Dict, Optional, IO, Iterator, List, \
+    MutableMapping, Union, Tuple
+from urllib.request import urlopen
+from urllib.parse import urlsplit, urlunsplit, unquote, quote_from_bytes
 from urllib.error import URLError
 
+from elementpath import iter_select, XPathContext, XPath2Parser
+from elementpath.protocols import ElementProtocol
+
 from .exceptions import XMLSchemaTypeError, XMLSchemaValueError, XMLResourceError
 from .names import XML_NAMESPACE
 from .etree import ElementTree, PyElementTree, SafeXMLParser, etree_tostring
+from .aliases import ElementType, ElementTreeType, NamespacesType, XMLSourceType, \
+    NormalizedLocationsType, LocationsType, NsmapType, ParentMapType
 from .helpers import get_namespace, is_etree_element, is_etree_document, \
     etree_iter_location_hints
 
-DEFUSE_MODES = ('never', 'remote', 'always')
-SECURITY_MODES = ('all', 'remote', 'local', 'sandbox')
-
+DEFUSE_MODES = frozenset(('never', 'remote', 'always'))
+SECURITY_MODES = frozenset(('all', 'remote', 'local', 'sandbox'))
 
 ###
 # Restricted XPath parser for XML resources
-LAZY_XML_XPATH_SYMBOLS = {
+LAZY_XML_XPATH_SYMBOLS = frozenset((
     'position', 'last', 'not', 'and', 'or', '!=', '<=', '>=', '(', ')', 'text',
-    '', '', '.', ',', '/', '|', '*', '=', '<', '>', ':', '(end)', '(name)',
-    '(string)', '(float)', '(decimal)', '(integer)', '@'
-}
+    '', '', '.', ',', '/', '|', '*', '=', '<', '>', ':', '@', '(end)',
+    '(unknown)', '(invalid)', '(name)', '(string)', '(float)', '(decimal)',
+    '(integer)'
+))
+
+DRIVE_LETTERS = frozenset(string.ascii_letters)
 
 
 class LazyXPath2Parser(XPath2Parser):
     symbol_table = {
-        k: v for k, v in XPath1Parser.symbol_table.items() if k in LAZY_XML_XPATH_SYMBOLS
+        k: v for k, v in XPath2Parser.symbol_table.items()  # type: ignoremisc
+        if k in LAZY_XML_XPATH_SYMBOLS
     }
     SYMBOLS = LAZY_XML_XPATH_SYMBOLS
 
@@ -45,15 +57,15 @@
 class LazySelector:
     """A limited XPath selector class for lazy XML resources."""
 
-    def __init__(self, path, namespaces=None):
+    def __init__(self, path: str, namespaces: OptionalNamespacesType = None) -> None:
         self.parser = LazyXPath2Parser(namespaces, strict=False)
         self.path = path
         self.root_token = self.parser.parse(path)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '%s(path=%r)' % (self.__class__.__name__, self.path)
 
-    def select(self, root, **kwargs):
+    def select(self, root: ElementProtocol, **kwargs: Any) -> ListElementProtocol:
         context = XPathContext(root, **kwargs)
         results = self.root_token.get_results(context)
         if not isinstance(results, list) or any(not is_etree_element(x) for x in results):
@@ -61,151 +73,230 @@
             raise XMLResourceError(msg)
         return results
 
-    def iter_select(self, root, **kwargs):
+    def iter_select(self, root: ElementProtocol, **kwargs: Any) -> IteratorElementProtocol:
         context = XPathContext(root, **kwargs)
         for elem in self.root_token.select_results(context):
             if not is_etree_element(elem):
                 msg = "XPath expressions on lazy resources can select only elements"
                 raise XMLResourceError(msg)
-            yield elem
+            yield cast(ElementProtocol, elem)
 
 
 ###
 # URL normalization (that fixes many headaches :)
+class _PurePath(PurePath):
+    """
+    A version of pathlib.PurePath adapted for managing the creation
+    from URIs and the simple normalization of paths.
+    """
+    _from_parts: Any
+    _flavour: Any
+
+    def __new__(cls, *args: str) -> '_PurePath':
+        if cls is _PurePath:
+            cls = _PureWindowsPath if os.name == 'nt' else _PurePosixPath
+        return cast('_PurePath', cls._from_parts(args))
+
+    @classmethod
+    def from_uri(cls, uri: str) -> '_PurePath':
+        uri = uri.strip()
+        if not uri:
+            raise XMLSchemaValueError("Empty URI provided!")
+
+        if uri.startswith(r'\\'):
+            return _PureWindowsPath(uri)  # UNC path
+        elif uri.startswith('/'):
+            return cls(uri)
+
+        parts = urlsplit(uri)
+        if not parts.scheme:
+            return cls(uri)
+        elif parts.scheme in DRIVE_LETTERS and len(parts.scheme) == 1:
+            return _PureWindowsPath(uri)  # Eg. k:/Python/lib/....
+        elif parts.scheme != 'file':
+            return _PurePosixPath(unquote(parts.path))
+
+        # Get file URI path because urlsplit does not parse it well
+        start = 7 if uri.startswith('file:///') else 5
+        if parts.query:
+            path = uristart:uri.index('?')
+        elif parts.fragment:
+            path = uristart:uri.index('#')
+        else:
+            path = uristart:
+
+        if ':' in path:
+            # Windows path with a drive
+            pos = path.index(':')
+            if pos == 2 and path0 == '/' and path1 in DRIVE_LETTERS:
+                return _PureWindowsPath(unquote(path1:))
+
+            obj = _PureWindowsPath(unquote(path))
+            if len(obj.drive) != 2 or obj.drive1 != ':':
+                raise XMLSchemaValueError("Invalid URI {!r}".format(uri))
+            return obj
+
+        if '\\' in path:
+            return _PureWindowsPath(unquote(path))
+        return cls(unquote(path))
+
+    def as_uri(self) -> str:
+        if not self.is_absolute():
+            uri: str = self._flavour.make_uri(self)
+            while uri.startswith('file:/'):
+                uri = uri.replace('file:/', 'file:', 1)
+            return uri
+
+        uri = cast(str, self._flavour.make_uri(self))
+        if isinstance(self, _PureWindowsPath) and str(self).startswith(r'\\'):
+            # UNC format case: use the format where the host part is included
+            # in the path part, to let urlopen() works.
+            if not uri.startswith('file:////'):
+                return uri.replace('file://', 'file:////')
+        return uri
+
+    def normalize(self) -> '_PurePath':
+        normalized_path = self._flavour.pathmod.normpath(str(self))
+        return cast('_PurePath', self._from_parts((normalized_path,)))
+
+
+class _PurePosixPath(_PurePath, PurePosixPath):
+    __slots__ = ()
 
-def normalize_url(url, base_url=None, keep_relative=False):
+
+class _PureWindowsPath(_PurePath, PureWindowsPath):
+    __slots__ = ()
+
+
+def normalize_url(url: str, base_url: Optionalstr = None,
+                  keep_relative: bool = False) -> str:
     """
-    Returns a normalized URL doing a join with a base URL. URL scheme defaults to 'file' and
-    backslashes are replaced with slashes. For file paths the os.path.join is used instead of
-    urljoin.
+    Returns a normalized URL eventually joining it to a base URL if it's a relative path.
+    Path names are converted to 'file' scheme URLs.
 
     :param url: a relative or absolute URL.
-    :param base_url: the reference base URL for construct the normalized URL from \

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/testing/builders.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/testing/builders.py Changed

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
 # All rights reserved.
@@ -10,15 +9,20 @@
 #
 import pdb
 import os
+import ast
 import pickle
 import time
 import logging
+import importlib
+import tempfile
 import warnings
+from typing import Optional, Type
 
 try:
     import lxml.etree as lxml_etree
 except ImportError:
-    lxml_etree = lxml_etree_element = None
+    lxml_etree = None  # type: ignoreassignment
+    lxml_etree_element = None
 else:
     lxml_etree_element = lxml_etree.Element
 
@@ -26,11 +30,19 @@
 from xmlschema import XMLSchemaBase, XMLSchema11, XMLSchemaValidationError, \
     XMLSchemaParseError, UnorderedConverter, ParkerConverter, BadgerFishConverter, \
     AbderaConverter, JsonMLConverter, ColumnarConverter
+from xmlschema.names import XSD_IMPORT
+from xmlschema.helpers import local_name
 from xmlschema.etree import etree_tostring, ElementTree, \
     py_etree_element
 from xmlschema.resources import fetch_namespaces
 from xmlschema.xpath import XMLSchemaContext
 from xmlschema.validators import XsdValidator, XsdType, Xsd11ComplexType
+from xmlschema.dataobjects import DataElementConverter, DataBindingConverter, DataElement
+
+try:
+    from xmlschema.extras.codegen import PythonGenerator
+except ImportError:
+    PythonGenerator: OptionalType = None  # type: ignoreno-redef
 
 from .helpers import iter_nested_items, etree_elements_assert_equal
 from .case_class import XsdValidatorTestCase
@@ -56,7 +68,9 @@
     inspect = test_args.inspect
     locations = test_args.locations
     defuse = test_args.defuse
+    no_pickle = test_args.no_pickle
     debug_mode = test_args.debug
+    codegen = test_args.codegen
     loglevel = logging.DEBUG if debug_mode else None
 
     class TestSchema(XsdValidatorTestCase):
@@ -73,30 +87,31 @@
 
         def check_xsd_file(self):
             if expected_errors > 0:
-                xs = schema_class(xsd_file, validation='lax', locations=locations,
-                                  defuse=defuse, loglevel=loglevel)
+                schema = schema_class(xsd_file, validation='lax', locations=locations,
+                                      defuse=defuse, loglevel=loglevel)
             else:
-                xs = schema_class(xsd_file, locations=locations, defuse=defuse, loglevel=loglevel)
-            self.errors.extend(xs.maps.all_errors)
+                schema = schema_class(xsd_file, locations=locations,
+                                      defuse=defuse, loglevel=loglevel)
+            self.errors.extend(schema.maps.all_errors)
 
             if inspect:
-                components_ids = set(id(c) for c in xs.maps.iter_components())
-                components_ids.update(id(c) for c in xs.meta_schema.iter_components())
+                components_ids = set(id(c) for c in schema.maps.iter_components())
+                components_ids.update(id(c) for c in schema.meta_schema.iter_components())
                 missing = 
                     c for c in SchemaObserver.components if id(c) not in components_ids
                 
                 if missing:
                     raise ValueError("schema missing %d components: %r" % (len(missing), missing))
 
-            # Pickling test (only for Python 3, skip inspected schema classes test)
-            if not inspect:
+            # Pickling test (skip inspected schema classes test)
+            if not inspect and not no_pickle:
                 try:
-                    obj = pickle.dumps(xs)
+                    obj = pickle.dumps(schema)
                     deserialized_schema = pickle.loads(obj)
                 except pickle.PicklingError:
                     # Don't raise if some schema parts (eg. a schema loaded from remote)
                     # are built with the SafeXMLParser that uses pure Python elements.
-                    for e in xs.maps.iter_components():
+                    for e in schema.maps.iter_components():
                         elem = getattr(e, 'elem', getattr(e, 'root', None))
                         if isinstance(elem, py_etree_element):
                             break
@@ -104,12 +119,12 @@
                         raise
                 else:
                     self.assertTrue(isinstance(deserialized_schema, XMLSchemaBase), msg=xsd_file)
-                    self.assertEqual(xs.built, deserialized_schema.built, msg=xsd_file)
+                    self.assertEqual(schema.built, deserialized_schema.built, msg=xsd_file)
 
             # XPath API tests
             if not inspect and not self.errors:
-                context = XMLSchemaContext(xs)
-                elements = x for x in xs.iter()  # Contains schema elements only
+                context = XMLSchemaContext(schema)
+                elements = x for x in schema.iter()  # Contains schema elements only
                 xpath_context_elements = x for x in context.iter() if isinstance(x, XsdValidator)
                 descendants = x for x in context.iter_descendants('descendant-or-self')
                 self.assertTrue(x in descendants for x in xpath_context_elements)
@@ -118,7 +133,7 @@
                     self.assertIn(e, xpath_context_elements, msg=xsd_file)
 
             # Checks on XSD types
-            for xsd_type in xs.maps.iter_components(xsd_classes=XsdType):
+            for xsd_type in schema.maps.iter_components(xsd_classes=XsdType):
                 self.assertIn(
                     xsd_type.content_type_label, {'empty', 'simple', 'element-only', 'mixed'},
                     msg=xsd_file
@@ -133,13 +148,31 @@
                             "is simple or has a simple content" not in str(err):
                         raise  # Not a case of forbidden complex content extension
 
-                    xs = schema_class(xsd_file, validation='lax', locations=locations,
-                                      defuse=defuse, loglevel=loglevel)
-                    for error in xs.all_errors:
+                    schema = schema_class(xsd_file, validation='lax', locations=locations,
+                                          defuse=defuse, loglevel=loglevel)
+                    for error in schema.all_errors:
                         if not isinstance(err.validator, Xsd11ComplexType) or \
                                 "is simple or has a simple content" not in str(err):
                             raise error
 
+            # Check XML bindings module only for schemas that do not have errors
+            if codegen and PythonGenerator is not None and not self.errors and \
+                    all('schemaLocation' in e.attrib for e in schema.root if e.tag == XSD_IMPORT):
+
+                generator = PythonGenerator(schema)
+                with tempfile.TemporaryDirectory() as tempdir:
+                    cwd = os.getcwd()
+                    try:
+                        schema.export(tempdir, save_remote=True)
+                        os.chdir(tempdir)
+                        generator.render_to_files('bindings.py.jinja')
+
+                        spec = importlib.util.spec_from_file_location(tempdir, 'bindings.py')
+                        module = importlib.util.module_from_spec(spec)
+                        spec.loader.exec_module(module)
+                    finally:
+                        os.chdir(cwd)
+
         def check_xsd_file_with_lxml(self, xmlschema_time):
             start_time = time.time()
             lxs = lxml_etree.parse(xsd_file)
@@ -207,8 +240,11 @@
     inspect = test_args.inspect
     locations = test_args.locations
     defuse = test_args.defuse
+    validation_only = test_args.validation_only
+    no_pickle = test_args.no_pickle
     lax_encode = test_args.lax_encode
     debug_mode = test_args.debug
+    codegen = test_args.codegen
 
     class TestValidator(XsdValidatorTestCase):
 
@@ -271,9 +307,13 @@
                 # or if the XML case has defaults taken from the schema or some part of data
                 # decoding is skipped by schema wildcards (set the specific argument in testfiles).
                 if lax_encode:
-                    pass  # can't ensure encode equivalence if the test case use defaults
-                elif lossy:
-                    pass  # can't check encode equivalence if the converter is lossy
+                    # can't ensure encode equivalence on this case,
+                    # for example if the test case use defaults.
+                    pass
+                elif lossy or unordered:
+                    # can't check encode equivalence if the converter
+                    # is lossy or if it is not fully ordered.
+                    pass
                 elif losslessly:
                     if debug_mode:
                         pdb.set_trace()
@@ -422,6 +462,10 @@
             self.check_decode_encode(root, JsonMLConverter, **options)
             self.check_decode_encode(root, ColumnarConverter, validation='lax', **options)
 
+            self.check_decode_encode(root, DataElementConverter, **options)
+            self.check_decode_encode(root, DataBindingConverter, **options)
+            self.schema.maps.clear_bindings()
+
             self.check_json_serialization(root, cdata_prefix='#', **options)
             self.check_json_serialization(root, UnorderedConverter, **options)
             self.check_json_serialization(root, ParkerConverter, validation='lax', **options)
@@ -431,6 +475,21 @@

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/testing/factory.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/testing/factory.py Changed

@@ -64,6 +64,8 @@
     # xmlschema's arguments
     parser.add_argument('--lxml', dest='lxml', action='store_true', default=False,
                         help='Check also with lxml.etree.XMLSchema (for XSD 1.0)')
+    parser.add_argument('--codegen', action="store_true", default=False,
+                        help="Test code generation with XML data bindings module.")
     parser.add_argument('testfiles', type=str, nargs='*', default=default_testfiles,
                         help="Test cases directory.")
     return parser
@@ -105,6 +107,14 @@
         help="Timeout for fetching resources (default=300)."
     )
     parser.add_argument(
+        '--validation-only', action="store_true", default=False,
+        help="Skip decode/encode tests on XML data."
+    )
+    parser.add_argument(
+        '--no-pickle', action="store_true", default=False,
+        help="Skip pickling/unpickling test on schema (max recursion exceeded)."
+    )
+    parser.add_argument(
         '--lax-encode', action="store_true", default=False,
         help="Use lax mode on encode checks (for cases where test data uses default or "
              "fixed values or some test data are skipped by wildcards processContents). "
@@ -114,18 +124,28 @@
         '--debug', action="store_true", default=False,
         help="Activate the debug mode (only the cases with --debug are executed).",
     )
+    parser.add_argument(
+        '--codegen', action="store_true", default=False,
+        help="Test code generation with XML data bindings module. For default "
+             "test code generation if the same command option is provided.",
+    )
     return parser
 
 
-def factory_tests(test_class_builder, testfiles, suffix, check_with_lxml=False):
+def factory_tests(test_class_builder, testfiles, suffix,
+                  check_with_lxml=False, codegen=False, verbosity=1):
     """
     Factory function for file based schema/validation cases.
 
     :param test_class_builder: the test class builder function.
     :param testfiles: a single or a list of testfiles indexes.
     :param suffix: the suffix ('xml' or 'xsd') to consider for cases.
-    :param check_with_lxml: if `True` compare with lxml XMLSchema class, reporting \
-    anomalies. Works only for XSD 1.0 tests.
+    :param check_with_lxml: if `True` compare with lxml XMLSchema class, \
+    reporting anomalies. Works only for XSD 1.0 tests.
+    :param codegen: if `True` is provided checks code generation with XML data \
+    bindings module for all tests. For default is `False` and code generation \
+    is tested only for the cases where the same option is provided.
+    :param verbosity: the unittest's verbosity, can be 0, 1 or 2.
     :return: a list of test classes.
     """
     test_classes = {}
@@ -156,6 +176,8 @@
         test_args = test_line_parser.parse_args(get_test_args(line))
         if test_args.locations is not None:
             test_args.locations = {k.strip('\'"'): v for k, v in test_args.locations}
+        if codegen:
+            test_args.codegen = True
 
         test_file = os.path.join(os.path.dirname(fileinput.filename()), test_args.filename)
         if os.path.isdir(test_file):
@@ -192,6 +214,9 @@
             )
 
         test_classestest_class.__name__ = test_class
+        if verbosity == 2:
+            print(f"Create case {test_class.__name__} for file {os.path.relpath(test_file)}")
+
         logger.debug("Add XSD %s test class %r.", test_args.version, test_class.__name__)
 
     if line_buffer:

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/testing/helpers.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/testing/helpers.py Changed

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
 # All rights reserved.
@@ -9,12 +8,16 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 import re
-from xmlschema.helpers import get_namespace, get_qname
+from typing import Any, Dict, List, Type, Union, Iterator
+from ..helpers import get_namespace, get_qname
+from ..etree import etree_element
 
 _REGEX_SPACES = re.compile(r'\s+')
 
 
-def iter_nested_items(items, dict_class=dict, list_class=list):
+def iter_nested_items(items: UnionDictAny, Any, ListAny,
+                      dict_class: TypeDictAny, Any = dict,
+                      list_class: TypeListAny = list) -> IteratorAny:
     """Iterates a nested object composed by lists and dictionaries."""
     if isinstance(items, dict_class):
         for k, v in items.items():
@@ -30,7 +33,9 @@
         yield items
 
 
-def etree_elements_assert_equal(elem, other, strict=True, skip_comments=True, unordered=False):
+def etree_elements_assert_equal(elem: etree_element, other: etree_element,
+                                strict: bool = True, skip_comments: bool = True,
+                                unordered: bool = False) -> None:
     """
     Tests the equality of two XML Element trees.
 
@@ -41,6 +46,8 @@
     :param unordered: children may have different order.
     :raise: an AssertionError containing information about first difference encountered.
     """
+    children: Unionetree_element, Listetree_element
+
     if unordered:
         children = sorted(elem, key=lambda x: '' if callable(x.tag) else x.tag)
         other_children = iter(sorted(
@@ -107,7 +114,7 @@
             if strict:
                 raise AssertionError(message)
             elif e1.text is None:
-                if e2.text.strip():
+                if e2.text is not None and e2.text.strip():
                     raise AssertionError(message)
             elif e2.text is None:
                 if e1.text.strip():
@@ -144,7 +151,7 @@
             if strict:
                 raise AssertionError(message)
             elif e1.tail is None:
-                if e2.tail.strip():
+                if e2.tail is not None and e2.tail.strip():
                     raise AssertionError(message)
             elif e2.tail is None:
                 if e1.tail.strip():

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/testing/observers.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/testing/observers.py Changed

@@ -11,18 +11,19 @@
 Observers for testing XMLSchema classes.
 """
 from functools import wraps
+from typing import List
 
 from xmlschema.names import XSD_NAMESPACE, XSD_ANY_TYPE
 from xmlschema.validators import XMLSchema10, XMLSchema11, \
-    XsdGroup, XsdAttributeGroup, XsdComplexType
+    XsdGroup, XsdAttributeGroup, XsdComplexType, XsdComponent
 
 
 class SchemaObserver:
     """
     Observer that registers created components. Run the 'clear' method after each usage.
     """
-    components = 
-    dummy_components = 
+    components: ListXsdComponent = 
+    dummy_components: ListXsdComponent = 
 
     @classmethod
     def observed_builder(cls, builder):
@@ -70,15 +71,38 @@
         return False
 
 
+observed_builder = SchemaObserver.observed_builder
+
+
 class ObservedXMLSchema10(XMLSchema10):
-    BUILDERS = {
-        k: SchemaObserver.observed_builder(getattr(XMLSchema10.BUILDERS, k))
-        for k in getattr(XMLSchema10.BUILDERS, '_fields')
-    }
+    xsd_notation_class = observed_builder(XMLSchema10.xsd_notation_class)
+    xsd_complex_type_class = observed_builder(XMLSchema10.xsd_complex_type_class)
+    xsd_attribute_class = observed_builder(XMLSchema10.xsd_attribute_class)
+    xsd_any_attribute_class = observed_builder(XMLSchema10.xsd_any_attribute_class)
+    xsd_attribute_group_class = observed_builder(XMLSchema10.xsd_attribute_group_class)
+    xsd_group_class = observed_builder(XMLSchema10.xsd_group_class)
+    xsd_element_class = observed_builder(XMLSchema10.xsd_element_class)
+    xsd_any_class = observed_builder(XMLSchema10.xsd_any_class)
+    xsd_atomic_restriction_class = observed_builder(XMLSchema10.xsd_atomic_restriction_class)
+    xsd_list_class = observed_builder(XMLSchema10.xsd_list_class)
+    xsd_union_class = observed_builder(XMLSchema10.xsd_union_class)
+    xsd_key_class = observed_builder(XMLSchema10.xsd_key_class)
+    xsd_keyref_class = observed_builder(XMLSchema10.xsd_keyref_class)
+    xsd_unique_class = observed_builder(XMLSchema10.xsd_unique_class)
 
 
 class ObservedXMLSchema11(XMLSchema11):
-    BUILDERS = {
-        k: SchemaObserver.observed_builder(getattr(XMLSchema11.BUILDERS, k))
-        for k in getattr(XMLSchema11.BUILDERS, '_fields')
-    }
+    xsd_notation_class = observed_builder(XMLSchema11.xsd_notation_class)
+    xsd_complex_type_class = observed_builder(XMLSchema11.xsd_complex_type_class)
+    xsd_attribute_class = observed_builder(XMLSchema11.xsd_attribute_class)
+    xsd_any_attribute_class = observed_builder(XMLSchema11.xsd_any_attribute_class)
+    xsd_attribute_group_class = observed_builder(XMLSchema11.xsd_attribute_group_class)
+    xsd_group_class = observed_builder(XMLSchema11.xsd_group_class)
+    xsd_element_class = observed_builder(XMLSchema11.xsd_element_class)
+    xsd_any_class = observed_builder(XMLSchema11.xsd_any_class)
+    xsd_atomic_restriction_class = observed_builder(XMLSchema11.xsd_atomic_restriction_class)
+    xsd_list_class = observed_builder(XMLSchema11.xsd_list_class)
+    xsd_union_class = observed_builder(XMLSchema11.xsd_union_class)
+    xsd_key_class = observed_builder(XMLSchema11.xsd_key_class)
+    xsd_keyref_class = observed_builder(XMLSchema11.xsd_keyref_class)
+    xsd_unique_class = observed_builder(XMLSchema11.xsd_unique_class)

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/__init__.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/__init__.py Changed

@@ -27,15 +27,15 @@
 from .wildcards import XsdAnyElement, Xsd11AnyElement, XsdAnyAttribute, Xsd11AnyAttribute, \
     XsdOpenContent, XsdDefaultOpenContent
 from .attributes import XsdAttribute, Xsd11Attribute, XsdAttributeGroup
-from .simple_types import xsd_simple_type_factory, XsdSimpleType, XsdAtomic, XsdAtomicBuiltin, \
+from .simple_types import XsdSimpleType, XsdAtomic, XsdAtomicBuiltin, \
     XsdAtomicRestriction, Xsd11AtomicRestriction, XsdList, XsdUnion, Xsd11Union
 from .complex_types import XsdComplexType, Xsd11ComplexType
-from .models import ModelGroup, ModelVisitor
+from .models import ModelVisitor
 from .groups import XsdGroup, Xsd11Group
 from .elements import XsdElement, Xsd11Element, XsdAlternative
 
 from .global_maps import XsdGlobals
-from .schema import XMLSchemaMeta, XMLSchemaBase, XMLSchema, XMLSchema10, XMLSchema11
+from .schemas import XMLSchemaMeta, XMLSchemaBase, XMLSchema, XMLSchema10, XMLSchema11
 
 
 __all__ = 
@@ -52,10 +52,9 @@
     'XsdTotalDigitsFacet', 'XsdExplicitTimezoneFacet', 'XsdPatternFacets',
     'XsdEnumerationFacets', 'XsdAssertionFacet', 'XsdAnyElement', 'Xsd11AnyElement',
     'XsdAnyAttribute', 'Xsd11AnyAttribute', 'XsdOpenContent', 'XsdDefaultOpenContent',
-    'XsdAttribute', 'Xsd11Attribute', 'XsdAttributeGroup', 'xsd_simple_type_factory',
-    'XsdSimpleType', 'XsdAtomic', 'XsdAtomicBuiltin', 'XsdAtomicRestriction',
-    'Xsd11AtomicRestriction', 'XsdList', 'XsdUnion', 'Xsd11Union', 'XsdComplexType',
-    'Xsd11ComplexType', 'ModelGroup', 'ModelVisitor', 'XsdGroup', 'Xsd11Group',
-    'XsdElement', 'Xsd11Element', 'XsdAlternative', 'XsdGlobals', 'XMLSchemaMeta',
-    'XMLSchemaBase', 'XMLSchema', 'XMLSchema10', 'XMLSchema11'
+    'XsdAttribute', 'Xsd11Attribute', 'XsdAttributeGroup', 'XsdSimpleType', 'XsdAtomic',
+    'XsdAtomicBuiltin', 'XsdAtomicRestriction', 'Xsd11AtomicRestriction', 'XsdList',
+    'XsdUnion', 'Xsd11Union', 'XsdComplexType', 'Xsd11ComplexType', 'ModelVisitor',
+    'XsdGroup', 'Xsd11Group', 'XsdElement', 'Xsd11Element', 'XsdAlternative', 'XsdGlobals',
+    'XMLSchemaMeta', 'XMLSchemaBase', 'XMLSchema', 'XMLSchema10', 'XMLSchema11'

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/assertions.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/assertions.py Changed

@@ -8,16 +8,27 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 import threading
-from elementpath import XPath2Parser, XPathContext, ElementPathError
+from typing import TYPE_CHECKING, cast, Any, Dict, Iterator, Optional, Union
+from elementpath import XPath2Parser, XPathContext, XPathToken, ElementPathError
 
 from ..names import XSD_ASSERT
-from ..xpath import ElementPathMixin, XMLSchemaProxy
+from ..aliases import ElementType, SchemaType, SchemaElementType, NamespacesType
+from ..xpath import XMLSchemaProtocol, ElementProtocol, ElementPathMixin, XMLSchemaProxy
 
-from .exceptions import XMLSchemaValidationError
+from .exceptions import XMLSchemaNotBuiltError, XMLSchemaValidationError
 from .xsdbase import XsdComponent
+from .groups import XsdGroup
 
 
-class XsdAssert(XsdComponent, ElementPathMixin):
+if TYPE_CHECKING:
+    from ..resources import XMLResource
+    from .attributes import XsdAttributeGroup
+    from .complex_types import XsdComplexType
+    from .elements import XsdElement
+    from .wildcards import XsdAnyElement
+
+
+class XsdAssert(XsdComponent, ElementPathMixinUnion'XsdAssert', SchemaElementType):
     """
     Class for XSD *assert* constraint definitions.
 
@@ -29,38 +40,37 @@
           Content: (annotation?)
         </assert>
     """
+    parent: 'XsdComplexType'
     _ADMITTED_TAGS = {XSD_ASSERT}
-    token = None
-    parser = None
+    token: OptionalXPathToken = None
+    parser: OptionalXPath2Parser = None
     path = 'true()'
 
-    def __init__(self, elem, schema, parent, base_type):
+    def __init__(self, elem: ElementType,
+                 schema: SchemaType,
+                 parent: 'XsdComplexType',
+                 base_type: 'XsdComplexType') -> None:
+
+        self._xpath_lock = threading.Lock()
         self.base_type = base_type
-        self._assert_xpath_lock = threading.Lock()  # Lock for assertion XPath operations
         super(XsdAssert, self).__init__(elem, schema, parent)
-        ElementPathMixin.__init__(self)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         if len(self.path) < 40:
             return '%s(test=%r)' % (self.__class__.__name__, self.path)
         else:
             return '%s(test=%r)' % (self.__class__.__name__, self.path:37 + '...')
 
-    def __getstate__(self):
+    def __getstate__(self) -> Dictstr, Any:
         state = self.__dict__.copy()
-        state.pop('_assert_xpath_lock', None)
         state.pop('_xpath_lock', None)
-        state.pop('_xpath_parser', None)
-        state.pop('xpath_tokens', None)  # For schema objects
         return state
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: Any) -> None:
         self.__dict__.update(state)
         self._xpath_lock = threading.Lock()
-        self._assert_xpath_lock = threading.Lock()
 
-    def _parse(self):
-        super(XsdAssert, self)._parse()
+    def _parse(self) -> None:
         if self.base_type.is_simple():
             self.parse_error("base_type=%r is not a complexType definition" % self.base_type)
         else:
@@ -75,16 +85,18 @@
             self.xpath_default_namespace = self.schema.xpath_default_namespace
 
     @property
-    def built(self):
-        return self.token is not None and (self.base_type.parent is None or self.base_type.built)
+    def built(self) -> bool:
+        return self.parser is not None and self.token is not None
 
-    def build(self):
+    def build(self) -> None:
+        # Assert requires a schema bound parser because select
+        # is on XML elements and with XSD type decoded values
         self.parser = XPath2Parser(
             namespaces=self.namespaces,
             variable_types={'value': self.base_type.sequence_type},
             strict=False,
             default_namespace=self.xpath_default_namespace,
-            schema=XMLSchemaProxy(self.schema, self)
+            schema=self.xpath_proxy,
         )
 
         try:
@@ -93,16 +105,30 @@
             self.parse_error(err)
             self.token = self.parser.parse('true()')
         finally:
-            self.parser.variable_types.clear()
+            if self.parser.variable_types:
+                self.parser.variable_types.clear()
+
+    def __call__(self, elem: ElementType,
+                 value: Any = None,
+                 namespaces: OptionalNamespacesType = None,
+                 source: Optional'XMLResource' = None,
+                 **kwargs: Any) -> IteratorXMLSchemaValidationError:
+
+        if self.parser is None or self.token is None:
+            raise XMLSchemaNotBuiltError(self, "schema bound parser not set")
 
-    def __call__(self, elem, value=None, namespaces=None, source=None, **kwargs):
         with self._xpath_lock:
-            if not self.parser.is_schema_bound():
+            if not self.parser.is_schema_bound() and self.parser.schema:
                 self.parser.schema.bind_parser(self.parser)
 
+        if namespaces is None or isinstance(namespaces, dict):
+            _namespaces = namespaces
+        else:
+            _namespaces = dict(namespaces)
+
         variables = {'value': None if value is None else self.base_type.text_decode(value)}
         if source is not None:
-            context = XPathContext(source.root, namespaces=namespaces,
+            context = XPathContext(source.root, namespaces=_namespaces,
                                    item=elem, variables=variables)
         else:
             # If validated from a component (could not work with rooted XPath expressions)
@@ -115,18 +141,21 @@
             yield XMLSchemaValidationError(self, obj=elem, reason=str(err))
 
     # For implementing ElementPathMixin
-    def __iter__(self):
-        if not self.parent.has_simple_content():
+    def __iter__(self) -> IteratorUnion'XsdElement', 'XsdAnyElement':
+        if isinstance(self.parent.content, XsdGroup):
             yield from self.parent.content.iter_elements()
 
     @property
-    def attrib(self):
+    def attrib(self) -> 'XsdAttributeGroup':
         return self.parent.attributes
 
     @property
-    def type(self):
+    def type(self) -> 'XsdComplexType':
         return self.parent
 
     @property
-    def xpath_proxy(self):
-        return XMLSchemaProxy(self.schema, self)
+    def xpath_proxy(self) -> 'XMLSchemaProxy':
+        return XMLSchemaProxy(
+            schema=cast(XMLSchemaProtocol, self.schema),
+            base_element=cast(ElementProtocol, self)
+        )

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/attributes.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/attributes.py Changed

@@ -11,15 +11,17 @@
 This module contains classes for XML Schema attributes and attribute groups.
 """
 from decimal import Decimal
-from collections.abc import MutableMapping
 from elementpath.datatypes import AbstractDateTime, Duration, AbstractBinary
-from typing import Union, Dict, Optional
+from typing import cast, Any, Callable, Union, Dict, List, Optional, \
+    Iterator, MutableMapping, Tuple
 
 from ..exceptions import XMLSchemaValueError
 from ..names import XSI_NAMESPACE, XSD_ANY_SIMPLE_TYPE, XSD_SIMPLE_TYPE, \
     XSD_ATTRIBUTE_GROUP, XSD_COMPLEX_TYPE, XSD_RESTRICTION, XSD_EXTENSION, \
     XSD_SEQUENCE, XSD_ALL, XSD_CHOICE, XSD_ATTRIBUTE, XSD_ANY_ATTRIBUTE, \
     XSD_ASSERT, XSD_NOTATION_TYPE, XSD_ANNOTATION
+from ..aliases import ComponentClassType, ElementType, IterDecodeType, \
+    IterEncodeType, AtomicValueType, SchemaType, DecodedValueType, EncodedValueType
 from ..helpers import get_namespace, get_qname
 
 from .exceptions import XMLSchemaValidationError
@@ -28,7 +30,7 @@
 from .wildcards import XsdAnyAttribute
 
 
-class XsdAttribute(XsdComponent, ValidationMixin):
+class XsdAttribute(XsdComponent, ValidationMixinstr, DecodedValueType):
     """
     Class for XSD 1.0 *attribute* declarations.
 
@@ -49,16 +51,22 @@
     """
     _ADMITTED_TAGS = {XSD_ATTRIBUTE}
 
-    type = None
-    qualified = False
-    default = None
-    fixed = None
-    form = None
-    use = 'optional'
-    inheritable = False  # For XSD 1.1 attributes, always False for XSD 1.0 attributes.
+    name: str
+    local_name: str
+    qualified_name: str
+    prefixed_name: str
 
-    def _parse(self):
-        super(XsdAttribute, self)._parse()
+    type: XsdSimpleType
+    copy: Callable'XsdAttribute', 'XsdAttribute'
+
+    qualified: bool = False
+    default: Optionalstr = None
+    fixed: Optionalstr = None
+    form: Optionalstr = None
+    use: str = 'optional'
+    inheritable: bool = False  # For XSD 1.1 attributes, always False for XSD 1.0 attributes.
+
+    def _parse(self) -> None:
         attrib = self.elem.attrib
 
         if 'use' in attrib and self.parent is not None and \
@@ -125,7 +133,7 @@
                     self.parse_error(err)
                 else:
                     try:
-                        self.type = self.maps.lookup_type(type_qname)
+                        self.type = cast(XsdSimpleType, self.maps.lookup_type(type_qname))
                     except LookupError as err:
                         self.type = self.any_simple_type
                         self.parse_error(err)
@@ -135,7 +143,7 @@
 
             elif child is not None:
                 # No 'type' attribute in declaration, parse for child local simpleType
-                self.type = self.schema.BUILDERS.simple_type_factory(child, self.schema, self)
+                self.type = self.schema.simple_type_factory(child, self.schema, self)
             else:
                 # Empty declaration means xsdAnySimpleType
                 self.type = self.any_simple_type
@@ -169,78 +177,82 @@
                 self.parse_error("xs:ID key attributes cannot have a fixed value")
 
     @property
-    def built(self):
+    def built(self) -> bool:
         return True
 
     @property
-    def validation_attempted(self):
+    def validation_attempted(self) -> str:
         return 'full'
 
     @property
-    def scope(self):
+    def scope(self) -> str:
         """The scope of the attribute declaration that can be 'global' or 'local'."""
         return 'global' if self.parent is None else 'local'
 
     @property
-    def value_constraint(self):
+    def value_constraint(self) -> Optionalstr:
         """The fixed or the default value if either is defined, `None` otherwise."""
         return self.fixed if self.fixed is not None else self.default
 
-    def is_optional(self):
+    def is_optional(self) -> bool:
         return self.use == 'optional'
 
-    def is_required(self):
+    def is_required(self) -> bool:
         return self.use == 'required'
 
-    def is_prohibited(self):
+    def is_prohibited(self) -> bool:
         return self.use == 'prohibited'
 
-    def is_empty(self):
+    def is_empty(self) -> bool:
         return self.fixed == '' or self.type.is_empty()
 
-    def iter_components(self, xsd_classes=None):
+    def iter_components(self, xsd_classes: ComponentClassType = None) \
+            -> IteratorXsdComponent:
         if xsd_classes is None or isinstance(self, xsd_classes):
             yield self
         if self.ref is None and self.type.parent is not None:
             yield from self.type.iter_components(xsd_classes)
 
-    def data_value(self, text):
+    def data_value(self, text: str) -> AtomicValueType:
         """Returns the decoded data value of the provided text as XPath fn:data()."""
-        return self.decode(text, validation='skip')
+        return cast(AtomicValueType, self.decode(text, validation='skip'))
 
-    def iter_decode(self, text, validation='lax', **kwargs):
-        if text is None and self.default is not None:
-            text = self.default
+    def iter_decode(self, obj: str, validation: str = 'lax', **kwargs: Any) \
+            -> IterDecodeTypeDecodedValueType:
+        if obj is None and self.default is not None:
+            obj = self.default
 
         if self.type.is_notation():
             if self.type.name == XSD_NOTATION_TYPE:
                 msg = "cannot validate against xs:NOTATION directly, " \
                       "only against a subtype with an enumeration facet"
-                yield self.validation_error(validation, msg, text, **kwargs)
+                yield self.validation_error(validation, msg, obj, **kwargs)
             elif not self.type.enumeration:
                 msg = "missing enumeration facet in xs:NOTATION subtype"
-                yield self.validation_error(validation, msg, text, **kwargs)
+                yield self.validation_error(validation, msg, obj, **kwargs)
 
         if self.fixed is not None:
-            if text is None:
-                text = self.fixed
-            elif text != self.fixed and \
-                    self.type.text_decode(text) != self.type.text_decode(self.fixed):
+            if obj is None:
+                obj = self.fixed
+            elif obj != self.fixed and \
+                    self.type.text_decode(obj) != self.type.text_decode(self.fixed):
                 msg = "attribute {!r} has a fixed value {!r}".format(self.name, self.fixed)
-                yield self.validation_error(validation, msg, text, **kwargs)
+                yield self.validation_error(validation, msg, obj, **kwargs)
 
-        for value in self.type.iter_decode(text, validation, **kwargs):
+        for value in self.type.iter_decode(obj, validation, **kwargs):
             if isinstance(value, XMLSchemaValidationError):
                 value.reason = 'attribute {}={!r}: {}'.format(
-                    self.prefixed_name, text, value.reason
+                    self.prefixed_name, obj, value.reason
                 )
                 yield value
                 continue
+            elif 'value_hook' in kwargs:
+                yield kwargs'value_hook'(value, self.type)
             elif isinstance(value, (int, float, list)) or value is None:
                 yield value
             elif isinstance(value, str):
                 if value.startswith('{') and self.type.is_qname():
-                    yield text
+                    yield obj
                 else:
                     yield value
             elif isinstance(value, Decimal):
@@ -249,18 +261,16 @@
                 except (KeyError, TypeError):
                     yield value
             elif isinstance(value, (AbstractDateTime, Duration)):
-                yield value if kwargs.get('datetime_types') else text
+                yield value if kwargs.get('datetime_types') else obj.strip()
             elif isinstance(value, AbstractBinary) and not kwargs.get('binary_types'):
-                yield text
+                yield str(value)
             else:
                 yield value
-            break
+            break  # pragma: no cover

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/builtins.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/builtins.py Changed

@@ -15,6 +15,7 @@
 """
 from decimal import Decimal
 from elementpath import datatypes
+from typing import cast, Any, Dict, Optional, Type, Tuple, Union
 
 from ..exceptions import XMLSchemaValueError
 from ..names import XSD_LENGTH, XSD_MIN_LENGTH, XSD_MAX_LENGTH, XSD_ENUMERATION, \
@@ -31,6 +32,7 @@
     XSD_HEX_BINARY, XSD_NOTATION_TYPE, XSD_ERROR, XSD_ASSERTION, XSD_SIMPLE_TYPE, \
     XSD_ANY_TYPE, XSD_ANY_ATOMIC_TYPE, XSD_ANY_SIMPLE_TYPE
 from ..etree import etree_element
+from ..aliases import ElementType, SchemaType, BaseXsdType
 
 from .helpers import decimal_validator, qname_validator, byte_validator, \
     short_validator, int_validator, long_validator, unsigned_byte_validator, \
@@ -81,7 +83,7 @@
 )
 
 
-XSD_COMMON_BUILTIN_TYPES = (
+XSD_COMMON_BUILTIN_TYPES: TupleDictstr, Any, ... = (
     # ***********************
     # *** Primitive types ***
     # ***********************
@@ -326,7 +328,7 @@
     },  # only negative value allowed < 0
 )
 
-XSD_10_BUILTIN_TYPES = XSD_COMMON_BUILTIN_TYPES + (
+XSD_10_BUILTIN_TYPES: TupleDictstr, Any, ... = XSD_COMMON_BUILTIN_TYPES + (
     {
         'name': XSD_DOUBLE,
         'python_type': float,
@@ -371,7 +373,7 @@
     },  # -Y*YYYY-MM
 )
 
-XSD_11_BUILTIN_TYPES = XSD_COMMON_BUILTIN_TYPES + (
+XSD_11_BUILTIN_TYPES: TupleDictstr, Any, ... = XSD_COMMON_BUILTIN_TYPES + (
     {
         'name': XSD_DOUBLE,
         'python_type': float,
@@ -444,7 +446,10 @@
 )
 
 
-def xsd_builtin_types_factory(meta_schema, xsd_types, atomic_builtin_class=None):
+def xsd_builtin_types_factory(
+        meta_schema: SchemaType,
+        xsd_types: Dictstr, UnionBaseXsdType, TupleElementType, SchemaType,
+        atomic_builtin_class: OptionalTypeXsdAtomicBuiltin = None) -> None:
     """
     Builds the dictionary for XML Schema built-in types mapping.
     """
@@ -465,7 +470,7 @@
 
     # xs:anySimpleType
     # Ref: https://www.w3.org/TR/xmlschema11-2/#builtin-stds
-    xsd_typesXSD_ANY_SIMPLE_TYPE = XsdSimpleType(
+    xsd_any_simple_type = xsd_typesXSD_ANY_SIMPLE_TYPE = XsdSimpleType(
         elem=etree_element(XSD_SIMPLE_TYPE, name=XSD_ANY_SIMPLE_TYPE),
         schema=meta_schema,
         parent=None,
@@ -474,39 +479,41 @@
 
     # xs:anyAtomicType
     # Ref: https://www.w3.org/TR/xmlschema11-2/#builtin-stds
-    xsd_typesXSD_ANY_ATOMIC_TYPE = meta_schema.BUILDERS.restriction_class(
+    xsd_typesXSD_ANY_ATOMIC_TYPE = meta_schema.xsd_atomic_restriction_class(
         elem=etree_element(XSD_SIMPLE_TYPE, name=XSD_ANY_ATOMIC_TYPE),
         schema=meta_schema,
         parent=None,
         name=XSD_ANY_ATOMIC_TYPE,
-        base_type=xsd_typesXSD_ANY_SIMPLE_TYPE
+        base_type=xsd_any_simple_type,
     )
 
     for item in builtin_types:
         item = item.copy()
-        name = item'name'
+        name: str = item'name'
         try:
-            elem, schema = xsd_typesname
+            value = cast(TupleElementType, SchemaType, xsd_typesname)
         except KeyError:
             # If builtin type element is missing create a dummy element. Necessary for the
             # meta-schema XMLSchema.xsd of XSD 1.1, that not includes builtins declarations.
             elem = etree_element(XSD_SIMPLE_TYPE, name=name, id=name)
         else:
+            elem, schema = value
             if schema is not meta_schema:
                 raise XMLSchemaValueError("loaded entry schema is not the meta-schema!")
 
+        base_type: UnionNone, BaseXsdType, TupleElementType, SchemaType
         if 'base_type' in item:
             base_type = item'base_type' = xsd_typesitem'base_type'
         else:
             base_type = None
 
         facets = item.pop('facets', None)
-        builtin_type = atomic_builtin_class(elem, meta_schema, **item)
+        builtin_type: XsdAtomicBuiltin = atomic_builtin_class(elem, meta_schema, **item)
         if facets:
             built_facets = builtin_type.facets
             for e in facets:
                 try:
-                    cls = facets_mape.tag
+                    cls: Any = facets_mape.tag
                 except AttributeError:
                     built_facetsNone = e
                 else:

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/complex_types.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/complex_types.py Changed

@@ -8,27 +8,32 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 from collections.abc import MutableSequence
+from typing import cast, Any, Callable, Iterator, List, Optional, Tuple, Union
 
 from ..exceptions import XMLSchemaValueError
 from ..names import XSD_GROUP, XSD_ATTRIBUTE_GROUP, XSD_SEQUENCE, XSD_OVERRIDE, \
     XSD_ALL, XSD_CHOICE, XSD_ANY_ATTRIBUTE, XSD_ATTRIBUTE, XSD_COMPLEX_CONTENT, \
     XSD_RESTRICTION, XSD_COMPLEX_TYPE, XSD_EXTENSION, XSD_ANY_TYPE, XSD_ASSERT, \
     XSD_UNTYPED_ATOMIC, XSD_SIMPLE_CONTENT, XSD_OPEN_CONTENT, XSD_ANNOTATION
+from ..aliases import ElementType, NamespacesType, SchemaType, ComponentClassType, \
+    DecodeType, IterDecodeType, IterEncodeType, BaseXsdType, AtomicValueType, \
+    ExtraValidatorType
 from ..helpers import get_prefixed_qname, get_qname, local_name
 from .. import dataobjects
 
 from .exceptions import XMLSchemaDecodeError
 from .helpers import get_xsd_derivation_attribute
 from .xsdbase import XSD_TYPE_DERIVATIONS, XsdComponent, XsdType, ValidationMixin
+from .attributes import XsdAttributeGroup
 from .assertions import XsdAssert
-from .simple_types import XsdSimpleType
+from .simple_types import FacetsValueType, XsdSimpleType, XsdUnion
 from .groups import XsdGroup
-from .wildcards import XsdOpenContent
+from .wildcards import XsdOpenContent, XsdDefaultOpenContent
 
 XSD_MODEL_GROUP_TAGS = {XSD_GROUP, XSD_SEQUENCE, XSD_ALL, XSD_CHOICE}
 
 
-class XsdComplexType(XsdType, ValidationMixin):
+class XsdComplexType(XsdType, ValidationMixinUnionElementType, str, bytes, Any):
     """
     Class for XSD 1.0 *complexType* definitions.
 
@@ -48,22 +53,29 @@
           ((group | all | choice | sequence)?, ((attribute | attributeGroup)*, anyAttribute?))))
         </complexType>
     """
-    abstract = False
-    mixed = False
-    assertions = ()
-    open_content = None
-    content = None
-    default_open_content = None
-    _block = None
+    attributes: XsdAttributeGroup
+    copy: Callable'XsdComplexType', 'XsdComplexType'
+    content: UnionXsdGroup, XsdSimpleType = None  # type: ignoreassignment
+
+    abstract: bool = False
+    mixed: bool = False
+    assertions: UnionTuple(), ListXsdAssert = ()
+    open_content: OptionalXsdOpenContent = None
+    _block: Optionalstr = None
 
     _ADMITTED_TAGS = {XSD_COMPLEX_TYPE, XSD_RESTRICTION}
     _CONTENT_TAIL_TAGS = {XSD_ATTRIBUTE, XSD_ATTRIBUTE_GROUP, XSD_ANY_ATTRIBUTE}
 
     @staticmethod
-    def normalize(text):
+    def normalize(text: Unionstr, bytes) -> str:
         return text.decode('utf-8') if isinstance(text, bytes) else text
 
-    def __init__(self, elem, schema, parent, name=None, **kwargs):
+    def __init__(self, elem: ElementType,
+                 schema: SchemaType,
+                 parent: OptionalXsdComponent = None,
+                 name: Optionalstr = None,
+                 **kwargs: Any) -> None:
+
         if kwargs:
             if 'content' in kwargs:
                 self.content = kwargs'content'
@@ -76,8 +88,9 @@
             if 'final' in kwargs:
                 self._final = kwargs'final'
         super(XsdComplexType, self).__init__(elem, schema, parent, name)
+        assert self.content is not None
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         if self.name is not None:
             return '%s(name=%r)' % (self.__class__.__name__, self.prefixed_name)
         elif not hasattr(self, 'content') or not hasattr(self, 'attributes'):
@@ -88,8 +101,7 @@
                 a if a.name is None else a.prefixed_name for a in self.attributes.values()
             )
 
-    def _parse(self):
-        super(XsdComplexType, self)._parse()
+    def _parse(self) -> None:
         if self.elem.tag == XSD_RESTRICTION:
             return  # a local restriction is already parsed by the caller
 
@@ -130,14 +142,14 @@
             self.content = self.schema.create_empty_content_group(self)
             self._parse_content_tail(self.elem)
             default_open_content = self.default_open_content
-            if default_open_content and \
+            if default_open_content is not None and \
                     (self.mixed or self.content or default_open_content.applies_to_empty):
                 self.open_content = default_open_content
 
         elif content_elem.tag in {XSD_GROUP, XSD_SEQUENCE, XSD_ALL, XSD_CHOICE}:
-            self.content = self.schema.BUILDERS.group_class(content_elem, self.schema, self)
+            self.content = self.schema.xsd_group_class(content_elem, self.schema, self)
             default_open_content = self.default_open_content
-            if default_open_content and \
+            if default_open_content is not None and \
                     (self.mixed or self.content or default_open_content.applies_to_empty):
                 self.open_content = default_open_content
             self._parse_content_tail(self.elem)
@@ -177,17 +189,15 @@
             if derivation_elem is None:
                 return
 
-            base_type = self._parse_base_type(derivation_elem, complex_content=True)
-            if base_type is not self:
-                self.base_type = base_type
-            elif self.redefine:
+            self.base_type = self._parse_base_type(derivation_elem, complex_content=True)
+            if self.base_type is self and self.redefine is not None:
                 self.base_type = self.redefine
                 self.open_content = None
 
             if derivation_elem.tag == XSD_RESTRICTION:
-                self._parse_complex_content_restriction(derivation_elem, base_type)
+                self._parse_complex_content_restriction(derivation_elem, self.base_type)
             else:
-                self._parse_complex_content_extension(derivation_elem, base_type)
+                self._parse_complex_content_extension(derivation_elem, self.base_type)
 
             if content_elem is not self.elem-1:
                 k = 2 if content_elem is not self.elem0 else 1
@@ -205,11 +215,11 @@
                     if content_elem is not child:
                         continue
                     elif self.elemindex + 1.tag in {XSD_GROUP, XSD_SEQUENCE, XSD_ALL, XSD_CHOICE}:
-                        self.content = self.schema.BUILDERS.group_class(
+                        self.content = self.schema.xsd_group_class(
                             self.elemindex + 1, self.schema, self
                         )
                     else:
-                        self.content = self.schema.self.schema.create_empty_content_group(self)
+                        self.content = self.schema.create_empty_content_group(self)
                     break
             self._parse_content_tail(self.elem)
 
@@ -228,32 +238,30 @@
         elif self.base_type is None or self.base_type.name != self.name:
             self.parse_error("wrong redefinition without self-reference")
 
-    def _parse_content_tail(self, elem, **kwargs):
-        self.attributes = self.schema.BUILDERS.attribute_group_class(
+    def _parse_content_tail(self, elem: ElementType, **kwargs: Any) -> None:
+        self.attributes = self.schema.xsd_attribute_group_class(
             elem, self.schema, self, **kwargs
         )
 
-    def _parse_derivation_elem(self, elem):
+    def _parse_derivation_elem(self, elem: ElementType) -> OptionalElementType:
         derivation_elem = self._parse_child_component(elem)
-        if getattr(derivation_elem, 'tag', None) not in (XSD_RESTRICTION, XSD_EXTENSION):
+        if derivation_elem is None or derivation_elem.tag not in {XSD_RESTRICTION, XSD_EXTENSION}:
             self.parse_error("restriction or extension tag expected", derivation_elem)
             self.content = self.schema.create_any_content_group(self)
             self.attributes = self.schema.create_any_attribute_group(self)
-            return
-
-        derivation = local_name(derivation_elem.tag)
-        if self.derivation is None:
-            self.derivation = derivation
-        elif self.redefine is None:
-            raise XMLSchemaValueError(
-                "%r is expected to have a redefined/overridden component" % self
-            )
+            return None
 
-        if self.base_type is not None and derivation in self.base_type.final:
-            self.parse_error("%r derivation not allowed for %r." % (derivation, self))
+        if self.derivation is not None and self.redefine is None:
+            raise XMLSchemaValueError("{!r} is expected to have a redefined/"
+                                      "overridden component".format(self))
+        self.derivation = local_name(derivation_elem.tag)
+
+        if self.base_type is not None and self.derivation in self.base_type.final:
+            self.parse_error(f"{self.derivation!r} derivation not allowed for {self!r}")
         return derivation_elem
 
-    def _parse_base_type(self, elem, complex_content=False):
+    def _parse_base_type(self, elem: ElementType, complex_content: bool = False) \
+            -> UnionXsdSimpleType, 'XsdComplexType':
         try:
             base_qname = self.schema.resolve_qname(elem.attrib'base')
         except (KeyError, ValueError, RuntimeError) as err:
@@ -286,7 +294,7 @@
 
             return base_type

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/elements.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/elements.py Changed

@@ -12,32 +12,47 @@
 """
 import warnings
 from decimal import Decimal
-from typing import Optional
-from elementpath import XPath2Parser, ElementPathError, XPathContext
+from types import GeneratorType
+from typing import TYPE_CHECKING, cast, Any, Dict, Iterator, List, Optional, Tuple, Type, Union
+from elementpath import XPath2Parser, ElementPathError, XPathContext, XPathToken
 from elementpath.datatypes import AbstractDateTime, Duration, AbstractBinary
 
 from ..exceptions import XMLSchemaTypeError, XMLSchemaValueError
 from ..names import XSD_COMPLEX_TYPE, XSD_SIMPLE_TYPE, XSD_ALTERNATIVE, \
     XSD_ELEMENT, XSD_ANY_TYPE, XSD_UNIQUE, XSD_KEY, XSD_KEYREF, XSI_NIL, \
     XSI_TYPE, XSD_ERROR, XSD_NOTATION_TYPE
-from ..etree import etree_element
+from ..etree import ElementData, etree_element
+from ..aliases import ElementType, SchemaType, BaseXsdType, SchemaElementType, \
+    ModelParticleType, ComponentClassType, AtomicValueType, DecodeType, \
+    IterDecodeType, IterEncodeType
 from ..helpers import get_qname, get_namespace, etree_iter_location_hints, \
     raw_xml_encode, strictly_equal
 from .. import dataobjects
-from ..converters import ElementData, XMLSchemaConverter
-from ..xpath import XMLSchemaProxy, ElementPathMixin
+from ..converters import XMLSchemaConverter
+from ..xpath import XMLSchemaProtocol, ElementProtocol, XMLSchemaProxy, \
+    ElementPathMixin, XPathElement
 
 from .exceptions import XMLSchemaValidationError, XMLSchemaTypeTableWarning
 from .helpers import get_xsd_derivation_attribute
 from .xsdbase import XSD_TYPE_DERIVATIONS, XSD_ELEMENT_DERIVATIONS, \
-    XsdComponent, XsdType, ValidationMixin
-from .particles import ParticleMixin
-from .models import OccursCounter
-from .identities import XsdKeyref
+    XsdComponent, ValidationMixin
+from .particles import ParticleMixin, OccursCalculator
+from .identities import IdentityXPathContext, XsdIdentity, XsdKey, XsdUnique, \
+    XsdKeyref, IdentityCounter, IdentityCounterType
+from .simple_types import XsdSimpleType
+from .attributes import XsdAttribute
 from .wildcards import XsdAnyElement
 
+if TYPE_CHECKING:
+    from .attributes import XsdAttributeGroup
+    from .groups import XsdGroup
 
-class XsdElement(XsdComponent, ValidationMixin, ParticleMixin, ElementPathMixin):
+DataBindingType = Type'dataobjects.DataElement'
+
+
+class XsdElement(XsdComponent, ParticleMixin,
+                 ElementPathMixinSchemaElementType,
+                 ValidationMixinElementType, Any):
     """
     Class for XSD 1.0 *element* declarations.
 
@@ -63,50 +78,69 @@
           Content: (annotation?, ((simpleType | complexType)?, (unique | key | keyref)*))
         </element>
     """
+    name: str
+    local_name: str
+    qualified_name: str
+    prefixed_name: str
+
+    parent: Optional'XsdGroup'
+    ref: Optional'XsdElement'
+    attributes: 'XsdAttributeGroup'
+
+    type: BaseXsdType
     abstract = False
     nillable = False
     qualified = False
-    form = None
-    default = None
-    fixed = None
-    substitution_group = None
+    form: Optionalstr = None
+    default: Optionalstr = None
+    fixed: Optionalstr = None
+    substitution_group: Optionalstr = None
 
-    alternatives = ()
-    inheritable = ()
+    identities: Dictstr, XsdIdentity
+    alternatives = ()  # type: UnionTuple(), ListXsdAlternative
+    inheritable = ()  # type: UnionTuple(), Dictstr, XsdAttribute
 
     _ADMITTED_TAGS = {XSD_ELEMENT}
-    _block = None
-    _final = None
+    _block: Optionalstr = None
+    _final: Optionalstr = None
     _head_type = None
+    _build = True
 
-    binding = None
+    binding: OptionalDataBindingType = None
 
-    def __init__(self, elem, schema, parent):
+    def __init__(self, elem: etree_element,
+                 schema: SchemaType,
+                 parent: OptionalXsdComponent = None,
+                 build: bool = True) -> None:
+
+        if not build:
+            self._build = False
         super(XsdElement, self).__init__(elem, schema, parent)
-        ElementPathMixin.__init__(self)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '%s(%s=%r, occurs=%r)' % (
             self.__class__.__name__,
             'name' if self.ref is None else 'ref',
             self.prefixed_name,
-            self.occurs
+            list(self.occurs)
         )
 
-    def __setattr__(self, name: str, value: OptionalXsdType):
+    def __setattr__(self, name: str, value: Any) -> None:
         if name == "type":
-            try:
-                self.attributes = value.attributes
-            except AttributeError:
+            if isinstance(value, XsdSimpleType):
                 self.attributes = self.schema.create_empty_attribute_group(self)
+            else:
+                self.attributes = value.attributes
         super(XsdElement, self).__setattr__(name, value)
 
-    def __iter__(self):
+    def __iter__(self) -> IteratorSchemaElementType:
         if self.type.has_complex_content():
-            yield from self.type.content.iter_elements()
+            yield from self.type.content.iter_elements()  # type: ignoreunion-attr
+
+    def _parse(self) -> None:
+        if not self._build:
+            return
 
-    def _parse(self):
-        XsdComponent._parse(self)
         self._parse_particle(self.elem)
         self._parse_attributes()
 
@@ -117,7 +151,7 @@
             if self.parent is None and 'substitutionGroup' in self.elem.attrib:
                 self._parse_substitution_group(self.elem.attrib'substitutionGroup')
 
-    def _parse_attributes(self):
+    def _parse_attributes(self) -> None:
         attrib = self.elem.attrib
         if self._parse_reference():
             try:
@@ -196,7 +230,7 @@
                     msg = "attribute {!r} not allowed in a local element declaration"
                     self.parse_error(msg.format(attr_name))
 
-    def _parse_type(self):
+    def _parse_type(self) -> None:
         type_name = self.elem.get('type')
         if type_name is not None:
             try:
@@ -223,13 +257,13 @@
             if child is None:
                 self.type = self.any_type
             elif child.tag == XSD_COMPLEX_TYPE:
-                self.type = self.schema.BUILDERS.complex_type_class(child, self.schema, self)
+                self.type = self.schema.xsd_complex_type_class(child, self.schema, self)
             elif child.tag == XSD_SIMPLE_TYPE:
-                self.type = self.schema.BUILDERS.simple_type_factory(child, self.schema, self)
+                self.type = self.schema.simple_type_factory(child, self.schema, self)
             else:
                 self.type = self.any_type
 
-    def _parse_constraints(self):
+    def _parse_constraints(self) -> None:
         # Value constraints
         if 'default' in self.elem.attrib:
             self.default = self.elem.attrib'default'
@@ -256,13 +290,14 @@
 
         # Identity constraints
         self.identities = {}
+        constraint: UnionXsdKey, XsdUnique, XsdKeyref
         for child in self.elem:
             if child.tag == XSD_UNIQUE:
-                constraint = self.schema.BUILDERS.unique_class(child, self.schema, self)
+                constraint = self.schema.xsd_unique_class(child, self.schema, self)
             elif child.tag == XSD_KEY:
-                constraint = self.schema.BUILDERS.key_class(child, self.schema, self)
+                constraint = self.schema.xsd_key_class(child, self.schema, self)
             elif child.tag == XSD_KEYREF:
-                constraint = self.schema.BUILDERS.keyref_class(child, self.schema, self)
+                constraint = self.schema.xsd_keyref_class(child, self.schema, self)
             else:

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/exceptions.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/exceptions.py Changed

@@ -7,46 +7,55 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
+from typing import TYPE_CHECKING, Any, Optional, cast, Iterable, Union, Callable
 from ..exceptions import XMLSchemaException, XMLSchemaWarning, XMLSchemaValueError
 from ..etree import etree_tostring
+from ..aliases import ElementType, NamespacesType, SchemaElementType, ModelParticleType
 from ..helpers import get_prefixed_qname, etree_getpath, is_etree_element
 
+if TYPE_CHECKING:
+    from ..resources import XMLResource
+    from .xsdbase import XsdValidator
+    from .groups import XsdGroup
+
+ValidatorType = Union'XsdValidator', CallableAny, None
+
 
 class XMLSchemaValidatorError(XMLSchemaException):
     """
     Base class for XSD validator errors.
 
     :param validator: the XSD validator.
-    :type validator: XsdValidator or function
     :param message: the error message.
-    :type message: str or unicode
     :param elem: the element that contains the error.
-    :type elem: Element
     :param source: the XML resource that contains the error.
-    :type source: XMLResource
     :param namespaces: is an optional mapping from namespace prefix to URI.
-    :type namespaces: dict
-    :ivar path: the XPath of the element, calculated when the element is set \
-    or the XML resource is set.
     """
-    def __init__(self, validator, message, elem=None, source=None, namespaces=None):
-        self.path = None
+    _path: Optionalstr
+
+    def __init__(self, validator: ValidatorType,
+                 message: str,
+                 elem: OptionalElementType = None,
+                 source: Optional'XMLResource' = None,
+                 namespaces: OptionalNamespacesType = None) -> None:
+        self._path = None
         self.validator = validator
         self.message = message:-1 if message-1 in ('.', ':') else message
         self.namespaces = namespaces
         self.source = source
         self.elem = elem
 
-    def __str__(self):
+    def __str__(self) -> str:
         if self.elem is None:
             return self.message
 
         msg = '%s:\n' % self.message
-        elem_as_string = etree_tostring(self.elem, self.namespaces, '  ', 20)
+        elem_as_string = cast(str, etree_tostring(self.elem, self.namespaces, '  ', 20))
         msg.append("Schema:\n\n%s\n" % elem_as_string)
 
-        if self.path is not None:
-            msg.append("Path: %s\n" % self.path)
+        path = self.path
+        if path is not None:
+            msg.append("Path: %s\n" % path)
         if self.schema_url is not None:
             msg.append("Schema URL: %s\n" % self.schema_url)
             if self.origin_url not in (None, self.schema_url):
@@ -54,46 +63,75 @@
         return '\n'.join(msg)
 
     @property
-    def msg(self):
+    def msg(self) -> str:
         return self.__str__()
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name: str, value: Any) -> None:
         if name == 'elem' and value is not None:
             if not is_etree_element(value):
                 raise XMLSchemaValueError(
                     "'elem' attribute requires an Element, not %r." % type(value)
                 )
             if self.source is not None:
-                self.path = etree_getpath(value, self.root, self.namespaces,
-                                          relative=False, add_position=True)
+                self._path = etree_getpath(
+                    elem=value,
+                    root=self.source.root,
+                    namespaces=self.namespaces,
+                    relative=False,
+                    add_position=True
+                )
                 if self.source.is_lazy():
                     value = None  # Don't save the element of a lazy resource
         super(XMLSchemaValidatorError, self).__setattr__(name, value)
 
     @property
-    def sourceline(self):
+    def sourceline(self) -> Any:
+        """XML element *sourceline* if available (lxml Element) and *elem* is set."""
         return getattr(self.elem, 'sourceline', None)
 
     @property
-    def root(self):
+    def root(self) -> OptionalElementType:
+        """The XML resource root element if *source* is set."""
         try:
-            return self.source.root
+            return self.source.root  # type: ignoreunion-attr
         except AttributeError:
-            return
+            return None
 
     @property
-    def schema_url(self):
+    def schema_url(self) -> Optionalstr:
+        """The schema URL, if available and the *validator* is an XSD component."""
+        url: Optionalstr
         try:
-            return self.validator.schema.source.url
+            url = self.validator.schema.source.url  # type: ignoreunion-attr
         except AttributeError:
-            return
+            return None
+        else:
+            return url
 
     @property
-    def origin_url(self):
+    def origin_url(self) -> Optionalstr:
+        """The origin schema URL, if available and the *validator* is an XSD component."""
+        url: Optionalstr
         try:
-            return self.validator.maps.validator.source.url
+            url = self.validator.maps.validator.source.url  # type: ignoreunion-attr
         except AttributeError:
-            return
+            return None
+        else:
+            return url
+
+    @property
+    def path(self) -> Optionalstr:
+        """The XPath of the element, if it's not `None` and the XML resource is set."""
+        if self.elem is None or self.source is None:
+            return self._path
+
+        return etree_getpath(
+            elem=self.elem,
+            root=self.source.root,
+            namespaces=self.namespaces,
+            relative=False,
+            add_position=True
+        )
 
 
 class XMLSchemaNotBuiltError(XMLSchemaValidatorError, RuntimeError):
@@ -101,11 +139,9 @@
     Raised when there is an improper usage attempt of a not built XSD validator.
 
     :param validator: the XSD validator.
-    :type validator: XsdValidator
     :param message: the error message.
-    :type message: str or unicode
     """
-    def __init__(self, validator, message):
+    def __init__(self, validator: 'XsdValidator', message: str) -> None:
         super(XMLSchemaNotBuiltError, self).__init__(
             validator=validator,
             message=message,
@@ -115,18 +151,16 @@
         )
 
 
-class XMLSchemaParseError(XMLSchemaValidatorError, SyntaxError):
+class XMLSchemaParseError(XMLSchemaValidatorError, SyntaxError):  # type: ignoremisc
     """
     Raised when an error is found during the building of an XSD validator.
 
     :param validator: the XSD validator.
-    :type validator: XsdValidator or function
     :param message: the error message.
-    :type message: str or unicode
     :param elem: the element that contains the error.
-    :type elem: Element
     """
-    def __init__(self, validator, message, elem=None):
+    def __init__(self, validator: 'XsdValidator', message: str,
+                 elem: OptionalElementType = None) -> None:
         super(XMLSchemaParseError, self).__init__(
             validator=validator,
             message=message,
@@ -141,11 +175,9 @@
     Raised when a model error is found during the checking of a model group.
 
     :param group: the XSD model group.
-    :type group: XsdGroup
     :param message: the error message.

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/facets.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/facets.py Changed

@@ -13,45 +13,60 @@
 import re
 import math
 import operator
-from collections.abc import MutableSequence
+from abc import abstractmethod
+from typing import TYPE_CHECKING, cast, Any, List, Optional, Pattern, Union, \
+    MutableSequence, overload, Tuple
 from elementpath import XPath2Parser, XPathContext, ElementPathError, \
     translate_pattern, RegexError
 
-from ..etree import etree_element
 from ..names import XSD_LENGTH, XSD_MIN_LENGTH, XSD_MAX_LENGTH, XSD_ENUMERATION, \
     XSD_INTEGER, XSD_WHITE_SPACE, XSD_PATTERN, XSD_MAX_INCLUSIVE, XSD_MAX_EXCLUSIVE, \
     XSD_MIN_INCLUSIVE, XSD_MIN_EXCLUSIVE, XSD_TOTAL_DIGITS, XSD_FRACTION_DIGITS, \
-    XSD_ASSERTION, XSD_DECIMAL, XSD_EXPLICIT_TIMEZONE, XSD_NOTATION_TYPE, XSD_QNAME
-from ..helpers import count_digits
+    XSD_ASSERTION, XSD_DECIMAL, XSD_EXPLICIT_TIMEZONE, XSD_NOTATION_TYPE, XSD_QNAME, \
+    XSD_ANNOTATION
+from ..etree import etree_element
+from ..aliases import ElementType, SchemaType, AtomicValueType, BaseXsdType
+from ..helpers import count_digits, local_name
 from .exceptions import XMLSchemaValidationError, XMLSchemaDecodeError
-from .xsdbase import XsdComponent
+from .xsdbase import XsdComponent, XsdAnnotation
+
+if TYPE_CHECKING:
+    from .simple_types import XsdList, XsdAtomicRestriction
+
+LaxDecodeType = TupleAny, ListXMLSchemaValidationError
 
 
 class XsdFacet(XsdComponent):
     """
     XML Schema constraining facets base class.
     """
+    value: OptionalAtomicValueType
+    base_type: OptionalBaseXsdType
+    base_value: OptionalAtomicValueType
     fixed = False
 
-    def __init__(self, elem, schema, parent, base_type):
+    def __init__(self, elem: ElementType,
+                 schema: SchemaType,
+                 parent: Union'XsdList', 'XsdAtomicRestriction',
+                 base_type: OptionalBaseXsdType) -> None:
         self.base_type = base_type
         super(XsdFacet, self).__init__(elem, schema, parent)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '%s(value=%r, fixed=%r)' % (self.__class__.__name__, self.value, self.fixed)
 
-    def __call__(self, value):
+    def __call__(self, value: Any) -> None:
         try:
             self._validator(value)
-        except TypeError as err:
-            raise XMLSchemaValidationError(self, value, str(err)) from None
+        except TypeError:
+            reason = "invalid type {!r} provided".format(type(value))
+            raise XMLSchemaValidationError(self, value, reason) from None
 
     @staticmethod
-    def _validator(_):
+    def _validator(_: Any) -> None:
         return
 
-    def _parse(self):
-        super(XsdFacet, self)._parse()
+    def _parse(self) -> None:
         if 'fixed' in self.elem.attrib and self.elem.attrib'fixed' in ('true', '1'):
             self.fixed = True
         base_facet = self.base_facet
@@ -65,32 +80,34 @@
         else:
             if base_facet is not None and base_facet.fixed and \
                     base_facet.value is not None and self.value != base_facet.value:
-                self.parse_error(
-                    "%r facet value is fixed to %r" % (self.elem.tag, base_facet.value)
-                )
+                self.parse_error("{!r} facet value is fixed to {!r}"
+                                 .format(local_name(self.elem.tag), base_facet.value))
 
-    def _parse_value(self, elem):
-        self.value = elem.attrib'value'
+    def _parse_value(self, elem: ElementType) -> UnionNone, AtomicValueType, Patternstr:
+        self.value = elem.attrib'value'  # pragma: no cover
+        return None
 
     @property
-    def built(self):
-        return True
+    def built(self) -> bool:
+        return True  # pragma: no cover
 
     @property
-    def base_facet(self):
+    def base_facet(self) -> Optional'XsdFacet':
         """
         An object of the same type if the instance has a base facet, `None` otherwise.
         """
-        base_type = self.base_type
+        base_type: OptionalBaseXsdType = self.base_type
         tag = self.elem.tag
         while True:
+            if base_type is None:
+                return None
             try:
-                return base_type.facetstag
+                base_facet = base_type.facetstag  # type: ignoreunion-attr
             except (AttributeError, KeyError):
-                if hasattr(base_type, 'base_type'):
-                    base_type = base_type.base_type
-                else:
-                    return None
+                base_type = base_type.base_type
+            else:
+                assert isinstance(base_facet, self.__class__)
+                return base_facet
 
 
 class XsdWhiteSpaceFacet(XsdFacet):
@@ -105,29 +122,29 @@
           Content: (annotation?)
         </whiteSpace>
     """
+    value: str
     _ADMITTED_TAGS = XSD_WHITE_SPACE,
 
-    def _parse_value(self, elem):
-        self.value = value = elem.attrib'value'
-        if self.base_value == 'collapse' and value in ('preserve', 'replace'):
+    def _parse_value(self, elem: ElementType) -> None:
+        self.value = elem.attrib'value'
+        if self.value == 'collapse':
+            self._validator = self.collapse_white_space_validator  # type: ignoreassignment
+        elif self.value == 'replace':
+            if self.base_value == 'collapse':
+                self.parse_error("facet value can be only 'collapse'")
+            self._validator = self.replace_white_space_validator  # type: ignoreassignment
+        elif self.base_value == 'collapse':
             self.parse_error("facet value can be only 'collapse'")
-        elif self.base_value == 'replace' and value == 'preserve':
+        elif self.base_value == 'replace':
             self.parse_error("facet value can be only 'replace' or 'collapse'")
-        elif value == 'replace':
-            self._validator = self.replace_white_space_validator
-        elif value == 'collapse':
-            self._validator = self.collapse_white_space_validator
-        elif value != 'preserve':
-            self.parse_error("attribute 'value' must be one of "
-                             "('preserve', 'replace', 'collapse').")
-
-    def replace_white_space_validator(self, value):
+
+    def replace_white_space_validator(self, value: str) -> None:
         if '\t' in value or '\n' in value:
             raise XMLSchemaValidationError(
                 self, value, "value contains tabs or newlines"
             )
 
-    def collapse_white_space_validator(self, value):
+    def collapse_white_space_validator(self, value: str) -> None:
         if '\t' in value or '\n' in value or '  ' in value:
             raise XMLSchemaValidationError(
                 self, value, "value contains non collapsed white spaces"
@@ -146,19 +163,22 @@
           Content: (annotation?)
         </length>
     """
+    value: int
+    base_type: BaseXsdType
+    base_value: Optionalint
     _ADMITTED_TAGS = XSD_LENGTH,
 
-    def _parse_value(self, elem):
+    def _parse_value(self, elem: ElementType) -> None:
         self.value = int(elem.attrib'value')
         if self.base_value is not None and self.value != self.base_value:
-            self.parse_error("base type has a different 'length': %r" % self.base_value)
+            self.parse_error("base facet has a different length ({})".format(self.base_value))
 
         primitive_type = getattr(self.base_type, 'primitive_type', None)
         if primitive_type is None or primitive_type.name not in {XSD_QNAME, XSD_NOTATION_TYPE}:
-            # See: https://www.w3.org/Bugs/Public/show_bug.cgi?id=4009 and id=4049
-            self._validator = self._length_validator
+            # See: https://www.w3.org/Bugs/Public/show_bug.cgi?id=4009
+            self._validator = self._length_validator  # type: ignoreassignment
 
-    def _length_validator(self, value):
+    def _length_validator(self, value: Any) -> None:
         if len(value) != self.value:
             reason = "length has to be {!r}".format(self.value)
             raise XMLSchemaValidationError(self, value, reason)
@@ -176,19 +196,22 @@
           Content: (annotation?)
         </minLength>
     """
+    value: int

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/global_maps.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/global_maps.py Changed

@@ -13,26 +13,33 @@
 import warnings
 from collections import Counter
 from functools import lru_cache
-from typing import Union
+from typing import cast, Any, Callable, Dict, List, Iterable, Iterator, \
+    MutableMapping, Optional, Set, Union, Tuple, Type
 
 from ..exceptions import XMLSchemaKeyError, XMLSchemaTypeError, XMLSchemaValueError, \
-    XMLSchemaWarning
+    XMLSchemaRuntimeError, XMLSchemaWarning
 from ..names import XSD_NAMESPACE, XSD_REDEFINE, XSD_OVERRIDE, XSD_NOTATION, \
     XSD_ANY_TYPE, XSD_SIMPLE_TYPE, XSD_COMPLEX_TYPE, XSD_GROUP, \
     XSD_ATTRIBUTE, XSD_ATTRIBUTE_GROUP, XSD_ELEMENT, XSI_TYPE
+from ..aliases import ComponentClassType, ElementType, SchemaType, BaseXsdType, \
+    SchemaGlobalType
 from ..helpers import get_qname, local_name, get_extended_qname
 from ..namespaces import NamespaceResourcesMap
-from . import XMLSchemaNotBuiltError, XMLSchemaModelError, XMLSchemaModelDepthError, \
-    XsdValidator, XsdComponent, XsdAttribute, XsdSimpleType, XsdComplexType, \
-    XsdElement, XsdAttributeGroup, XsdGroup, XsdNotation, XsdIdentity, XsdAssert
+from .exceptions import XMLSchemaNotBuiltError, XMLSchemaModelError, XMLSchemaModelDepthError, \
+    XMLSchemaParseError
+from .xsdbase import XsdValidator, XsdComponent
 from .builtins import xsd_builtin_types_factory
+from . import XsdAttribute, XsdSimpleType, XsdComplexType, XsdElement, XsdAttributeGroup, \
+    XsdGroup, XsdNotation, XsdIdentity, XsdAssert, XsdUnion, XsdAtomicRestriction
 
 
 #
 # Defines the load functions for XML Schema structures
-def create_load_function(tag):
+def create_load_function(tag: str) \
+        -> CallableDictstr, Any, IterableSchemaType, None:
 
-    def load_xsd_globals(xsd_globals, schemas):
+    def load_xsd_globals(xsd_globals: Dictstr, Any,
+                         schemas: IterableSchemaType) -> None:
         redefinitions = 
         for schema in schemas:
             target_namespace = schema.target_namespace
@@ -68,13 +75,14 @@
                     msg = "global {} with name={!r} is already defined"
                     schema.parse_error(msg.format(local_name(tag), qname))
 
-        tags = Counter(x0 for x in redefinitions)
+        redefined_names = Counter(x0 for x in redefinitions)
         for qname, elem, child, schema, redefined_schema in reversed(redefinitions):
 
             # Checks multiple redefinitions
-            if tagsqname > 1:
-                tagsqname = 1
+            if redefined_namesqname > 1:
+                redefined_namesqname = 1
 
+                redefined_schemas: Any
                 redefined_schemas = x-1 for x in redefinitions if x0 == qname
                 if any(redefined_schemas.count(x) > 1 for x in redefined_schemas):
                     msg = "multiple redefinition for {} {!r}"
@@ -120,86 +128,6 @@
 load_xsd_notations = create_load_function(XSD_NOTATION)
 
 
-def create_lookup_function(xsd_classes):
-    if isinstance(xsd_classes, tuple):
-        types_desc = ' or '.join(c.__name__ for c in xsd_classes)
-    else:
-        types_desc = xsd_classes.__name__
-
-    def lookup(qname, global_map, tag_map):
-        try:
-            obj = global_mapqname
-        except KeyError:
-            if '{' in qname:
-                raise XMLSchemaKeyError("missing an %s component for %r!" % (types_desc, qname))
-            raise XMLSchemaKeyError(
-                "missing an %s component for %r! As the name has no namespace "
-                "maybe a missing default namespace declaration." % (types_desc, qname)
-            )
-        else:
-            if isinstance(obj, xsd_classes):
-                return obj
-
-            elif isinstance(obj, tuple):
-                # Not built XSD global component without redefinitions
-                try:
-                    elem, schema = obj
-                except ValueError:
-                    return obj0  # Circular build, simply return (elem, schema) couple
-
-                try:
-                    factory_or_class = tag_mapelem.tag
-                except KeyError:
-                    raise XMLSchemaKeyError("wrong element %r for map %r." % (elem, global_map))
-
-                global_mapqname = obj,  # Encapsulate into a tuple to catch circular builds
-                global_mapqname = factory_or_class(elem, schema, parent=None)
-                return global_mapqname
-
-            elif isinstance(obj, list):
-                # Not built XSD global component with redefinitions
-                try:
-                    elem, schema = obj0
-                except ValueError:
-                    return obj00  # Circular build, simply return (elem, schema) couple
-
-                try:
-                    factory_or_class = tag_mapelem.tag
-                except KeyError:
-                    raise XMLSchemaKeyError("wrong element %r for map %r." % (elem, global_map))
-
-                global_mapqname = obj0,  # To catch circular builds
-                global_mapqname = component = factory_or_class(elem, schema, parent=None)
-
-                # Apply redefinitions (changing elem involve a re-parsing of the component)
-                for elem, schema in obj1::
-                    if component.schema.target_namespace != schema.target_namespace:
-                        msg = "redefined schema {!r} has a different targetNamespace"
-                        raise XMLSchemaValueError(msg.format(schema))
-
-                    component.redefine = component.copy()
-                    component.redefine.parent = component
-                    component.schema = schema
-                    component.elem = elem
-
-                return global_mapqname
-
-            else:
-                raise XMLSchemaTypeError(
-                    "wrong instance %s for XSD global %r, a %s required." % (obj, qname, types_desc)
-                )
-
-    return lookup
-
-
-lookup_notation = create_lookup_function(XsdNotation)
-lookup_type = create_lookup_function((XsdSimpleType, XsdComplexType))
-lookup_attribute = create_lookup_function(XsdAttribute)
-lookup_attribute_group = create_lookup_function(XsdAttributeGroup)
-lookup_group = create_lookup_function(XsdGroup)
-lookup_element = create_lookup_function(XsdElement)
-
-
 class XsdGlobals(XsdValidator):
     """
     Mediator class for related XML schema instances. It stores the global
@@ -209,7 +137,20 @@
     :param validator: the origin schema class/instance used for creating the global maps.
     :param validation: the XSD validation mode to use, can be 'strict', 'lax' or 'skip'.
     """
-    _lookup_resolver = {
+    types: Dictstr, UnionBaseXsdType, TupleElementType, SchemaType
+    attributes: Dictstr, UnionXsdAttribute, TupleElementType, SchemaType
+    attribute_groups: Dictstr, UnionXsdAttributeGroup, TupleElementType, SchemaType
+    groups: Dictstr, UnionXsdGroup, TupleElementType, SchemaType
+    notations: Dictstr, UnionXsdNotation, TupleElementType, SchemaType
+    elements: Dictstr, UnionXsdElement, TupleElementType, SchemaType
+
+    substitution_groups: Dictstr, SetXsdElement
+    identities: Dictstr, XsdIdentity
+    global_maps: TupleDictstr, Any, ...
+
+    missing_locations: Liststr
+
+    _lookup_function_resolver = {
         XSD_SIMPLE_TYPE: 'lookup_type',
         XSD_COMPLEX_TYPE: 'lookup_type',
         XSD_ELEMENT: 'lookup_element',
@@ -219,12 +160,8 @@
         XSD_NOTATION: 'lookup_notation',
     }
 
-    def __init__(self, validator, validation='strict'):
+    def __init__(self, validator: SchemaType, validation: str = 'strict') -> None:
         super(XsdGlobals, self).__init__(validation)
-        if not all(hasattr(validator, a) for a in ('meta_schema', 'BUILDERS_MAP')):
-            raise XMLSchemaValueError(
-                "The argument {!r} is not an XSD schema validator".format(validator)
-            )
 
         self.validator = validator
         self.namespaces = NamespaceResourcesMap()  # Registered schemas by namespace URI
@@ -242,12 +179,23 @@
         self.global_maps = (self.notations, self.types, self.attributes,
                             self.attribute_groups, self.groups, self.elements)
 
-    def __repr__(self):
+        self._builders: Dictstr, CallableElementType, SchemaType, Any = {
+            XSD_NOTATION: validator.xsd_notation_class,
+            XSD_SIMPLE_TYPE: validator.simple_type_factory,
+            XSD_COMPLEX_TYPE: validator.xsd_complex_type_class,
+            XSD_ATTRIBUTE: validator.xsd_attribute_class,
+            XSD_ATTRIBUTE_GROUP: validator.xsd_attribute_group_class,
+            XSD_GROUP: validator.xsd_group_class,
+            XSD_ELEMENT: validator.xsd_element_class,
+        }
+
+    def __repr__(self) -> str:
         return '%s(validator=%r, validation=%r)' % (
             self.__class__.__name__, self.validator, self.validation

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/groups.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/groups.py Changed

@@ -11,24 +11,31 @@
 This module contains classes for XML Schema model groups.
 """
 import warnings
-from collections.abc import MutableMapping, MutableSequence
+from collections.abc import MutableMapping
+from typing import TYPE_CHECKING, overload, Any, Iterable, Iterator, List, \
+    MutableSequence, Optional, Tuple, Union
 
 from .. import limits
 from ..exceptions import XMLSchemaValueError
 from ..names import XSD_GROUP, XSD_SEQUENCE, XSD_ALL, XSD_CHOICE, XSD_ELEMENT, \
     XSD_ANY, XSI_TYPE, XSD_ANY_TYPE, XSD_ANNOTATION
-from ..etree import etree_element
-from ..helpers import get_qname, local_name, not_whitespace, raw_xml_encode
+from ..etree import etree_element, ElementData
+from ..aliases import ElementType, NamespacesType, SchemaType, IterDecodeType, \
+    IterEncodeType, ModelParticleType, SchemaElementType, ComponentClassType
+from ..helpers import get_qname, local_name, raw_xml_encode
 
 from .exceptions import XMLSchemaModelError, XMLSchemaModelDepthError, \
     XMLSchemaValidationError, XMLSchemaChildrenValidationError, \
     XMLSchemaTypeTableWarning
 from .xsdbase import ValidationMixin, XsdComponent, XsdType
-from .particles import ParticleMixin, ModelGroup
-from .elements import XsdElement
+from .particles import ParticleMixin, OccursCalculator
+from .elements import XsdElement, XsdAlternative
 from .wildcards import XsdAnyElement, Xsd11AnyElement
 from .models import ModelVisitor, distinguishable_paths
 
+if TYPE_CHECKING:
+    from .complex_types import XsdComplexType
+
 ANY_ELEMENT = etree_element(
     XSD_ANY,
     attrib={
@@ -38,8 +45,12 @@
         'maxOccurs': 'unbounded'
     })
 
+GroupDecodeType = ListTupleUnionstr, int, Any, OptionalSchemaElementType
+GroupEncodeType = TupleOptionalstr, ListElementType
+
 
-class XsdGroup(XsdComponent, ModelGroup, ValidationMixin):
+class XsdGroup(XsdComponent, MutableSequenceModelParticleType,
+               ParticleMixin, ValidationMixinElementType, GroupDecodeType):
     """
     Class for XSD 1.0 *model group* definitions.
 
@@ -77,33 +88,313 @@
           Content: (annotation?, (element | group | choice | sequence | any)*)
         </sequence>
     """
-    mixed = False
-    restriction = None
-    interleave = None  # an Xsd11AnyElement in case of XSD 1.1 openContent with mode='interleave'
-    suffix = None  # an Xsd11AnyElement in case of openContent with mode='suffix' or 'interleave'
+    parent: OptionalUnion'XsdComplexType', 'XsdGroup'
+    model: str
+    mixed: bool = False
+    ref: Optional'XsdGroup'
+    restriction: Optional'XsdGroup' = None
+
+    # For XSD 1.1 openContent processing
+    interleave: OptionalXsd11AnyElement = None  # if openContent with mode='interleave'
+    suffix: OptionalXsd11AnyElement = None  # if openContent with mode='suffix'/'interleave'
 
     _ADMITTED_TAGS = {XSD_GROUP, XSD_SEQUENCE, XSD_ALL, XSD_CHOICE}
 
-    def __init__(self, elem, schema, parent):
-        self._group = 
+    def __init__(self, elem: ElementType,
+                 schema: SchemaType,
+                 parent: OptionalUnion'XsdComplexType', 'XsdGroup' = None) -> None:
+
+        self._group: ListModelParticleType = 
         if parent is not None and parent.mixed:
             self.mixed = parent.mixed
         super(XsdGroup, self).__init__(elem, schema, parent)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         if self.name is None:
-            return '%s(model=%r, occurs=%r)' % (self.__class__.__name__, self.model, self.occurs)
+            return '%s(model=%r, occurs=%r)' % (
+                self.__class__.__name__, self.model, list(self.occurs)
+            )
         elif self.ref is None:
             return '%s(name=%r, model=%r, occurs=%r)' % (
-                self.__class__.__name__, self.prefixed_name, self.model, self.occurs
+                self.__class__.__name__, self.prefixed_name, self.model, list(self.occurs)
             )
         else:
             return '%s(ref=%r, model=%r, occurs=%r)' % (
-                self.__class__.__name__, self.prefixed_name, self.model, self.occurs
+                self.__class__.__name__, self.prefixed_name, self.model, list(self.occurs)
             )
 
-    def copy(self):
-        group = object.__new__(self.__class__)
+    @overload
+    def __getitem__(self, i: int) -> ModelParticleType: ...
+
+    @overload
+    def __getitem__(self, s: slice) -> MutableSequenceModelParticleType: ...
+
+    def __getitem__(self, i: Unionint, slice) \
+            -> UnionModelParticleType, MutableSequenceModelParticleType:
+        return self._groupi
+
+    def __setitem__(self, i: Unionint, slice, o: Any) -> None:
+        self._groupi = o
+
+    def __delitem__(self, i: Unionint, slice) -> None:
+        del self._groupi
+
+    def __len__(self) -> int:
+        return len(self._group)
+
+    def insert(self, i: int, item: ModelParticleType) -> None:
+        self._group.insert(i, item)
+
+    def clear(self) -> None:
+        del self._group:
+
+    def is_emptiable(self) -> bool:
+        if self.model == 'choice':
+            return self.min_occurs == 0 or not self or any(item.is_emptiable() for item in self)
+        else:
+            return self.min_occurs == 0 or not self or all(item.is_emptiable() for item in self)
+
+    def is_single(self) -> bool:
+        if self.max_occurs != 1 or not self:
+            return False
+        elif len(self) > 1 or not isinstance(self0, XsdGroup):
+            return True
+        else:
+            return self0.is_single()
+
+    def is_pointless(self, parent: 'XsdGroup') -> bool:
+        """
+        Returns `True` if the group may be eliminated without affecting the model,
+        `False` otherwise. A group is pointless if one of those conditions is verified:
+
+         - the group is empty
+         - minOccurs == maxOccurs == 1 and the group has one child
+         - minOccurs == maxOccurs == 1 and the group and its parent have a sequence model
+         - minOccurs == maxOccurs == 1 and the group and its parent have a choice model
+
+        Ref: https://www.w3.org/TR/2004/REC-xmlschema-1-20041028/#coss-particle
+
+        :param parent: effective parent of the model group.
+        """
+        if not self:
+            return True
+        elif self.min_occurs != 1 or self.max_occurs != 1:
+            return False
+        elif len(self) == 1:
+            return True
+        elif self.model == 'sequence' and parent.model != 'sequence':
+            return False
+        elif self.model == 'choice' and parent.model != 'choice':
+            return False
+        else:
+            return True
+
+    @property
+    def effective_min_occurs(self) -> int:
+        if not self.min_occurs or not self:
+            return 0
+        elif self.model == 'choice':
+            if any(not e.effective_min_occurs for e in self.iter_model()):
+                return 0
+        else:
+            if all(not e.effective_min_occurs for e in self.iter_model()):
+                return 0
+        return self.min_occurs
+
+    @property
+    def effective_max_occurs(self) -> Optionalint:
+        if self.max_occurs == 0 or not self:
+            return 0
+
+        effective_items: ListAny
+        value: int
+
+        effective_items = e for e in self.iter_model() if e.effective_max_occurs != 0
+        if not effective_items:
+            return 0
+        elif self.max_occurs is None:
+            return None
+        elif self.model == 'choice':
+            try:
+                value = max(e.effective_max_occurs for e in effective_items)
+            except TypeError:
+                return None
+            else:
+                return self.max_occurs * value

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/helpers.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/helpers.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/identities.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/identities.py Changed

@@ -12,26 +12,36 @@
 """
 import re
 import math
-from collections import Counter
-from typing import Dict, Union
-from elementpath import XPath2Parser, ElementPathError, XPathContext, translate_pattern
+from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, Pattern, \
+    Tuple, Union, Counter
+from elementpath import XPath2Parser, ElementPathError, XPathToken, XPathContext, \
+    translate_pattern, datatypes
 
 from ..exceptions import XMLSchemaTypeError, XMLSchemaValueError
 from ..names import XSD_QNAME, XSD_UNIQUE, XSD_KEY, XSD_KEYREF, XSD_SELECTOR, XSD_FIELD
 from ..helpers import get_qname, get_extended_qname
+from ..aliases import ElementType, SchemaType, NamespacesType, AtomicValueType
 from ..xpath import iter_schema_nodes
 from .xsdbase import XsdComponent
 from .attributes import XsdAttribute
 
+if TYPE_CHECKING:
+    from .elements import XsdElement
 
-XSD_IDENTITY_XPATH_SYMBOLS = {
+IdentityFieldItemType = UnionAtomicValueType, XsdAttribute, TupleAny, ..., None
+IdentityCounterType = TupleIdentityFieldItemType, ...
+IdentityMapType = DictUnion'XsdKey', 'XsdKeyref', str, None,
+                       Union'IdentityCounter', 'KeyrefCounter'
+
+XSD_IDENTITY_XPATH_SYMBOLS = frozenset((
     'processing-instruction', 'following-sibling', 'preceding-sibling',
     'ancestor-or-self', 'attribute', 'following', 'namespace', 'preceding',
     'ancestor', 'position', 'comment', 'parent', 'child', 'false', 'text', 'node',
-    'true', 'last', 'not', 'and', 'mod', 'div', 'or', '..', '//', '!=', '<=', '>=', '(', ')',
-    '', '', '.', '@', ',', '/', '|', '*', '-', '=', '+', '<', '>', ':', '(end)', '(name)',
-    '(string)', '(float)', '(decimal)', '(integer)', '::', '{', '}',
-}
+    'true', 'last', 'not', 'and', 'mod', 'div', 'or', '..', '//', '!=', '<=', '>=',
+    '(', ')', '', '', '.', '@', ',', '/', '|', '*', '-', '=', '+', '<', '>', ':',
+    '(end)', '(unknown)', '(invalid)', '(name)', '(string)', '(float)', '(decimal)',
+    '(integer)', '::', '{', '}',
+))
 
 
 # XSD identities use a restricted parser and a context for iterate element
@@ -43,7 +53,8 @@
 
 class IdentityXPathParser(XPath2Parser):
     symbol_table = {
-        k: v for k, v in XPath2Parser.symbol_table.items() if k in XSD_IDENTITY_XPATH_SYMBOLS
+        k: v for k, v in XPath2Parser.symbol_table.items()  # type: ignoremisc
+        if k in XSD_IDENTITY_XPATH_SYMBOLS
     }
     SYMBOLS = XSD_IDENTITY_XPATH_SYMBOLS
 
@@ -52,7 +63,7 @@
     """Class for defining an XPath selector for an XSD identity constraint."""
     _ADMITTED_TAGS = {XSD_SELECTOR}
     xpath_default_namespace = ''
-    pattern = translate_pattern(
+    pattern: Unionstr, Patternstr = translate_pattern(
         r"(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?"
         r"((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?"
         r"(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*",
@@ -60,28 +71,29 @@
         lazy_quantifiers=False,
         anchors=False
     )
-    token = None
-    parser = None
+    token = None   # type: XPathToken
+    parser = None  # type: IdentityXPathParser
 
-    def __init__(self, elem, schema, parent):
+    def __init__(self, elem: ElementType, schema: SchemaType,
+                 parent: Optional'XsdIdentity') -> None:
         super(XsdSelector, self).__init__(elem, schema, parent)
 
-    def _parse(self):
-        super(XsdSelector, self)._parse()
+    def _parse(self) -> None:
         try:
             self.path = self.elem.attrib'xpath'
         except KeyError:
             self.parse_error("'xpath' attribute required")
             self.path = '*'
         else:
+            path = self.path.replace(' ', '')
             try:
-                match = self.pattern.match(self.path.replace(' ', ''))
+                _match = self.pattern.match(path)  # type: ignoreunion-attr
             except AttributeError:
                 # Compile regex pattern
                 self.__class__.pattern = re.compile(self.pattern)
-                match = self.pattern.match(self.path.replace(' ', ''))
+                _match = self.pattern.match(path)  # type: ignoreunion-attr
 
-            if not match:
+            if not _match:
                 msg = "invalid XPath expression for an {}"
                 self.parse_error(msg.format(self.__class__.__name__))
 
@@ -105,15 +117,15 @@
             self.token = self.parser.parse('*')
             self.parse_error(err)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '%s(path=%r)' % (self.__class__.__name__, self.path)
 
     @property
-    def built(self):
+    def built(self) -> bool:
         return self.token is not None
 
     @property
-    def target_namespace(self):
+    def target_namespace(self) -> str:
         # TODO: implement a property in elementpath for getting XPath token's namespace
         if self.token is None:
             pass  # xpathDefaultNamespace="##targetNamespace"
@@ -146,20 +158,28 @@
     :ivar selector: the XPath selector of the identity constraint.
     :ivar fields: a list containing the XPath field selectors of the identity constraint.
     """
-    selector = None
-    elements = None  # XSD elements bound by selector (for speed-up and lazy mode)
-    fields = ()
+    name: str
+    local_name: str
+    prefixed_name: str
+    parent: 'XsdElement'
+    ref: Optional'XsdIdentity'
+
+    selector = None  # type: XsdSelector
+    fields = ()      # type: UnionTuple(), ListXsdFieldSelector
+
+    # XSD elements bound by selector (for speed-up and for lazy mode)
+    elements: UnionTuple(), Dict'XsdElement', OptionalIdentityCounterType = ()
 
-    def __init__(self, elem, schema, parent):
+    def __init__(self, elem: ElementType, schema: SchemaType,
+                 parent: Optional'XsdElement') -> None:
         super(XsdIdentity, self).__init__(elem, schema, parent)
 
-    def _parse(self):
-        super(XsdIdentity, self)._parse()
+    def _parse(self) -> None:
         try:
             self.name = get_qname(self.target_namespace, self.elem.attrib'name')
         except KeyError:
             self.parse_error("missing required attribute 'name'")
-            self.name = None
+            self.name = ''
 
         for child in self.elem:
             if child.tag == XSD_SELECTOR:
@@ -173,8 +193,8 @@
             if child.tag == XSD_FIELD:
                 self.fields.append(XsdFieldSelector(child, self.schema, self))
 
-    def build(self):
-        if self.ref is True:
+    def build(self) -> None:
+        if self.ref is True:  # type: ignorecomparison-overlap
             try:
                 ref = self.maps.identitiesself.name
             except KeyError:
@@ -187,34 +207,40 @@
                 self.fields = ref.fields
                 self.ref = ref
 
-        context = IdentityXPathContext(self.schema, item=self.parent)
+        context = IdentityXPathContext(self.schema, item=self.parent)  # type: ignore
 
+        self.elements = {}
         try:
-            self.elements = {
-                e: None for e in self.selector.token.select_results(context) if e.name
-            }
+            for e in self.selector.token.select_results(context):
+                if not isinstance(e, XsdComponent) or isinstance(e, XsdAttribute):
+                    self.parse_error("selector xpath expression can only select elements")
+                elif e.name is not None:
+                    self.elementse = None  # type: ignoreindex
         except AttributeError:
-            self.elements = {}
+            pass
         else:
-            if any(isinstance(e, XsdAttribute) for e in self.elements):
-                self.parse_error("selector xpath cannot select attributes")
-            elif not self.elements:
+            if not self.elements:
                 # Try to detect target XSD elements extracting QNames
                 # of the leaf elements from the XPath expression and
                 # use them to match global elements.
 
+                qname: Any
                 for qname in self.selector.token.iter_leaf_elements():
                     xsd_element = self.maps.elements.get(

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/models.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/models.py Changed

@@ -8,23 +8,30 @@
 # @author Davide Brunato <brunato@sissa.it>
 #
 """
-This module contains classes and functions for validating XSD content models.
+This module contains a function and a class for validating XSD content models.
 """
-from collections import defaultdict, deque, Counter
-from typing import List, Tuple, Union, Iterator
+from collections import defaultdict, deque
+from typing import Any, Counter, Dict, Iterable, Iterator, List, Optional, Tuple, Union
 
 from ..exceptions import XMLSchemaValueError
-from .particles import ParticleMixin, ModelGroup
+from ..aliases import ModelGroupType, ModelParticleType, SchemaElementType
+from . import groups
 
+AdvanceYieldedType = TupleModelParticleType, int, ListSchemaElementType
+EncodedContentType = UnionDictUnionint, str, ListAny,
+                           ListTupleUnionint, str, ListAny
+ContentItemType = TupleUnionint, str, Any
 
-def distinguishable_paths(path1: ListUnionParticleMixin, ModelGroup,
-                          path2: ListUnionParticleMixin, ModelGroup):
+
+def distinguishable_paths(path1: ListModelParticleType, path2: ListModelParticleType) -> bool:
     """
     Checks if two model paths are distinguishable in a deterministic way, without looking forward
     or backtracking. The arguments are lists containing paths from the base group of the model to
     a couple of leaf elements. Returns `True` if there is a deterministic separation between paths,
     `False` if the paths are ambiguous.
     """
+    e: ModelParticleType
+
     for k, e in enumerate(path1):
         if e not in path2:
             if not k:
@@ -38,7 +45,7 @@
         return True
 
     univocal1 = univocal2 = True
-    if path1depth.model == 'sequence':
+    if path1depth.model == 'sequence':  # type: ignoreunion-attr
         idx1 = path1depth.index(path1depth + 1)
         idx2 = path2depth.index(path2depth + 1)
         before1 = any(not e.is_emptiable() for e in path1depth:idx1)
@@ -50,7 +57,7 @@
     for k in range(depth + 1, len(path1) - 1):
         univocal1 &= path1k.is_univocal()
         idx = path1k.index(path1k + 1)
-        if path1k.model == 'sequence':
+        if path1k.model == 'sequence':  # type: ignoreunion-attr
             before1 |= any(not e.is_emptiable() for e in path1k:idx)
             after1 |= any(not e.is_emptiable() for e in path1kidx + 1:)
         elif any(e.is_emptiable() for e in path1k if e is not path1kidx):
@@ -59,13 +66,13 @@
     for k in range(depth + 1, len(path2) - 1):
         univocal2 &= path2k.is_univocal()
         idx = path2k.index(path2k + 1)
-        if path2k.model == 'sequence':
+        if path2k.model == 'sequence':  # type: ignoreunion-attr
             before2 |= any(not e.is_emptiable() for e in path2k:idx)
             after2 |= any(not e.is_emptiable() for e in path2kidx + 1:)
         elif any(e.is_emptiable() for e in path2k if e is not path2kidx):
             univocal2 = False
 
-    if path1depth.model != 'sequence':
+    if path1depth.model != 'sequence':  # type: ignoreunion-attr
         if before1 and before2:
             return True
         elif before1:
@@ -88,27 +95,30 @@
     counting the occurrences and yielding tuples in case of model's item occurrence errors.
     Ends setting the current element to `None`.
 
-    :param root: the root ModelGroup instance of the model.
+    :param root: the root model group.
     :ivar occurs: the Counter instance for keeping track of occurrences of XSD elements and groups.
     :ivar element: the current XSD element, initialized to the first element of the model.
     :ivar group: the current XSD model group, initialized to *root* argument.
     :ivar items: the current XSD group's items iterator.
     :ivar match: if the XSD group has an effective item match.
     """
-    def __init__(self, root: ModelGroup):
+    _groups: ListTupleModelGroupType, IteratorModelParticleType, bool
+    element: OptionalSchemaElementType
+
+    def __init__(self, root: ModelGroupType) -> None:
+        self._groups = 
         self.root = root
-        self.occurs = Counter()
-        self._groups: ListTupleModelGroup, int, bool = 
+        self.occurs = CounterUnionModelParticleType, TupleModelParticleType()
         self.element = None
         self.group = root
         self.items = self.iter_group()
         self.match = False
         self._start()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '%s(root=%r)' % (self.__class__.__name__, self.root)
 
-    def clear(self):
+    def clear(self) -> None:
         del self._groups:
         self.occurs.clear()
         self.element = None
@@ -116,14 +126,14 @@
         self.items = self.iter_group()
         self.match = False
 
-    def _start(self):
+    def _start(self) -> None:
         while True:
             item = next(self.items, None)
             if item is None:
                 if not self._groups:
                     break
                 self.group, self.items, self.match = self._groups.pop()
-            elif not isinstance(item, ModelGroup):
+            elif not isinstance(item, groups.XsdGroup):
                 self.element = item
                 break
             elif item:
@@ -133,11 +143,13 @@
                 self.match = False
 
     @property
-    def expected(self) -> ListParticleMixin:
+    def expected(self) -> ListSchemaElementType:
         """
         Returns the expected elements of the current and descendant groups.
         """
-        expected = 
+        expected: ListSchemaElementType = 
+        items: UnionModelGroupType, IteratorModelParticleType
+
         if self.group.model == 'choice':
             items = self.group
         elif self.group.model == 'all':
@@ -146,23 +158,23 @@
             items = (e for e in self.group if e.min_occurs > self.occurse)
 
         for e in items:
-            if isinstance(e, ModelGroup):
+            if isinstance(e, groups.XsdGroup):
                 expected.extend(e.iter_elements())
             else:
                 expected.append(e)
-                expected.extend(e.maps.substitution_groups.get(e.name, ()))
+                expected.extend(e.maps.substitution_groups.get(e.name or '', ()))
         return expected
 
-    def restart(self):
+    def restart(self) -> None:
         self.clear()
         self._start()
 
-    def stop(self):
+    def stop(self) -> IteratorAdvanceYieldedType:
         while self.element is not None:
             for e in self.advance():
                 yield e
 
-    def iter_group(self) -> IteratorParticleMixin:
+    def iter_group(self) -> IteratorModelParticleType:
         """Returns an iterator for the current model group."""
         if self.group.max_occurs == 0:
             return iter(())
@@ -171,21 +183,21 @@
         else:
             return (e for e in self.group.iter_elements() if not e.is_over(self.occurse))
 
-    def advance(self, match=False) -> IteratorTupleParticleMixin, int, list:
+    def advance(self, match: bool = False) -> IteratorAdvanceYieldedType:
         """
         Generator function for advance to the next element. Yields tuples with
         particles information when occurrence violation is found.
 
         :param match: provides current element match.
         """
-        def stop_item(item: ParticleMixin) -> bool:
+        def stop_item(item: ModelParticleType) -> bool:
             """
             Stops element or group matching, incrementing current group counter.
 
             :return: `True` if the item has violated the minimum occurrences for itself \
             or for the current group, `False` otherwise.
             """
-            if isinstance(item, ModelGroup):
+            if isinstance(item, groups.XsdGroup):
                 self.group, self.items, self.match = self._groups.pop()
 
             if self.group.model == 'choice':
@@ -271,7 +283,7 @@
                     stop_item(self.group)
 
                 obj = next(self.items, None)
-                if isinstance(obj, ModelGroup):

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/notations.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/notations.py Changed

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/particles.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/particles.py Changed

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-2021  , SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
 # See the file 'LICENSE' in the root directory of the present
@@ -7,13 +7,10 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
-from collections.abc import MutableSequence
-from typing import Optional, List, Union
-from xml.etree.ElementTree import Element
+from typing import Any, Optional, Tuple, Union
 
-from .. import limits
 from ..exceptions import XMLSchemaValueError
-from .exceptions import XMLSchemaParseError, XMLSchemaModelError, XMLSchemaModelDepthError
+from ..aliases import ElementType, ModelParticleType
 
 
 class ParticleMixin:
@@ -27,19 +24,22 @@
     :ivar max_occurs: the maxOccurs property of the XSD particle. Defaults to 1, \
     a `None` value means 'unbounded'.
     """
+    name: Any
+    maps: Any
+
     min_occurs: int = 1
     max_occurs: Optionalint = 1
 
-    def __init__(self, min_occurs=1, max_occurs: Optionalint = 1):
+    def __init__(self, min_occurs: int = 1, max_occurs: Optionalint = 1) -> None:
         self.min_occurs = min_occurs
         self.max_occurs = max_occurs
 
     @property
-    def occurs(self):
-        return self.min_occurs, self.max_occurs
+    def occurs(self) -> Tupleint, Optionalint:
+        return self.min_occurs, self.max_occurs
 
     @property
-    def effective_min_occurs(self):
+    def effective_min_occurs(self) -> int:
         """
         A property calculated from minOccurs, that is equal to minOccurs
         for elements and may vary for content model groups, in dependance
@@ -48,7 +48,7 @@
         return self.min_occurs
 
     @property
-    def effective_max_occurs(self):
+    def effective_max_occurs(self) -> Optionalint:
         """
         A property calculated from maxOccurs, that is equal to maxOccurs
         for elements and may vary for content model groups, in dependance
@@ -57,20 +57,20 @@
         """
         return self.max_occurs
 
-    def is_emptiable(self):
+    def is_emptiable(self) -> bool:
         """
         Tests if max_occurs == 0. A zero-length model group is considered emptiable.
         For model groups the test outcome depends also on nested particles.
         """
         return self.min_occurs == 0
 
-    def is_empty(self):
+    def is_empty(self) -> bool:
         """
         Tests if max_occurs == 0. A zero-length model group is considered empty.
         """
         return self.max_occurs == 0
 
-    def is_single(self):
+    def is_single(self) -> bool:
         """
         Tests if the particle has max_occurs == 1. For elements the test
         outcome depends also on parent group. For model groups the test
@@ -78,27 +78,27 @@
         """
         return self.max_occurs == 1
 
-    def is_multiple(self):
+    def is_multiple(self) -> bool:
         """Tests the particle can have multiple occurrences."""
         return not self.is_empty() and not self.is_single()
 
-    def is_ambiguous(self):
+    def is_ambiguous(self) -> bool:
         """Tests if min_occurs != max_occurs."""
         return self.min_occurs != self.max_occurs
 
-    def is_univocal(self):
+    def is_univocal(self) -> bool:
         """Tests if min_occurs == max_occurs."""
         return self.min_occurs == self.max_occurs
 
-    def is_missing(self, occurs: int):
+    def is_missing(self, occurs: int) -> bool:
         """Tests if provided occurrences are under the minimum."""
         return not self.is_emptiable() if occurs == 0 else self.min_occurs > occurs
 
-    def is_over(self, occurs: int):
+    def is_over(self, occurs: int) -> bool:
         """Tests if provided occurrences are over the maximum."""
         return self.max_occurs is not None and self.max_occurs <= occurs
 
-    def has_occurs_restriction(self, other):
+    def has_occurs_restriction(self, other: UnionModelParticleType, 'OccursCalculator') -> bool:
         if self.min_occurs < other.min_occurs:
             return False
         elif self.max_occurs == 0:
@@ -110,10 +110,10 @@
         else:
             return self.max_occurs <= other.max_occurs
 
-    def parse_error(self, message):
-        raise XMLSchemaParseError(self, message)  # pragma: no cover
+    def parse_error(self, message: Any) -> None:
+        raise XMLSchemaValueError(message)
 
-    def _parse_particle(self, elem: Element):
+    def _parse_particle(self, elem: ElementType) -> None:
         if 'minOccurs' in elem.attrib:
             try:
                 min_occurs = int(elem.attrib'minOccurs')
@@ -133,253 +133,48 @@
             self.max_occurs = None
         else:
             try:
-                max_occurs = int(max_occurs)
+                self.max_occurs = int(max_occurs)
             except ValueError:
                 self.parse_error("maxOccurs value must be a non negative integer or 'unbounded'")
             else:
-                if self.min_occurs > max_occurs:
+                if self.min_occurs > self.max_occurs:
                     self.parse_error("maxOccurs must be 'unbounded' or greater than minOccurs")
-                else:
-                    self.max_occurs = max_occurs
+                    self.max_occurs = None
 
 
-class ModelGroup(MutableSequence, ParticleMixin):
+class OccursCalculator:
     """
-    Class for XSD model group particles. This class implements only model related methods,
-    schema element parsing and validation methods are implemented in derived classes.
+    An helper class for adding and multiplying min/max occurrences of XSD particles.
     """
-    def __init__(self, model: str, min_occurs=1, max_occurs: Optionalint = 1):
-        super(ModelGroup, self).__init__(min_occurs, max_occurs)
-        if model not in {'sequence', 'choice', 'all'}:
-            raise XMLSchemaValueError("invalid model {!r} for a group".format(model))
-        self._group: ListUniontuple, ParticleMixin = 
-        self.model = model
-
-    def __repr__(self):
-        return '%s(model=%r, occurs=%r)' % (self.__class__.__name__, self.model, self.occurs)
-
-    # Implements the abstract methods of MutableSequence
-    def __getitem__(self, i: int):
-        return self._groupi
-
-    def __setitem__(self, i: int, item: Uniontuple, ParticleMixin):
-        self._groupi = item
-
-    def __delitem__(self, i: int):
-        del self._groupi
-
-    def __len__(self):
-        return len(self._group)
-
-    def insert(self, i: int, item: Uniontuple, ParticleMixin):
-        self._group.insert(i, item)
-
-    def clear(self):
-        del self._group:
-
-    def is_emptiable(self):
-        if self.model == 'choice':
-            return self.min_occurs == 0 or not self or any(item.is_emptiable() for item in self)
-        else:
-            return self.min_occurs == 0 or not self or all(item.is_emptiable() for item in self)
-
-    def is_empty(self):
-        return not self._group or self.max_occurs == 0
-
-    def is_single(self):
-        if self.max_occurs != 1 or not self:
-            return False
-        elif len(self) > 1 or not isinstance(self0, ModelGroup):
-            return True
-        else:
-            return self0.is_single()

_service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/schemas.py Added

@@ -0,0 +1,2221 @@
+#
+# Copyright (c), 2016-2020, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+"""
+This module contains XMLSchema classes creator for xmlschema package.
+
+Two schema classes are created at the end of this module, XMLSchema10 for XSD 1.0 and
+XMLSchema11 for XSD 1.1. The latter class parses also XSD 1.0 schemas, as prescribed by
+the standard.
+"""
+import sys
+if sys.version_info < (3, 7):
+    from typing import GenericMeta as ABCMeta
+else:
+    from abc import ABCMeta
+
+import os
+import logging
+import threading
+import warnings
+import re
+import sys
+from copy import copy
+from itertools import chain
+from typing import cast, Callable, ItemsView, List, Optional, Dict, Any, \
+    Set, Union, Tuple, Type, Iterator, Counter
+
+from elementpath import XPathToken
+
+from ..exceptions import XMLSchemaTypeError, XMLSchemaKeyError, XMLSchemaRuntimeError, \
+    XMLSchemaValueError, XMLSchemaNamespaceError
+from ..names import VC_MIN_VERSION, VC_MAX_VERSION, VC_TYPE_AVAILABLE, \
+    VC_TYPE_UNAVAILABLE, VC_FACET_AVAILABLE, VC_FACET_UNAVAILABLE, XSD_NOTATION, \
+    XSD_ATTRIBUTE, XSD_ATTRIBUTE_GROUP, XSD_GROUP, XSD_SIMPLE_TYPE, XSI_TYPE, \
+    XSD_COMPLEX_TYPE, XSD_ELEMENT, XSD_SEQUENCE, XSD_CHOICE, XSD_ALL, XSD_ANY, \
+    XSD_ANY_ATTRIBUTE, XSD_ANY_TYPE, XSD_NAMESPACE, XML_NAMESPACE, XSI_NAMESPACE, \
+    VC_NAMESPACE, SCHEMAS_DIR, LOCATION_HINTS, XSD_ANNOTATION, XSD_INCLUDE, \
+    XSD_IMPORT, XSD_REDEFINE, XSD_OVERRIDE, XSD_DEFAULT_OPEN_CONTENT, \
+    XSD_ANY_SIMPLE_TYPE, XSD_UNION, XSD_LIST, XSD_RESTRICTION
+from ..etree import etree_element, ParseError
+from ..aliases import ElementType, XMLSourceType, NamespacesType, LocationsType, \
+    SchemaType, SchemaSourceType, ConverterType, ComponentClassType, DecodeType, \
+    EncodeType, BaseXsdType, AtomicValueType, ExtraValidatorType, SchemaGlobalType
+from ..helpers import prune_etree, get_namespace, get_qname
+from ..namespaces import NamespaceResourcesMap, NamespaceView
+from ..resources import is_local_url, is_remote_url, url_path_is_file, \
+    normalize_locations, fetch_resource, normalize_url, XMLResource
+from ..converters import XMLSchemaConverter
+from ..xpath import XMLSchemaProtocol, XMLSchemaProxy, ElementPathMixin
+from .. import dataobjects
+
+from .exceptions import XMLSchemaParseError, XMLSchemaValidationError, XMLSchemaEncodeError, \
+    XMLSchemaNotBuiltError, XMLSchemaIncludeWarning, XMLSchemaImportWarning
+from .helpers import get_xsd_derivation_attribute
+from .xsdbase import check_validation_mode, XsdValidator, XsdComponent, XsdAnnotation
+from .notations import XsdNotation
+from .identities import XsdIdentity, XsdKey, XsdKeyref, XsdUnique, \
+    Xsd11Key, Xsd11Unique, Xsd11Keyref, IdentityCounter, KeyrefCounter, IdentityMapType
+from .facets import XSD_10_FACETS, XSD_11_FACETS
+from .simple_types import XsdSimpleType, XsdList, XsdUnion, XsdAtomicRestriction, \
+    Xsd11AtomicRestriction, Xsd11Union
+from .attributes import XsdAttribute, XsdAttributeGroup, Xsd11Attribute
+from .complex_types import XsdComplexType, Xsd11ComplexType
+from .groups import XsdGroup, Xsd11Group
+from .elements import XsdElement, Xsd11Element
+from .wildcards import XsdAnyElement, XsdAnyAttribute, Xsd11AnyElement, \
+    Xsd11AnyAttribute, XsdDefaultOpenContent
+from .global_maps import XsdGlobals
+
+logger = logging.getLogger('xmlschema')
+
+XSD_VERSION_PATTERN = re.compile(r'^\d+\.\d+$')
+DRIVE_PATTERN = re.compile(r'^a-zA-Z:$')
+
+# Elements for building dummy groups
+ATTRIBUTE_GROUP_ELEMENT = etree_element(XSD_ATTRIBUTE_GROUP)
+ANY_ATTRIBUTE_ELEMENT = etree_element(
+    XSD_ANY_ATTRIBUTE, attrib={'namespace': '##any', 'processContents': 'lax'}
+)
+SEQUENCE_ELEMENT = etree_element(XSD_SEQUENCE)
+ANY_ELEMENT = etree_element(
+    XSD_ANY,
+    attrib={
+        'namespace': '##any',
+        'processContents': 'lax',
+        'minOccurs': '0',
+        'maxOccurs': 'unbounded'
+    })
+
+GLOBAL_TAGS = frozenset((XSD_NOTATION, XSD_SIMPLE_TYPE, XSD_COMPLEX_TYPE,
+                         XSD_ATTRIBUTE, XSD_ATTRIBUTE_GROUP, XSD_GROUP, XSD_ELEMENT))
+
+
+class XMLSchemaMeta(ABCMeta):
+    XSD_VERSION: str
+    create_meta_schema: Callable'XMLSchemaMeta', Optionalstr, SchemaType
+
+    def __new__(mcs, name: str, bases: TupleTypeAny, ..., dict_: Dictstr, Any) \
+            -> 'XMLSchemaMeta':
+        assert bases, "a base class is mandatory"
+        base_class = bases0
+
+        # For backward compatibility (will be removed in v2.0)
+        if 'BUILDERS' in dict_:
+            msg = "'BUILDERS' will be removed in v2.0, provide the appropriate " \
+                  "attributes instead (eg. xsd_element_class = Xsd11Element)"
+            warnings.warn(msg, DeprecationWarning, stacklevel=1)
+
+            for k, v in dict_'BUILDERS'.items():
+                if k == 'simple_type_factory':
+                    dict_'simple_type_factory' = staticmethod(v)
+                    continue
+
+                attr_name = 'xsd_{}'.format(k)
+                if not hasattr(base_class, attr_name):
+                    continue
+                elif getattr(base_class, attr_name) is not v:
+                    dict_attr_name = v
+
+        if isinstance(dict_.get('meta_schema'), str):
+            # Build a new meta-schema class and register it into module's globals
+            meta_schema_file: str = dict_.pop('meta_schema')
+            meta_schema_class_name = 'Meta' + name
+
+            meta_schema: OptionalSchemaType
+            meta_schema = getattr(base_class, 'meta_schema', None)
+            if meta_schema is None:
+                meta_bases = bases
+            else:
+                # Use base's meta_schema class as base for the new meta-schema
+                meta_bases = (meta_schema.__class__,)
+                if len(bases) > 1:
+                    meta_bases += bases1:
+
+            meta_schema_class = super(XMLSchemaMeta, mcs).__new__(
+                mcs, meta_schema_class_name, meta_bases, dict_
+            )
+            meta_schema_class.__qualname__ = meta_schema_class_name
+            module = sys.modulesdict_'__module__'
+            setattr(module, meta_schema_class_name, meta_schema_class)
+
+            meta_schema = meta_schema_class.create_meta_schema(meta_schema_file)
+            dict_'meta_schema' = meta_schema
+
+        # Create the class and check some basic attributes
+        cls = super(XMLSchemaMeta, mcs).__new__(mcs, name, bases, dict_)
+        if cls.XSD_VERSION not in ('1.0', '1.1'):
+            raise XMLSchemaValueError("XSD_VERSION must be '1.0' or '1.1'")
+        return cls
+
+
+class XMLSchemaBase(XsdValidator, ElementPathMixinUnionSchemaType, XsdElement,
+                    metaclass=XMLSchemaMeta):
+    """
+    Base class for an XML Schema instance.
+
+    :param source: an URI that reference to a resource or a file path or a file-like \
+    object or a string containing the schema or an Element or an ElementTree document \
+    or an :class:`XMLResource` instance. A multi source initialization is supported \
+    providing a not empty list of XSD sources.
+    :param namespace: is an optional argument that contains the URI of the namespace \
+    that has to used in case the schema has no namespace (chameleon schema). For other \
+    cases, when specified, it must be equal to the *targetNamespace* of the schema.
+    :param validation: the XSD validation mode to use for build the schema, \
+    that can be 'strict' (default), 'lax' or 'skip'.
+    :param global_maps: is an optional argument containing an :class:`XsdGlobals` \
+    instance, a mediator object for sharing declaration data between dependents \
+    schema instances.
+    :param converter: is an optional argument that can be an :class:`XMLSchemaConverter` \
+    subclass or instance, used for defining the default XML data converter for XML Schema instance.
+    :param locations: schema extra location hints, that can include custom resource locations \
+    (eg. local XSD file instead of remote resource) or additional namespaces to import after \
+    processing schema's import statements. Can be a dictionary or a sequence of couples \
+    (namespace URI, resource URL). Extra locations passed using a tuple container are not \
+    normalized.
+    :param base_url: is an optional base URL, used for the normalization of relative paths \
+    when the URL of the schema resource can't be obtained from the source argument.
+    :param allow: defines the security mode for accessing resource locations. Can be \
+    'all', 'remote', 'local' or 'sandbox'. Default is 'all' that means all types of \
+    URLs are allowed. With 'remote' only remote resource URLs are allowed. With 'local' \
+    only file paths and URLs are allowed. With 'sandbox' only file paths and URLs that \
+    are under the directory path identified by source or by the *base_url* argument \
+    are allowed.
+    :param defuse: defines when to defuse XML data using a `SafeXMLParser`. Can be \
+    'always', 'remote' or 'never'. For default defuses only remote XML data.
+    :param timeout: the timeout in seconds for fetching resources. Default is `300`.
+    :param build: defines whether build the schema maps. Default is `True`.
+    :param use_meta: if `True` the schema processor uses the validator meta-schema, \
+    otherwise a new meta-schema is added at the end. In the latter case the meta-schema \
+    is rebuilt if any base namespace has been overridden by an import. Ignored if the \
+    argument *global_maps* is provided.
+    :param use_fallback: if `True` the schema processor uses the validator fallback \
+    location hints to load well-known namespaces (eg. xhtml).

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/simple_types.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/simple_types.py Changed

@@ -11,9 +11,13 @@
 This module contains classes for XML Schema simple data types.
 """
 from decimal import DecimalException
-from typing import Any
+from typing import cast, Any, Callable, Dict, Iterator, List, \
+    Optional, Set, Union, Tuple, Type
 
 from ..etree import etree_element
+from ..aliases import ElementType, AtomicValueType, ComponentClassType, \
+    IterDecodeType, IterEncodeType, BaseXsdType, SchemaType, DecodedValueType, \
+    EncodedValueType
 from ..exceptions import XMLSchemaTypeError, XMLSchemaValueError
 from ..names import XSD_NAMESPACE, XSD_ANY_TYPE, XSD_SIMPLE_TYPE, XSD_PATTERN, \
     XSD_ANY_ATOMIC_TYPE, XSD_ATTRIBUTE, XSD_ATTRIBUTE_GROUP, XSD_ANY_ATTRIBUTE, \
@@ -22,71 +26,21 @@
     XSD_LIST, XSD_ANY_SIMPLE_TYPE, XSD_UNION, XSD_RESTRICTION, XSD_ANNOTATION, \
     XSD_ASSERTION, XSD_ID, XSD_IDREF, XSD_FRACTION_DIGITS, XSD_TOTAL_DIGITS, \
     XSD_EXPLICIT_TIMEZONE, XSD_ERROR, XSD_ASSERT, XSD_QNAME, XSD_UNTYPED_ATOMIC
-from ..helpers import get_qname, get_prefixed_qname, local_name
+from ..helpers import get_prefixed_qname, local_name
 
 from .exceptions import XMLSchemaValidationError, XMLSchemaEncodeError, \
     XMLSchemaDecodeError, XMLSchemaParseError
-from .helpers import get_xsd_derivation_attribute
-from .xsdbase import XsdAnnotation, XsdType, ValidationMixin
-from .facets import XsdFacet, XsdWhiteSpaceFacet, XSD_10_FACETS_BUILDERS, \
+from .xsdbase import XsdComponent, XsdType, ValidationMixin
+from .facets import XsdFacet, XsdWhiteSpaceFacet, XsdPatternFacets, \
+    XsdEnumerationFacets, XsdAssertionFacet, XSD_10_FACETS_BUILDERS, \
     XSD_11_FACETS_BUILDERS, XSD_10_FACETS, XSD_11_FACETS, XSD_10_LIST_FACETS, \
     XSD_11_LIST_FACETS, XSD_10_UNION_FACETS, XSD_11_UNION_FACETS, MULTIPLE_FACETS
 
+FacetsValueType = UnionXsdFacet, CallableAny, None, ListXsdAssertionFacet
+PythonTypeClasses = TypeAny
 
-def xsd_simple_type_factory(elem, schema, parent):
-    """
-    Factory function for XSD simple types. Parses the xs:simpleType element and its
-    child component, that can be a restriction, a list or an union. Annotations are
-    linked to simple type instance, omitting the inner annotation if both are given.
-    """
-    annotation = None
-    try:
-        child = elem0
-    except IndexError:
-        return schema.maps.typesXSD_ANY_SIMPLE_TYPE
-    else:
-        if child.tag == XSD_ANNOTATION:
-            annotation = XsdAnnotation(elem0, schema, child)
-            try:
-                child = elem1
-            except IndexError:
-                schema.parse_error("(restriction | list | union) expected", elem)
-                return schema.maps.typesXSD_ANY_SIMPLE_TYPE
-
-    if child.tag == XSD_RESTRICTION:
-        xsd_type = schema.BUILDERS.restriction_class(child, schema, parent)
-    elif child.tag == XSD_LIST:
-        xsd_type = XsdList(child, schema, parent)
-    elif child.tag == XSD_UNION:
-        xsd_type = schema.BUILDERS.union_class(child, schema, parent)
-    else:
-        schema.parse_error("(restriction | list | union) expected", elem)
-        return schema.maps.typesXSD_ANY_SIMPLE_TYPE
-
-    if annotation is not None:
-        xsd_type.annotation = annotation
-
-    try:
-        xsd_type.name = get_qname(schema.target_namespace, elem.attrib'name')
-    except KeyError:
-        if parent is None:
-            schema.parse_error("missing attribute 'name' in a global simpleType", elem)
-            xsd_type.name = 'nameless_%s' % str(id(xsd_type))
-    else:
-        if parent is not None:
-            schema.parse_error("attribute 'name' not allowed for a local simpleType", elem)
-            xsd_type.name = None
-
-    if 'final' in elem.attrib:
-        try:
-            xsd_type._final = get_xsd_derivation_attribute(elem, 'final')
-        except ValueError as err:
-            xsd_type.parse_error(err, elem)
-
-    return xsd_type
 
-
-class XsdSimpleType(XsdType, ValidationMixin):
+class XsdSimpleType(XsdType, ValidationMixinUnionstr, bytes, DecodedValueType):
     """
     Base class for simpleTypes definitions. Generally used only for
     instances of xs:anySimpleType.
@@ -101,24 +55,34 @@
     """
     _special_types = {XSD_ANY_TYPE, XSD_ANY_SIMPLE_TYPE}
     _ADMITTED_TAGS = {XSD_SIMPLE_TYPE}
+    copy: Callable'XsdSimpleType', 'XsdSimpleType'
 
-    variety = None
-    min_length = None
-    max_length = None
-    white_space = None
+    block: str = ''
+    min_length: Optionalint = None
+    max_length: Optionalint = None
+    white_space: Optionalstr = None
     patterns = None
-    validators = ()
+    validators: UnionTuple(), ListUnionXsdFacet, CallableAny, None = ()
     allow_empty = True
+    facets: DictOptionalstr, FacetsValueType
+
+    python_type: PythonTypeClasses
+    instance_types: UnionPythonTypeClasses, TuplePythonTypeClasses
 
     # Unicode string as default datatype for XSD simple types
     python_type = instance_types = to_python = from_python = str
 
-    def __init__(self, elem, schema, parent, name=None, facets=None):
+    def __init__(self, elem: ElementType,
+                 schema: SchemaType,
+                 parent: OptionalXsdComponent = None,
+                 name: Optionalstr = None,
+                 facets: OptionalDictOptionalstr, FacetsValueType = None) -> None:
+
         super(XsdSimpleType, self).__init__(elem, schema, parent, name)
         if not hasattr(self, 'facets'):
-            self.facets = facets or {}
+            self.facets = facets if facets is not None else {}
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name: str, value: Any) -> None:
         super(XsdSimpleType, self).__setattr__(name, value)
         if name == 'facets':
             if not isinstance(self, XsdAtomicBuiltin):
@@ -132,22 +96,25 @@
                 self.white_space = white_space
 
             patterns = self.get_facet(XSD_PATTERN)
-            if patterns is not None:
+            if isinstance(patterns, XsdPatternFacets):
                 self.patterns = patterns
                 if all(p.match('') is None for p in patterns.patterns):
                     self.allow_empty = False
 
             enumeration = self.get_facet(XSD_ENUMERATION)
-            if enumeration is not None and '' not in enumeration:
+            if isinstance(enumeration, XsdEnumerationFacets) \
+                    and '' not in enumeration.enumeration:
                 self.allow_empty = False
 
             if value:
+                validators: ListUnionXsdFacet, CallableAny, None
                 if None in value:
                     validators = valueNone  # Use only the validator function!
                 else:
                     validators = v for k, v in value.items()
                                   if k not in {XSD_WHITE_SPACE, XSD_PATTERN, XSD_ASSERTION}
                 if XSD_ASSERTION in value:
+                    assertions: UnionXsdAssertionFacet, ListXsdAssertionFacet
                     assertions = valueXSD_ASSERTION
                     if isinstance(assertions, list):
                         validators.extend(assertions)
@@ -156,9 +123,11 @@
                 if validators:
                     self.validators = validators
 
-    def _parse_facets(self, facets):
+    def _parse_facets(self, facets: Any) -> None:
+        base_type: Any
+
         if facets and self.base_type is not None:
-            if self.base_type.is_simple():
+            if isinstance(self.base_type, XsdSimpleType):
                 if self.base_type.name == XSD_ANY_SIMPLE_TYPE:
                     self.parse_error(
                         "facets not allowed for a direct derivation of xs:anySimpleType"
@@ -273,73 +242,94 @@
         self.max_length = max_length
 
     @property
-    def simple_type(self):
-        return self
+    def variety(self) -> Optionalstr:
+        return None
 
     @property
-    def model_group(self):
-        return
+    def simple_type(self) -> 'XsdSimpleType':
+        return self
 
     @property
-    def min_value(self):
-        min_exclusive_facet = self.get_facet(XSD_MIN_EXCLUSIVE)
-        if min_exclusive_facet is None:
-            return getattr(self.get_facet(XSD_MIN_INCLUSIVE), 'value', None)
-

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/wildcards.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/wildcards.py Changed

@@ -10,23 +10,38 @@
 """
 This module contains classes for XML Schema wildcards.
 """
+from typing import cast, Any, Callable, Dict, Iterable, Iterator, List, Optional, \
+    Tuple, Union, Counter
+
 from ..exceptions import XMLSchemaValueError
 from ..names import XSI_NAMESPACE, XSD_ANY, XSD_ANY_ATTRIBUTE, \
     XSD_OPEN_CONTENT, XSD_DEFAULT_OPEN_CONTENT, XSI_TYPE
+from ..aliases import ElementType, SchemaType, SchemaElementType, SchemaAttributeType, \
+    ModelGroupType, ModelParticleType, AtomicValueType, IterDecodeType, IterEncodeType, \
+    DecodedValueType, EncodedValueType
 from ..helpers import get_namespace, raw_xml_encode
-from ..xpath import XMLSchemaProxy, ElementPathMixin
+from ..xpath import XMLSchemaProtocol, ElementProtocol, XMLSchemaProxy, ElementPathMixin
 from .xsdbase import ValidationMixin, XsdComponent
 from .particles import ParticleMixin
+from . import elements
+
 
+OccursCounterType = CounterUnionModelParticleType, TupleModelParticleType
 
-class XsdWildcard(XsdComponent, ValidationMixin):
+
+class XsdWildcard(XsdComponent):
     names = ()
-    namespace = ('##any',)
-    not_namespace = ()
-    not_qname = ()
+    namespace: UnionTuplestr, Liststr = ('##any',)
+    not_namespace: UnionTuple(), Liststr = ()
+    not_qname: UnionTuple(), Liststr = ()
     process_contents = 'strict'
 
-    def __repr__(self):
+    # For compatibility with protocol of XSD elements/attributes
+    type = None
+    default = None
+    fixed = None
+
+    def __repr__(self) -> str:
         if self.not_namespace:
             return '%s(not_namespace=%r, process_contents=%r)' % (
                 self.__class__.__name__, self.not_namespace, self.process_contents
@@ -36,11 +51,9 @@
                 self.__class__.__name__, self.namespace, self.process_contents
             )
 
-    def _parse(self):
-        super(XsdWildcard, self)._parse()
-
+    def _parse(self) -> None:
         # Parse namespace and processContents
-        namespace = self.elem.get('namespace', '##any').strip()
+        namespace = self.elem.attrib.get('namespace', '##any').strip()
         if namespace == '##any':
             pass
         elif not namespace:
@@ -63,7 +76,7 @@
                 else:
                     self.namespace.append(ns)
 
-        process_contents = self.elem.get('processContents', 'strict')
+        process_contents = self.elem.attrib.get('processContents', 'strict')
         if process_contents == 'strict':
             pass
         elif process_contents not in ('lax', 'skip'):
@@ -72,7 +85,7 @@
         else:
             self.process_contents = process_contents
 
-    def _parse_not_constraints(self):
+    def _parse_not_constraints(self) -> None:
         if 'notNamespace' not in self.elem.attrib:
             pass
         elif 'namespace' in self.elem.attrib:
@@ -127,10 +140,12 @@
         self.not_qname = names
 
     @property
-    def built(self):
+    def built(self) -> bool:
         return True
 
-    def is_matching(self, name, default_namespace=None, **kwargs):
+    def is_matching(self, name: Optionalstr,
+                    default_namespace: Optionalstr = None,
+                    **kwargs: Any) -> bool:
         if name is None:
             return False
         elif not name or name0 == '{':
@@ -141,17 +156,19 @@
             return self.is_namespace_allowed('') or \
                 self.is_namespace_allowed(default_namespace)
 
-    def is_namespace_allowed(self, namespace):
+    def is_namespace_allowed(self, namespace: str) -> bool:
         if self.not_namespace:
             return namespace not in self.not_namespace
         elif '##any' in self.namespace or namespace == XSI_NAMESPACE:
             return True
         elif '##other' in self.namespace:
-            return namespace and namespace != self.target_namespace
+            if not namespace:
+                return False
+            return namespace != self.target_namespace
         else:
             return namespace in self.namespace
 
-    def deny_namespaces(self, namespaces):
+    def deny_namespaces(self, namespaces: Liststr) -> bool:
         if self.not_namespace:
             return all(x in self.not_namespace for x in namespaces)
         elif '##any' in self.namespace:
@@ -161,7 +178,7 @@
         else:
             return all(x not in self.namespace for x in namespaces)
 
-    def deny_qnames(self, names):
+    def deny_qnames(self, names: Iterablestr) -> bool:
         if self.not_namespace:
             return all(x in self.not_qname or get_namespace(x) in self.not_namespace
                        for x in names)
@@ -174,13 +191,17 @@
             return all(x in self.not_qname or get_namespace(x) not in self.namespace
                        for x in names)
 
-    def is_restriction(self, other, check_occurs=True):
+    def is_restriction(self, other: UnionModelParticleType, 'XsdAnyAttribute',
+                       check_occurs: bool = True) -> bool:
         if check_occurs and isinstance(self, ParticleMixin) \
+                and not isinstance(other, XsdAnyAttribute) \
                 and not self.has_occurs_restriction(other):
             return False
-        elif not isinstance(other, type(self)):
+        elif not isinstance(other, self.__class__):
             return False
-        elif other.process_contents == 'strict' and self.process_contents != 'strict':
+
+        other: XsdWildcard  # type: ignoreno-redef
+        if other.process_contents == 'strict' and self.process_contents != 'strict':
             return False
         elif other.process_contents == 'lax' and self.process_contents == 'skip':
             return False
@@ -226,7 +247,7 @@
         else:
             return all(ns in other.namespace for ns in self.namespace)
 
-    def union(self, other):
+    def union(self, other: Union'XsdAnyElement', 'XsdAnyAttribute') -> None:
         """
         Update an XSD wildcard with the union of itself and another XSD wildcard.
         """
@@ -267,6 +288,8 @@
             self.namespace = '##any' if not self.not_namespace else 
             return
 
+        w1: XsdWildcard
+        w2: XsdWildcard
         if '##any' in self.namespace or self.namespace == other.namespace:
             return
         elif '##any' in other.namespace:
@@ -277,6 +300,7 @@
         elif '##other' in self.namespace:
             w1, w2 = self, other
         else:
+            assert isinstance(self.namespace, list)
             self.namespace.extend(ns for ns in other.namespace if ns not in self.namespace)
             return
 
@@ -291,7 +315,7 @@
             self.namespace = 
             self.not_namespace = '', w1.target_namespace if w1.target_namespace else ''
 
-    def intersection(self, other):
+    def intersection(self, other: Union'XsdAnyElement', 'XsdAnyAttribute') -> None:
         """
         Update an XSD wildcard with the intersection of itself and another XSD wildcard.
         """
@@ -342,19 +366,16 @@
         elif '##other' not in other.namespace:
             self.namespace = ns for ns in self.namespace if ns in other.namespace
         else:
+            assert isinstance(self.namespace, list)
             if other.target_namespace in self.namespace:
                 self.namespace.remove(other.target_namespace)
             if '' in self.namespace:
                 self.namespace.remove('')
 
-    def iter_decode(self, source, validation='lax', **kwargs):
-        raise NotImplementedError
 
-    def iter_encode(self, obj, validation='lax', **kwargs):
-        raise NotImplementedError
-
-
-class XsdAnyElement(XsdWildcard, ParticleMixin, ElementPathMixin):
+class XsdAnyElement(XsdWildcard, ParticleMixin,
+                    ElementPathMixinSchemaElementType,

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/validators/xsdbase.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/validators/xsdbase.py Changed

@@ -11,17 +11,30 @@
 This module contains base functions and classes XML Schema components.
 """
 import re
-from typing import Optional
+from typing import TYPE_CHECKING, cast, Any, Dict, Generic, List, Iterator, Optional, \
+    Set, Tuple, TypeVar, Union, MutableMapping
+
+import elementpath
 
 from ..exceptions import XMLSchemaValueError, XMLSchemaTypeError
 from ..names import XSD_ANNOTATION, XSD_APPINFO, XSD_DOCUMENTATION, XML_LANG, \
     XSD_ANY_TYPE, XSD_ANY_SIMPLE_TYPE, XSD_ANY_ATOMIC_TYPE, XSD_ID, XSD_QNAME, \
     XSD_OVERRIDE, XSD_NOTATION_TYPE, XSD_DECIMAL
-from ..etree import is_etree_element, etree_tostring
+from ..etree import is_etree_element, etree_tostring, etree_element
+from ..aliases import ElementType, NamespacesType, SchemaType, BaseXsdType, \
+    ComponentClassType, ExtraValidatorType, DecodeType, IterDecodeType, \
+    EncodeType, IterEncodeType
 from ..helpers import get_qname, local_name, get_prefixed_qname
-from .. import dataobjects
+from ..resources import XMLResource
 from .exceptions import XMLSchemaParseError, XMLSchemaValidationError
 
+if TYPE_CHECKING:
+    from .simple_types import XsdSimpleType
+    from .complex_types import XsdComplexType
+    from .elements import XsdElement
+    from .groups import XsdGroup
+    from .global_maps import XsdGlobals
+
 XSD_TYPE_DERIVATIONS = {'extension', 'restriction'}
 XSD_ELEMENT_DERIVATIONS = {'extension', 'restriction', 'substitution'}
 
@@ -32,7 +45,7 @@
 """
 
 
-def check_validation_mode(validation):
+def check_validation_mode(validation: str) -> None:
     if validation not in XSD_VALIDATION_MODES:
         raise XMLSchemaValueError("validation mode can be 'strict', "
                                   "'lax' or 'skip': %r" % validation)
@@ -53,14 +66,16 @@
     :ivar errors: XSD validator building errors.
     :vartype errors: list
     """
-    xsd_version = elem = None
+    elem: Optionaletree_element = None
+    namespaces: Any = None
+    errors: ListXMLSchemaParseError
 
-    def __init__(self, validation='strict'):
+    def __init__(self, validation: str = 'strict') -> None:
         self.validation = validation
         self.errors = 
 
     @property
-    def built(self):
+    def built(self) -> bool:
         """
         Property that is ``True`` if XSD validator has been fully parsed and built,
         ``False`` otherwise. For schemas the property is checked on all global
@@ -69,7 +84,7 @@
         raise NotImplementedError()
 
     @property
-    def validation_attempted(self):
+    def validation_attempted(self) -> str:
         """
         Property that returns the *validation status* of the XSD validator.
         It can be 'full', 'partial' or 'none'.
@@ -80,7 +95,7 @@
         raise NotImplementedError()
 
     @property
-    def validity(self):
+    def validity(self) -> str:
         """
         Property that returns the XSD validator's validity.
         It can be ‘valid’, ‘invalid’ or ‘notKnown’.
@@ -97,7 +112,8 @@
         else:
             return 'notKnown'
 
-    def iter_components(self, xsd_classes=None):
+    def iter_components(self, xsd_classes: ComponentClassType = None) \
+            -> IteratorUnion'XsdComponent', SchemaType, 'XsdGlobals':
         """
         Creates an iterator for traversing all XSD components of the validator.
 
@@ -107,7 +123,7 @@
         raise NotImplementedError()
 
     @property
-    def all_errors(self):
+    def all_errors(self) -> ListXMLSchemaParseError:
         """
         A list with all the building errors of the XSD validator and its components.
         """
@@ -117,15 +133,17 @@
                 errors.extend(comp.errors)
         return errors
 
-    def copy(self):
-        validator = object.__new__(self.__class__)
+    def copy(self) -> 'XsdValidator':
+        validator: 'XsdValidator' = object.__new__(self.__class__)
         validator.__dict__.update(self.__dict__)
-        validator.errors = self.errors:
+        validator.errors = self.errors:  # shallow copy duplicates errors list
         return validator
 
     __copy__ = copy
 
-    def parse_error(self, error, elem=None, validation=None):
+    def parse_error(self, error: Unionstr, Exception,
+                    elem: OptionalElementType = None,
+                    validation: Optionalstr = None) -> None:
         """
         Helper method for registering parse errors. Does nothing if validation mode is 'skip'.
         Il validation mode is 'lax' collects the error, otherwise raise the error.
@@ -135,7 +153,7 @@
         attribute of the validator, if it's present.
         :param validation: overrides the default validation mode of the validator.
         """
-        if validation:
+        if validation is not None:
             check_validation_mode(validation)
         else:
             validation = self.validation
@@ -169,7 +187,46 @@
         else:
             raise error
 
-    def _parse_xpath_default_namespace(self, elem):
+    def validation_error(self, validation: str,
+                         error: Unionstr, Exception,
+                         obj: Any = None,
+                         source: OptionalXMLResource = None,
+                         namespaces: OptionalNamespacesType = None,
+                         **_kwargs: Any) -> XMLSchemaValidationError:
+        """
+        Helper method for generating and updating validation errors. If validation
+        mode is 'lax' or 'skip' returns the error, otherwise raises the error.
+
+        :param validation: an error-compatible validation mode: can be 'lax' or 'strict'.
+        :param error: an error instance or the detailed reason of failed validation.
+        :param obj: the instance related to the error.
+        :param source: the XML resource related to the validation process.
+        :param namespaces: is an optional mapping from namespace prefix to URI.
+        :param _kwargs: keyword arguments of the validation process that are not used.
+        """
+        check_validation_mode(validation)
+        if isinstance(error, XMLSchemaValidationError):
+            if error.namespaces is None and namespaces is not None:
+                error.namespaces = namespaces
+            if error.source is None and source is not None:
+                error.source = source
+            if error.obj is None and obj is not None:
+                error.obj = obj
+            if error.elem is None and obj is not None and is_etree_element(obj):
+                error.elem = obj
+                if is_etree_element(error.obj) and obj.tag == error.obj.tag:
+                    error.obj = obj
+
+        elif isinstance(error, Exception):
+            error = XMLSchemaValidationError(self, obj, str(error), source, namespaces)
+        else:
+            error = XMLSchemaValidationError(self, obj, error, source, namespaces)
+
+        if validation == 'strict' and error.elem is not None:
+            raise error
+        return error
+
+    def _parse_xpath_default_namespace(self, elem: ElementType) -> str:
         """
         Parse XSD 1.1 xpathDefaultNamespace attribute for schema, alternative, assert, assertion
         and selector declarations, checking if the value is conforming to the specification. In
@@ -184,9 +241,11 @@
         if value == '##local':
             return ''
         elif value == '##defaultNamespace':
-            return getattr(self, 'default_namespace')
+            default_namespace = getattr(self, 'default_namespace', None)
+            return default_namespace if isinstance(default_namespace, str) else ''
         elif value == '##targetNamespace':
-            return getattr(self, 'target_namespace')
+            target_namespace = getattr(self, 'target_namespace', '')
+            return target_namespace if isinstance(target_namespace, str) else ''
         elif len(value.split()) == 1:
             return value
         else:
@@ -212,105 +271,124 @@
     """
     _REGEX_SPACE = re.compile(r'\s')
     _REGEX_SPACES = re.compile(r'\s+')
-    _ADMITTED_TAGS = ()
+    _ADMITTED_TAGS: UnionSetstr, Tuplestr, ..., Tuple() = ()

_service:tar_scm:xmlschema-1.5.2.tar.gz/xmlschema/xpath.py -> _service:tar_scm:xmlschema-1.9.2.tar.gz/xmlschema/xpath.py Changed

@@ -10,35 +10,78 @@
 """
 This module defines a proxy class and a mixin class for enabling XPath on schemas.
 """
+import sys
 from abc import abstractmethod
-from collections.abc import Sequence
+from typing import cast, overload, Any, Dict, Iterator, List, Optional, \
+    Sequence, Set, TypeVar, Union
 import re
-import threading
 
 from elementpath import AttributeNode, TypedElement, XPath2Parser, \
-    XPathSchemaContext, AbstractSchemaProxy
+    XPathSchemaContext, AbstractSchemaProxy, protocols
 
-from .names import XSD_NAMESPACE
 from .exceptions import XMLSchemaValueError, XMLSchemaTypeError
+from .names import XSD_NAMESPACE
+from .aliases import NamespacesType, SchemaType, BaseXsdType, XPathElementType
+from .helpers import get_qname, local_name, get_prefixed_qname
+
+if sys.version_info < (3, 8):
+    XMLSchemaProtocol = SchemaType
+    ElementProtocol = XPathElementType
+    XsdTypeProtocol = BaseXsdType
+else:
+    from typing import runtime_checkable, Protocol
+
+    XsdTypeProtocol = protocols.XsdTypeProtocol
+
+    class XMLSchemaProtocol(protocols.XMLSchemaProtocol, Protocol):
+        attributes: Dictstr, Any
+
+    @runtime_checkable
+    class ElementProtocol(protocols.ElementProtocol, Protocol):
+        schema: XMLSchemaProtocol
+        attributes: Dictstr, Any
+
 
 _REGEX_TAG_POSITION = re.compile(r'\b\\d+')
 
 
-def iter_schema_nodes(root, with_root=True, with_attributes=False):
+def iter_schema_nodes(root: UnionXMLSchemaProtocol, ElementProtocol,
+                      with_root: bool = True,
+                      with_attributes: bool = False) \
+        -> IteratorUnionXMLSchemaProtocol, ElementProtocol, AttributeNode:
     """
     Iteration function for schema nodes. It doesn't yield text nodes,
     that are always `None` for schema elements, and detects visited
     element in order to skip already visited nodes.
 
-    :param root: schema or schema's element.
+    :param root: schema or schema element.
     :param with_root: if `True` yields initial element.
     :param with_attributes: if `True` yields also attribute nodes.
     """
-    def attribute_node(x):
+    def attribute_node(x: Any) -> AttributeNode:
         return AttributeNode(*x)
 
-    def _iter_schema_nodes(elem):
-        for child in elem:
+    if isinstance(root, TypedElement):
+        root = cast(ElementProtocol, root.elem)
+
+    nodes = {root}
+    if with_root:
+        yield root
+    if with_attributes:
+        yield from map(attribute_node, root.attributes.items())
+
+    iterators: ListAny = 
+    children: IteratorAny = iter(root)
+
+    while True:
+        try:
+            child = next(children)
+        except StopIteration:
+            try:
+                children = iterators.pop()
+            except IndexError:
+                return
+        else:
             if child in nodes:
                 continue
             elif child.ref is not None:
@@ -49,23 +92,15 @@
                     yield child.ref
                     if with_attributes:
                         yield from map(attribute_node, child.attributes.items())
-                    yield from _iter_schema_nodes(child.ref)
+                    iterators.append(children)
+                    children = iter(child.ref)
             else:
                 nodes.add(child)
                 yield child
                 if with_attributes:
                     yield from map(attribute_node, child.attributes.items())
-                yield from _iter_schema_nodes(child)
-
-    if isinstance(root, TypedElement):
-        root = root.elem
-
-    nodes = {root}
-    if with_root:
-        yield root
-    if with_attributes:
-        yield from map(attribute_node, root.attributes.items())
-    yield from _iter_schema_nodes(root)
+                iterators.append(children)
+                children = iter(child)
 
 
 class XMLSchemaContext(XPathSchemaContext):
@@ -75,10 +110,15 @@
 
 class XMLSchemaProxy(AbstractSchemaProxy):
     """XPath schema proxy for the *xmlschema* library."""
-    def __init__(self, schema=None, base_element=None):
+    _schema: SchemaType  # type: ignoreassignment
+
+    def __init__(self, schema: OptionalXMLSchemaProtocol = None,
+                 base_element: OptionalElementProtocol = None) -> None:
+
         if schema is None:
-            from xmlschema import XMLSchema
-            schema = XMLSchema.meta_schema
+            from xmlschema import XMLSchema10
+            schema = cast(XMLSchemaProtocol, getattr(XMLSchema10, 'meta_schema', None))
+
         super(XMLSchemaProxy, self).__init__(schema, base_element)
 
         if base_element is not None:
@@ -88,60 +128,33 @@
             except AttributeError:
                 raise XMLSchemaTypeError("%r is not an XsdElement" % base_element)
 
-    @property
-    def xsd_version(self):
-        return self._schema.XSD_VERSION
-
-    def bind_parser(self, parser):
-        if parser.schema is not self:
-            parser.schema = self
-
-        if self._schema.xpath_tokens is None:
-            parser.symbol_table = parser.__class__.symbol_table.copy()
-            for xsd_type in self.iter_atomic_types():
-                parser.schema_constructor(xsd_type.name)
-            self._schema.xpath_tokens = parser.symbol_table
-        else:
-            parser.symbol_table = self._schema.xpath_tokens
-        parser.tokenizer = parser.create_tokenizer(parser.symbol_table)
+    def bind_parser(self, parser: XPath2Parser) -> None:
+        parser.schema = self
+        parser.symbol_table = dict(parser.__class__.symbol_table)
+
+        with self._schema.lock:
+            if self._schema.xpath_tokens is None:
+                self._schema.xpath_tokens = {
+                    xsd_type.name: parser.schema_constructor(xsd_type.name)
+                    for xsd_type in self.iter_atomic_types() if xsd_type.name
+                }
 
-    def get_context(self):
+        parser.symbol_table.update(self._schema.xpath_tokens)
+
+    def get_context(self) -> XMLSchemaContext:
         return XMLSchemaContext(
-            root=self._schema,
-            namespaces=self._schema.namespaces,
+            root=self._schema,  # type: ignorearg-type
+            namespaces=dict(self._schema.namespaces),
             item=self._base_element
         )
 
-    def get_type(self, qname):
-        try:
-            return self._schema.maps.typesqname
-        except KeyError:
-            return None
-
-    def get_attribute(self, qname):
-        try:
-            return self._schema.maps.attributesqname
-        except KeyError:
-            return None
-
-    def get_element(self, qname):
-        try:
-            return self._schema.maps.elementsqname
-        except KeyError:
-            return None
-
-    def get_substitution_group(self, qname):
-        try:
-            return self._schema.maps.substitution_groupsqname
-        except KeyError: