Merge pull request #84 from cs50/develop

v2.1.3
cs50 · Oct 6, 2017 · ec4abc3 · ec4abc3
2 parents b61c38d + c2e9de6
commit ec4abc3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/check50.py b/check50.py
@@ -248,7 +248,7 @@ def print_json(results):
             pass
 
         output.append(obj)
-    print(json.dumps(output))
+    print(json.dumps(output, cls=Encoder))
 
 
 def import_checks(identifier):
@@ -426,6 +426,15 @@ def wrapper(self):
     return decorator
 
 
+class Encoder(json.JSONEncoder):
+    """Custom class for JSON encoding."""
+
+    def default(self, o):
+        if o == EOF:
+            return "EOF"
+        return o.__dict__
+
+
 class File(object):
     """Generic class to represent file in check directory."""
 

diff --git a/setup.py b/setup.py
@@ -60,5 +60,5 @@ class CustomInstall(install):
         "console_scripts": ["check50=check50:main"]
     },
     url="https://github.com/cs50/check50",
-    version="2.1.2"
+    version="2.1.3"
 )