/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

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-25 17:47:10 UTC
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061025174710-b8bea783ced1169f
Fix the race condition again and correct some small typos to be in
line with the incremental patches to be proposed.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): Why not inverting them ?

* bzrlib/tests/test_http.py:
(TestWallServer.test_http_has): Whatever we try, httplib still may
raise BadStatusLine, which will be translated to
InvalidHttpResponse, so catch that too.

* bzrlib/tests/HTTPTestUtil.py:
(WallRequestHandler.handle_one_request): Previous fix was not
enough, revert it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
"""GPG signing and checking logic."""
19
19
 
50
50
        """Real strategies take a configuration."""
51
51
 
52
52
    def sign(self, content):
53
 
        return ("-----BEGIN PSEUDO-SIGNED CONTENT-----\n" + content +
54
 
                "-----END PSEUDO-SIGNED CONTENT-----\n")
 
53
        return content
55
54
 
56
55
 
57
56
def _set_gpg_tty():
69
68
 
70
69
class GPGStrategy(object):
71
70
    """GPG Signing and checking facilities."""
72
 
 
 
71
        
73
72
    def _command_line(self):
74
73
        return [self._config.gpg_signing_command(), '--clearsign']
75
74
 
77
76
        self._config = config
78
77
 
79
78
    def sign(self, content):
80
 
        if isinstance(content, unicode):
81
 
            raise errors.BzrBadParameterUnicode('content')
82
79
        ui.ui_factory.clear_term()
83
80
 
84
81
        preexec_fn = _set_gpg_tty