add abc imports when defining interfaces

bdkearns · bdkearns · commit daced34e7029 · 2014-10-15T01:10:10.000-04:00
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -129,7 +129,12 @@ def acceptType(self, node, memo):
     acceptAt = makeAcceptType('at')
     acceptClass = makeAcceptType('klass')
     acceptEnum = makeAcceptType('enum')
-    acceptInterface = makeAcceptType('interface')
+    _acceptInterface = makeAcceptType('interface')
+
+    def acceptInterface(self, node, memo):
+        module = self.parents(lambda x:x.isModule).next()
+        module.needsAbstractHelpers = True
+        return self._acceptInterface(node, memo)
 
 
 class Module(TypeAcceptor, Base):
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -26,6 +26,7 @@
     basic.simpleDocString,
     'from __future__ import print_function',
     basic.maybeBsr,
+    basic.maybeAbstractHelpers,
     basic.maybeSyncHelpers,
 ]
 
diff --git a/java2python/mod/basic.py b/java2python/mod/basic.py
@@ -133,8 +133,6 @@ def maybeAbstractMethod(method):
 
 def maybeSynchronizedMethod(method):
     if 'synchronized' in method.modifiers:
-        module = method.parents(lambda x:x.isModule).next()
-        module.needsSyncHelpers = True
         yield '@synchronized'
 
 
@@ -160,6 +158,11 @@ def maybeBsr(module):
             yield line
 
 
+def maybeAbstractHelpers(module):
+    if getattr(module, 'needsAbstractHelpers', False):
+        yield 'from abc import ABCMeta, abstractmethod'
+
+
 def maybeSyncHelpers(module):
     if getattr(module, 'needsSyncHelpers', False):
         for line in getSyncHelpersSrc().split('\n'):
diff --git a/test/configs/Class10.py b/test/configs/Class10.py
@@ -1,4 +1,3 @@
 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
diff --git a/test/configs/defaults.py b/test/configs/defaults.py
@@ -3,7 +3,6 @@
 modulePrologueHandlers = [
     'from java2python.mod.include.classmethod import classmethod_ as classmethod',
     'from java2python.mod.include.overloading import overloaded',
-    'from abc import ABCMeta, abstractmethod',
     'import zope.interface',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`basic.simpleDocString,`
`27`	`27`	`'from __future__ import print_function',`
`28`	`28`	`basic.maybeBsr,`
	`29`	`+ basic.maybeAbstractHelpers,`
`29`	`30`	`basic.maybeSyncHelpers,`
`30`	`31`	`]`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`modulePrologueHandlers = [`
`2`	`2`	`'from java2python.mod.include.overloading import overloaded',`
`3`		`- 'from abc import ABCMeta, abstractmethod',`
`4`	`3`	`]`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`modulePrologueHandlers = [`
`4`	`4`	`'from java2python.mod.include.classmethod import classmethod_ as classmethod',`
`5`	`5`	`'from java2python.mod.include.overloading import overloaded',`
`6`		`- 'from abc import ABCMeta, abstractmethod',`
`7`	`6`	`'import zope.interface',`
`8`	`7`	`]`
`9`	`8`