← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
103
103
    :return: A Popen object.
104
104
    """
105
105
    if capture_errors:
106
 
        preexec_fn = _set_lang_C
 
106
        if sys.platform == 'win32':
 
107
            # Win32 doesn't support preexec_fn, but that is
 
108
            # okay, because it doesn't support LANG either.
 
109
            preexec_fn = None
 
110
        else:
 
111
            preexec_fn = _set_lang_C
107
112
        stderr = subprocess.PIPE
108
113
    else:
109
114
        preexec_fn = None