String formatting (2nd iteration) handle %n from Java

iuliux · iuliux · commit d178ce8a6b06 · 2012-05-13T17:07:33.000+03:00
diff --git a/java2python/mod/transform.py b/java2python/mod/transform.py
@@ -101,6 +101,10 @@ def formatSyntaxTransf(match):
         inside a format specifier string.
     """
     groups = match.groupdict()
+    if groups['convers'] == 'n':
+        # Means platform-specific line separator
+        return '\\n' # Py converts \n to os.linesep
+
     result = '{'
     # TODO: add flags, width and precision
     if(groups['idx']):
@@ -124,7 +128,7 @@ def formatString(node, config):
     format = call_args[0].firstChildOfType(tokens.STRING_LITERAL)
     if format:
         format.token.text =  \
-            re.sub(r'%(?P<idx>\d+\$)?(?P<convers>[scdoxefg])',
+            re.sub(r'%(?P<idx>\d+\$)?(?P<convers>[scdoxefgn])',
                     formatSyntaxTransf,
                     format.token.text,
                     flags=re.IGNORECASE)
diff --git a/test/Format0.java b/test/Format0.java
@@ -2,7 +2,7 @@ public class Format0 {
   public static void main(String[] args) {
     int i = 22;
     String s = "text";
-    String r = String.format("> (%1$d) %2$s", i, s);
+    String r = String.format("> (%1$d) %n %2$s", i, s);
 
     System.out.println(r);
   }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ public class Format0 {`
`2`	`2`	`public static void main(String[] args) {`
`3`	`3`	`int i = 22;`
`4`	`4`	`String s = "text";`
`5`		`- String r = String.format("> (%1$d) %2$s", i, s);`
	`5`	`+ String r = String.format("> (%1$d) %n %2$s", i, s);`
`6`	`6`
`7`	`7`	`System.out.println(r);`
`8`	`8`	`}`