Merge lp:~jelmer/hydrazine/bzr2.5-compat into lp:hydrazine

[Jelmer Vernooij]

Fix compatibility with current versions of bzr 2.5, which use config stacks in SMTPConnection and GPG signing.

[Martin Pool (mbp)]

thanks
  vote approve

review: Approve

=== modified file 'feed-pqm'
--- feed-pqm	2011-10-18 13:40:41 +0000
+++ feed-pqm	2011-12-21 11:33:27 +0000
@@ -16,9 +16,7 @@
 # TODO: some way to persistently say "not for me" and not be asked again
 
 
-import datetime
 import optparse
-import os
 import sys
 
 try:
@@ -38,8 +36,11 @@
             atexit.register(context.__enter__().__exit__, None, None, None)
 
 from bzrlib.email_message import EmailMessage
-from bzrlib.config import GlobalConfig
-from bzrlib import gpg
+from bzrlib import (
+    config as _mod_config,
+    gpg,
+    version_info as bzrlib_version,
+    )
 from bzrlib.smtp_connection import SMTPConnection
 
 import hydrazine
@@ -146,8 +147,12 @@
             mp.target_branch.composePublicURL(scheme='http')))
     print raw_message
 
-    config = GlobalConfig()
-    my_email = config.user_email()
+    if bzrlib_version < (2, 5):
+        config = _mod_config.GlobalConfig()
+        my_email = config.user_email()
+    else:
+        config = _mod_config.GlobalStack()
+        my_email = config.get('email')
     print "Will send email from address <%s>" % (my_email,)
     signer = gpg.GPGStrategy(config)
     signed_message = signer.sign(raw_message.encode('utf8'))