use config.every rather than config.last for configHandlers

bdkearns · bdkearns · commit 150e5cee1f35 · 2014-10-15T00:34:04.000-04:00
diff --git a/java2python/compiler/template.py b/java2python/compiler/template.py
@@ -173,7 +173,7 @@ def configHandler(self, part, suffix='Handler', default=None):
     def configHandlers(self, part, suffix='Handlers'):
         """ Returns config handlers for this type of template """
         name = '{0}{1}{2}'.format(self.typeName, part, suffix)
-        return imap(self.toIter, self.config.last(name, ()))
+        return imap(self.toIter, chain(*self.config.every(name, [])))
 
     def dump(self, fd, level=0):
         """ Writes the Python source code for this template to the given file. """
diff --git a/test/configs/Class10.py b/test/configs/Class10.py
@@ -1,6 +1,4 @@
-from java2python.config.default import modulePrologueHandlers
-
-modulePrologueHandlers += [
+modulePrologueHandlers = [
         'from java2python.mod.include.overloading import overloaded',
         'from abc import ABCMeta, abstractmethod',
     ]
diff --git a/test/configs/Interface1.py b/test/configs/Interface1.py
@@ -1,5 +1,3 @@
-from java2python.config.default import modulePrologueHandlers
-
-modulePrologueHandlers += [
+modulePrologueHandlers = [
         "from abc import ABCMeta, abstractmethod",
     ]
diff --git a/test/configs/defaults.py b/test/configs/defaults.py
@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from java2python.config import default
-
-
-modulePrologueHandlers = default.modulePrologueHandlers + [
+modulePrologueHandlers = [
     'from java2python.mod.include.classmethod import classmethod_ as classmethod',
     'from java2python.mod.include.overloading import overloaded',
     'from abc import ABCMeta, abstractmethod',

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-from java2python.config.default import modulePrologueHandlers`
`2`		`-`
`3`		`-modulePrologueHandlers += [`
	`1`	`+modulePrologueHandlers = [`
`4`	`2`	`'from java2python.mod.include.overloading import overloaded',`
`5`	`3`	`'from abc import ABCMeta, abstractmethod',`
`6`	`4`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from java2python.config.default import modulePrologueHandlers`
`2`		`-`
`3`		`-modulePrologueHandlers += [`
	`1`	`+modulePrologueHandlers = [`
`4`	`2`	`"from abc import ABCMeta, abstractmethod",`
`5`	`3`	`]`