some changes for py3 compat

bdkearns · bdkearns · commit c994f83abdfb · 2014-10-14T03:49:25.000-04:00
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -24,6 +24,7 @@
 modulePrologueHandlers = [
     basic.shebangLine,
     basic.simpleDocString,
+    'from __future__ import print_function',
     basic.maybeBsr,
     basic.maybeSyncHelpers,
 ]
@@ -193,8 +194,8 @@
 
 # module output subs.
 moduleOutputSubs = [
-    (r'System\.out\.println\((.*)\)', r'print \1'),
-    (r'System\.out\.print_\((.*?)\)', r'print \1,'),
+    (r'System\.out\.println\((.*)\)', r'print(\1)'),
+    (r'System\.out\.print_\((.*?)\)', r'print(\1, end="")'),
     (r'(.*?)\.equals\((.*?)\)', r'\1 == \2'),
     (r'(.*?)\.equalsIgnoreCase\((.*?)\)', r'\1.lower() == \2.lower()'),
     (r'([\w.]+)\.size\(\)', r'len(\1)'),
diff --git a/java2python/mod/include/overloading.py b/java2python/mod/include/overloading.py
@@ -36,11 +36,13 @@
 
 """
 
-import new
+from types import MethodType as instancemethod
 
-# Make the environment more like Python 3.0
-__metaclass__ = type
-from itertools import izip as zip
+import sys
+if sys.version_info[0] < 3:
+    # Make the environment more like Python 3.0
+    __metaclass__ = type
+    from itertools import izip as zip
 
 
 class overloaded:
@@ -55,7 +57,7 @@ def __init__(self, default_func):
     def __get__(self, obj, type=None):
         if obj is None:
             return self
-        return new.instancemethod(self, obj)
+        return instancemethod(self, obj)
 
     def register(self, *types):
         """Decorator to register an implementation for a specific set of types.
diff --git a/test/Self0.java b/test/Self0.java
@@ -17,6 +17,9 @@ public static void main(String[] args) {
 			System.out.println("True");
 		else
 			System.out.println("False");
+                System.out.print("test");
+                System.out.print("ing");
+                System.out.println();
 	}
 	
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ public static void main(String[] args) {`
`17`	`17`	`System.out.println("True");`
`18`	`18`	`else`
`19`	`19`	`System.out.println("False");`
	`20`	`+ System.out.print("test");`
	`21`	`+ System.out.print("ing");`
	`22`	`+ System.out.println();`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`}`