Merge lp:~bialix/bzr/lp-bzr.exe into lp:~bzr/bzr/trunk-old

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

Better support for bzr.exe: `import webbrowser` should not be lazy.

[Robert Collins (lifeless)]

On Mon, 2009-07-06 at 13:05 +0000, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr/lp-bzr.exe into lp:bzr.
>
> Requested reviews:
> Jonathan Lange (jml)
> bzr-core (bzr-core)
>
> Better support for bzr.exe: `import webbrowser` should not be lazy.

This penalises every execution of bzr.

Is there some other way to make bzr.exe include the module?

[Andrew Bennetts (spiv)]

Robert Collins wrote:
> On Mon, 2009-07-06 at 13:05 +0000, Alexander Belchenko wrote:
> > Alexander Belchenko has proposed merging lp:~bialix/bzr/lp-bzr.exe into lp:bzr.
> >
> > Requested reviews:
> > Jonathan Lange (jml)
> > bzr-core (bzr-core)
> >
> > Better support for bzr.exe: `import webbrowser` should not be lazy.
>
> This penalises every execution of bzr.

Actually, it doesn't; it's only imported inside cmd_launchpad_open.run
immediately before it is used. So it's still lazy, it's just not using
lazy_import. So to be pedantic, it improves every execution of bzr, because it
creates one less lazy-proxy object ;)

It would be nice if whatever builds bzr.exe worked just fine with lazy_import,
but this patch seems ok to me.

 review approve

-Andrew.

review: Approve

[Robert Collins (lifeless)]

On Tue, 2009-07-07 at 02:45 +0000, Andrew Bennetts wrote:

> Actually, it doesn't; it's only imported inside cmd_launchpad_open.run
> immediately before it is used. So it's still lazy, it's just not using
> lazy_import. So to be pedantic, it improves every execution of bzr, because it
> creates one less lazy-proxy object ;)
>
> It would be nice if whatever builds bzr.exe worked just fine with lazy_import,
> but this patch seems ok to me.

good point, and agreed.

-Rob

[Alexander Belchenko (bialix)]

review: Approve

=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- bzrlib/plugins/launchpad/__init__.py	2009-07-03 08:57:53 +0000
+++ bzrlib/plugins/launchpad/__init__.py	2009-07-07 11:36:11 +0000
@@ -26,8 +26,6 @@
 
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
-import webbrowser
-
 from bzrlib import (
     branch as _mod_branch,
     trace,
@@ -196,6 +194,8 @@
         web_url = self._get_web_url(LaunchpadService(), location)
         trace.note('Opening %s in web browser' % web_url)
         if not dry_run:
+            import webbrowser   # this import should not be lazy
+                                # otherwise bzr.exe lacks this module
             webbrowser.open(web_url)
 
 register_command(cmd_launchpad_open)