diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
| commit | 9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 (patch) | |
| tree | f06a5be02102b0a78f56e18beffa8fa5c3e70b6e /compat/subprocess.py | |
| parent | Eliminate Scalar::Util usage from private-Error.pm (diff) | |
| parent | annotate: Fix bug when parsing merges with differing real and logical parents. (diff) | |
| download | git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.gz git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.zip | |
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
Diffstat (limited to 'compat/subprocess.py')
| -rw-r--r-- | compat/subprocess.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compat/subprocess.py b/compat/subprocess.py index bbd26c7b0e..6474eab119 100644 --- a/compat/subprocess.py +++ b/compat/subprocess.py @@ -568,7 +568,7 @@ class Popen(object): # Windows methods # def _get_handles(self, stdin, stdout, stderr): - """Construct and return tupel with IO objects: + """Construct and return tuple with IO objects: p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite """ if stdin == None and stdout == None and stderr == None: @@ -635,7 +635,7 @@ class Popen(object): def _find_w9xpopen(self): - """Find and return absolut path to w9xpopen.exe""" + """Find and return absolute path to w9xpopen.exe""" w9xpopen = os.path.join(os.path.dirname(GetModuleFileName(0)), "w9xpopen.exe") if not os.path.exists(w9xpopen): @@ -812,7 +812,7 @@ class Popen(object): # POSIX methods # def _get_handles(self, stdin, stdout, stderr): - """Construct and return tupel with IO objects: + """Construct and return tuple with IO objects: p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite """ p2cread, p2cwrite = None, None |