Merge branch 'master' of natural-github:natural/java2python

Troy Melhase · Troy Melhase · commit 249855aeb310 · 2012-05-03T18:33:48.000-04:00
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -189,6 +189,7 @@
 moduleOutputSubs = [
     (r'System\.out\.println\((.*)\)', r'print \1'),
     (r'System\.out\.print_\((.*?)\)', r'print \1,'),
+    (r'String\.format\(\"(.*)\" *, *(.*)\)', r'"\1" % (\2)'),
     (r'(.*?)\.equals\((.*?)\)', r'\1 == \2'),
     (r'(.*?)\.equalsIgnoreCase\((.*?)\)', r'\1.lower() == \2.lower()'),
     (r'([\w.]+)\.size\(\)', r'len(\1)'),
diff --git a/test/Format.java b/test/Format.java
@@ -0,0 +1,9 @@
+public class Format {
+  public static void main(String[] args) {
+    int i = 22;
+    String s = "text";
+    String r = String.format("> (%d) %s", i, s);
+
+    System.out.println(r);
+  }
+}
