Merge lp:~gz/hydrazine/setup_bzrlib_ui_597504 into lp:hydrazine

[Martin Packman]

Basically this just inits the bzrlib ui so that it can prompt for an email password (or anything else).

The change is a little messy as there have been several variations on how this should be done in recent times. For 2.1 you need to create the ui_factory object yourself, 2.2 added an initialize function, which has recently grown into a context-manager style interface.

[Martin Pool (mbp)]

thanks!

review: Approve

[Martin Pool (mbp)]

You're now in the team, please merge it to trunk yourself.

=== modified file 'feed-pqm'
--- feed-pqm	2010-05-21 12:35:04 +0000
+++ feed-pqm	2010-06-23 01:41:31 +0000
@@ -21,6 +21,22 @@
 import os
 import sys
 
+try:
+    from bzrlib import initialize as bzrlib_initialize
+except ImportError:
+    import bzrlib.ui
+    def bzrlib_setup():
+        """Setup bzrlib ui for older bzr versions without bzrlib.initialize"""
+        bzrlib.ui.ui_factory = bzrlib.ui.make_ui_for_terminal(
+            sys.stdin, sys.stdout, sys.stderr)
+else:
+    import atexit
+    def bzrlib_setup():
+        """Call bzrlib.initialize and register cleanup to be run on exit"""
+        context = bzrlib_initialize()
+        if context is not None:
+            atexit.register(context.__enter__().__exit__, None, None, None)
+
 from bzrlib.email_message import EmailMessage
 from bzrlib.config import GlobalConfig
 from bzrlib import gpg
@@ -151,6 +167,7 @@
     parser.add_option('--nomail', help="Do not send email commands", action="store_true", default=False)
     parser.add_option('--queued', help="Examine already queued proposals", action="store_true", default=False)
     opts, args = parser.parse_args()
+    bzrlib_setup()
     launchpad = hydrazine.create_session()
     project = launchpad.projects[argv[1]]
     i = 0