Merge pull request #72 from cs50/develop

Update to v2.0.5

check50.py

@@ -11,6 +11,7 @@
 import os
 import pexpect
 import pip
+import re
 import requests
 import shutil
 import subprocess
@@ -536,6 +537,8 @@ def wait(self, timeout=1):
                 pass
             except EOF:
                 break
+            except UnicodeDecodeError:
+                raise Error("output not valid ASCII text")
             else:
                 self.output.append(bytes)
         else:
@@ -661,8 +664,10 @@ def append_code(self, original, codefile):
             o.write(code.read())
 
     def replace_fn(self, old_fn, new_fn, filename):
-        self.spawn("sed -i='' -e 's/callq\t_{}/callq\t_{}/g' {}".format(old_fn, new_fn, filename))
-        self.spawn("sed -i='' -e 's/callq\t{}/callq\t{}/g' {}".format(old_fn, new_fn, filename))
+        with open(filename, "r+") as f:
+            asm = re.sub(r"(callq\t_?){}(?!\w)".format(old_fn), r"\1{}".format(new_fn), f.read())
+            f.seek(0)
+            f.write(asm)
 
     def _check_valgrind(self):
         """Log and report any errors encountered by valgrind"""

setup.py

@@ -60,5 +60,5 @@ class CustomInstall(install):
         "console_scripts": ["check50=check50:main"]
     },
     url="https://github.com/cs50/check50",
-    version="2.0.4"
+    version="2.0.5"
 )