Browse Source
----------------------------------------------------------------------
Modified Files: XMLSchema.py -- Namespaced a couple attributes in attribute dictionary that I missed. ----------------------------------------------------------------------main
Joshua Boverhof
21 years ago
1 changed files with 5 additions and 5 deletions
Unified View
Diff Options
-
+5 -5XMLSchema.py
+ 5
- 5
XMLSchema.py
View File
| @@ -768,7 +768,7 @@ class XMLSchema(XMLSchemaComponent): | |||||
| """ | """ | ||||
| self.targetNamespace = None | self.targetNamespace = None | ||||
| XMLSchemaComponent.__init__(self, parent) | XMLSchemaComponent.__init__(self, parent) | ||||
| f = lambda k: k.attributes['name'] | |||||
| f = lambda k: k.attributes[XMLSchemaComponent.xsd]['name'] | |||||
| self.includes = Collection(self, key=f) | self.includes = Collection(self, key=f) | ||||
| self.imports = Collection(self, key=f) | self.imports = Collection(self, key=f) | ||||
| self.elements = Collection(self, key=f) | self.elements = Collection(self, key=f) | ||||
| @@ -885,7 +885,7 @@ class XMLSchema(XMLSchemaComponent): | |||||
| if component == 'include': | if component == 'include': | ||||
| tp = self.__class__.Include(self) | tp = self.__class__.Include(self) | ||||
| tp.fromDom(node) | tp.fromDom(node) | ||||
| self.includes[tp.attributes['schemaLocation']] = tp | |||||
| self.includes[tp.attributes[XMLSchemaComponent.xsd]['schemaLocation']] = tp | |||||
| schema = tp.getSchema() | schema = tp.getSchema() | ||||
| if schema.targetNamespace and \ | if schema.targetNamespace and \ | ||||
| @@ -901,11 +901,11 @@ class XMLSchema(XMLSchemaComponent): | |||||
| elif component == 'import': | elif component == 'import': | ||||
| tp = self.__class__.Import(self) | tp = self.__class__.Import(self) | ||||
| tp.fromDom(node) | tp.fromDom(node) | ||||
| if tp.attributes['namespace']: | |||||
| if tp.attributes['namespace'] == self.targetNamespace: | |||||
| if tp.attributes[XMLSchemaComponent.xsd]['namespace']: | |||||
| if tp.attributes[XMLSchemaComponent.xsd]['namespace'] == self.targetNamespace: | |||||
| raise SchemaError,\ | raise SchemaError,\ | ||||
| 'import and schema have same targetNamespace' | 'import and schema have same targetNamespace' | ||||
| self.imports[tp.attributes['namespace']] = tp | |||||
| self.imports[tp.attributes[XMLSchemaComponent.xsd]['namespace']] = tp | |||||
| else: | else: | ||||
| self.imports[self.__class__.empty_namespace] = tp | self.imports[self.__class__.empty_namespace] = tp | ||||
| elif component == 'redefine': | elif component == 'redefine': | ||||