Merge pull request #541 from andy-maier/py26_fixes

Fixes to support Python 2.6 again.

1 files changed, 11 insertions, 4 deletions

diff --git a/git/util.py b/git/util.py
index efecca83..1dbbd35d 100644
--- a/git/util.py
+++ b/git/util.py
@@ -9,11 +9,15 @@ import getpass
 import logging
 import os
 import platform
+import subprocess
 import re
 import shutil
 import stat
 import time
-from unittest.case import SkipTest
+try:
+    from unittest import SkipTest
+except ImportError:
+    from unittest2 import SkipTest
 
 from gitdb.util import (# NOQA @IgnorePep8
     make_sha,
@@ -301,7 +305,7 @@ def is_cygwin_git(git_executable):
     if not is_win:
         return False
 
-    from subprocess import check_output
+    #from subprocess import check_output
 
     is_cygwin = _is_cygwin_cache.get(git_executable)
     if is_cygwin is None:
@@ -314,8 +318,11 @@ def is_cygwin_git(git_executable):
 
             ## Just a name given, not a real path.
             uname_cmd = osp.join(git_dir, 'uname')
-            uname = check_output(uname_cmd, universal_newlines=True)
-            is_cygwin = 'CYGWIN' in uname
+            process = subprocess.Popen([uname_cmd], stdout=subprocess.PIPE,
+                                       universal_newlines=True)
+            uname_out, _ = process.communicate()
+            #retcode = process.poll()
+            is_cygwin = 'CYGWIN' in uname_out
         except Exception as ex:
             log.debug('Failed checking if running in CYGWIN due to: %r', ex)
         _is_cygwin_cache[git_executable] = is_cygwin