C Nelson avatar C Nelson committed a7d7a07

Making generate_diff_insert python2.7 compatible.

Comments (0)

Files changed (1)

extras/crystal.py

     newfile_fh.close()
 
     try:
+        from subprocess import CalledProcessError
+    except ImportError:
+        CalledProcessError = None
+
+    try:
         diffcontent = subprocess.check_output("diff -u ../main.asm " + newfile_filename, shell=True)
-    except AttributeError, exc:
+    except (AttributeError, CalledProcessError):
         p = subprocess.Popen(["diff", "-u", "../main.asm", newfile_filename], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = p.communicate()
         diffcontent = out
-    except Exception, exc:
-        raise exc
 
     os.system("rm " + original_filename)
     os.system("rm " + newfile_filename)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.