Commit40d007a

committed

Fix the moduleFactoryFactory to cache based on *args and **kwargs.

1 parente1d9a5b commit40d007aCopy full SHA for 40d007a

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ def test_namespace_html_elements_1_dom(self):`
`40`	`40`	`deftest_namespace_html_elements_0_etree(self):`
`41`	`41`	`parser=html5parser.HTMLParser(namespaceHTMLElements=True)`
`42`	`42`	`doc=parser.parse("<html></html>")`
`43`		`-self.assertTrue(list(doc)[0].tag=="{%s}html"% (namespaces["html"],))`
	`43`	`+self.assertTrue(doc.tag=="{%s}html"% (namespaces["html"],))`
`44`	`44`
`45`	`45`	`deftest_namespace_html_elements_1_etree(self):`
`46`	`46`	`parser=html5parser.HTMLParser(namespaceHTMLElements=False)`
`47`	`47`	`doc=parser.parse("<html></html>")`
`48`		`-self.assertTrue(list(doc)[0].tag=="html")`
	`48`	`+self.assertTrue(doc.tag=="html")`
`49`	`49`
`50`	`50`	`deftest_unicode_file(self):`
`51`	`51`	`parser=html5parser.HTMLParser()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ def PullDOMAdapter(node):`
`60`	`60`	`pass`
`61`	`61`	`else:`
`62`	`62`	`treeTypes['ElementTree']= \`
`63`		`- {"builder":treebuilders.getTreeBuilder("etree",ElementTree),`
	`63`	`+ {"builder":treebuilders.getTreeBuilder("etree",ElementTree,fullTree=True),`
`64`	`64`	`"walker":treewalkers.getTreeWalker("etree",ElementTree)}`
`65`	`65`
`66`	`66`	`try:`
`@@ -69,7 +69,7 @@ def PullDOMAdapter(node):`
`69`	`69`	`pass`
`70`	`70`	`else:`
`71`	`71`	`treeTypes['cElementTree']= \`
`72`		`- {"builder":treebuilders.getTreeBuilder("etree",ElementTree),`
	`72`	`+ {"builder":treebuilders.getTreeBuilder("etree",ElementTree,fullTree=True),`
`73`	`73`	`"walker":treewalkers.getTreeWalker("etree",ElementTree)}`
`74`	`74`
`75`	`75`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,21 @@ def moduleFactory(baseModule, args, *kwargs):`
`91`	`91`	`else:`
`92`	`92`	`name=b"_%s_factory"%baseModule.__name__`
`93`	`93`
`94`		`-ifnameinmoduleCache:`
`95`		`-returnmoduleCache[name]`
`96`		`-else:`
	`94`	`+kwargs_tuple=tuple(kwargs.items())`
	`95`	`+`
	`96`	`+try:`
	`97`	`+returnmoduleCache[name][args][kwargs_tuple]`
	`98`	`+exceptKeyError:`
`97`	`99`	`mod=ModuleType(name)`
`98`	`100`	`objs=factory(baseModule,args,*kwargs)`
`99`	`101`	`mod.__dict__.update(objs)`
`100`		`-moduleCache[name]=mod`
	`102`	`+if"name"notinmoduleCache:`
	`103`	`+moduleCache[name]= {}`
	`104`	`+if"args"notinmoduleCache[name]:`
	`105`	`+moduleCache[name][args]= {}`
	`106`	`+if"kwargs"notinmoduleCache[name][args]:`
	`107`	`+moduleCache[name][args][kwargs_tuple]= {}`
	`108`	`+moduleCache[name][args][kwargs_tuple]=mod`
`101`	`109`	`returnmod`
`102`	`110`
`103`	`111`	`returnmoduleFactory`

Comments

(0)