/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
20
20
import errno
21
21
import os
22
22
import subprocess
 
23
import sys
23
24
 
24
25
from bzrlib import (
25
26
    errors,
72
73
 
73
74
    def sign(self, content):
74
75
        ui.ui_factory.clear_term()
 
76
 
 
77
        preexec_fn = _set_gpg_tty
 
78
        if sys.platform == 'win32':
 
79
            # Win32 doesn't support preexec_fn, but wouldn't support TTY anyway.
 
80
            preexec_fn = None
75
81
        try:
76
82
            process = subprocess.Popen(self._command_line(),
77
83
                                       stdin=subprocess.PIPE,
78
84
                                       stdout=subprocess.PIPE,
79
 
                                       preexec_fn=_set_gpg_tty)
 
85
                                       preexec_fn=preexec_fn)
80
86
            try:
81
87
                result = process.communicate(content)[0]
82
88
                if process.returncode is None: