Move character conversion in string

CodeConverter.py

@@ -44,17 +44,24 @@ def ruby_style_code(self, matchobj):
         msg = re.sub(r'([^:]+)\:\s*(.+)', self.convert_args, matchobj.group(2))
         return "%s.%s" % (matchobj.group(1), msg)
 
+    def arrange_multilines(self, matchobj):
+        if matchobj.group(2) == '}' and '{' not in matchobj.group(1):
+            return matchobj.group()
+        else:
+            return "%s%s " % (matchobj.group(1), matchobj.group(2))
+
+    # Special characters in string (TODO refactoring)
     def characters_to_mark(self, matchobj):
         val = re.sub(r' ', '__SPACE__', matchobj.group(1))
         val = re.sub(r',', '__COMMA__', val)
         val = re.sub(r':', '__SEMICOLON__', val)
         return val
 
-    def arrange_multilines(self, matchobj):
-        if matchobj.group(2) == '}' and '{' not in matchobj.group(1):
-            return matchobj.group()
-        else:
-            return "%s%s " % (matchobj.group(1), matchobj.group(2))
+    def restore_characters_in_string(self):
+        self.s = re.sub(r'__SPACE__', ' ', self.s)
+        self.s = re.sub(r'__COMMA__', ',', self.s)
+        self.s = re.sub(r'__SEMICOLON__', ':', self.s)
+        return self
 
     # Conversions
     def multilines_to_one_line(self):
@@ -71,12 +78,6 @@ def mark_spaces_in_string(self):
         self.s = re.sub(r'("(?:[^\\"]|\\.)*")', self.characters_to_mark, self.s)
         return self
 
-    def restore_characters_in_string(self):
-        self.s = re.sub(r'__SPACE__', ' ', self.s)
-        self.s = re.sub(r'__COMMA__', ',', self.s)
-        self.s = re.sub(r'__SEMICOLON__', ':', self.s)
-        return self
-
     def tidy_up(self):
         self.s = re.sub(r',([a-zA-Z_0-9]+):', r', \1:', self.s)
         return self