From b424f87a276e509dcaaee6beb10ca00c12bb7d29 Mon Sep 17 00:00:00 2001 From: Andreas Gutsche Date: Thu, 6 Jan 2011 15:21:09 +0100 Subject: Added the bugfix code as a utility function to be reused wherever this specific subprocess bug occurs. --- git/cmd.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'git/cmd.py') diff --git a/git/cmd.py b/git/cmd.py index d1600b74..af8417b7 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -4,7 +4,7 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php -import os, sys, platform, time +import os, sys from util import * from exc import GitCommandError @@ -87,11 +87,7 @@ class Git(object): """Wait for the process and return its status code. :raise GitCommandError: if the return status is not 0""" - - #HACK: These two lines are necessary because OSX raises an error if you try to .wait() right after creating the process object. - # It is only necessary when using GUI frameworks to instantiate an application. - if platform.system().startswith("Darwin") and "pyside" in sys.modules.keys() or "PySide" in sys.modules.keys(): - time.sleep(0.1) + sleep_on_gui_present_osx_crashfix() status = self.proc.wait() if status != 0: raise GitCommandError(self.args, status, self.proc.stderr.read()) -- cgit v1.2.1