Merge pull request #250 from Cal-CS-61A-Staff/client-rawstring

Handle raw strings in client test dumping

.gitignore

@@ -17,3 +17,5 @@ gaenv/
 # pip-related files
 *.egg-info
 dist
+*.ok_refresh
+*.ok_messages

client/tests/utils/formatting_test.py

@@ -17,27 +17,43 @@ def testString_singleLine(self):
 
     def testString_multipleLines(self):
         self.assertFormat("""
-        \"\"\"
+        r\"\"\"
         hello
         world
         \"\"\"
         """, "hello\nworld")
 
-    def testString_multipleLines(self):
+    def testString_multipleLinesSurroundingNewlines(self):
         self.assertFormat("""
-        \"\"\"
+        r\"\"\"
         hello
         world
         \"\"\"
         """, "\nhello\nworld\n")
 
+    def testString_rawStringSingleLine(self):
+        self.assertFormat(r"""
+        'hello \\ there'
+        """, r"hello \ there")
+
+    def testString_rawStringMultiLine(self):
+        self.assertFormat("""
+        r\"\"\"
+        hello \\
+            there
+        \"\"\"
+        """, r"""
+        hello \
+            there
+        """)
+
     def testList_onlyPrimitives(self):
         self.assertFormat("""
         [
           42,
           3.14,
           'hello world',
-          \"\"\"
+          r\"\"\"
           hello
           world
           \"\"\"
@@ -66,7 +82,7 @@ def testDict_onlyPrimitives(self):
         self.assertFormat("""
         {
           'answer': 'hello world',
-          'multi': \"\"\"
+          'multi': r\"\"\"
           answer
           here
           \"\"\",

client/utils/formatting.py

@@ -69,14 +69,17 @@ def prettyjson(json, indentation='  '):
     json        -- Python object that is serializable into json.
     indentation -- str; represents one level of indentation
 
+    NOTES:
+    All multiline strings are treated as raw strings.
+
     RETURNS:
     str; the formatted json-like string.
     """
     if isinstance(json, int) or isinstance(json, float):
         return str(json)
     elif isinstance(json, str):
         if '\n' in json:
-            return '"""\n' + dedent(json) + '\n"""'
+            return 'r"""\n' + dedent(json) + '\n"""'
         return repr(json)
     elif isinstance(json, list):
         lst = [indent(prettyjson(el, indentation), indentation) for el in json]