DocView patches from Morgen Hua: bug fixes, and additional SVN
commands, also added a default template that uses the text editor for any unknown file type. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -195,6 +195,8 @@ def _objectfactory(objname, objargs=None, xsname=None):
 | 
			
		||||
    try:
 | 
			
		||||
        if __builtin__.__dict__.has_key(objname):
 | 
			
		||||
            module = __builtin__
 | 
			
		||||
        elif knownGlobalModule:
 | 
			
		||||
            module = knownGlobalModule
 | 
			
		||||
        else:
 | 
			
		||||
            if modulename:
 | 
			
		||||
                module = __import__(modulename)
 | 
			
		||||
@@ -431,12 +433,13 @@ def _getXmlValue(pythonValue):
 | 
			
		||||
    else:
 | 
			
		||||
        return str(pythonValue)
 | 
			
		||||
 | 
			
		||||
def unmarshal(xmlstr, knownTypes=None):
 | 
			
		||||
    global knownGlobalTypes
 | 
			
		||||
def unmarshal(xmlstr, knownTypes=None, knownModule=None):
 | 
			
		||||
    global knownGlobalTypes, knownGlobalModule
 | 
			
		||||
    if (knownTypes == None):
 | 
			
		||||
        knownGlobalTypes = {}
 | 
			
		||||
    else:
 | 
			
		||||
        knownGlobalTypes = knownTypes
 | 
			
		||||
    knownGlobalModule = knownModule
 | 
			
		||||
    objectfactory = XMLObjectFactory()
 | 
			
		||||
    xml.sax.parseString(xmlstr, objectfactory)
 | 
			
		||||
    return objectfactory.getRootObject()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user