Merge lp:~bialix/bzr/2.3-py2exe into lp:bzr/2.3

[Alexander Belchenko]

bzr.exe: add "site-packages" directory to sys.path to allow "installing" third-party libs required by some plugins

bzr.exe: add "site-packages" directory to sys.path to allow "installing" third-party libs required by some plugins

[Alexander Belchenko (bialix)]

This is backport of the patch https://code.launchpad.net/~bialix/bzr/py2exe/+merge/54999

[Gary van der Merwe (garyvdm)]

review: Approve

[Alexander Belchenko (bialix)]

@Martin Pool: please land this one too. This is backport of the patch https://code.launchpad.net/~bialix/bzr/py2exe/+merge/54999 to 2.3 series. Thank you.

[Andrew Bennetts (spiv)]

I'm inclined to say we should land this. Although it could be argued to be adding a feature to a stable series, I think it's probably just as fair to argue that it's a bug that it's impossible to install plugins with the py2exe build, and this patch corrects that bug.

[Andrew Bennetts (spiv)]

Ok, Martin agrees. I'll land it.

[Andrew Bennetts (spiv)]

review: Approve

[Andrew Bennetts (spiv)]

sent to pqm by email

[Alexander Belchenko (bialix)]

Andrew Bennetts пишет:
> Ok, Martin agrees. I'll land it.
Thank you.

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2011-03-23 11:07:49 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-03-28 08:46:28 +0000
@@ -48,6 +48,11 @@
   had changed.  Bazaar was attempting to open and lock the master branch
   twice in this case.  (Andrew Bennetts, #733350)
 
+* Standalone bzr.exe installation on Windows: user can put additional python 
+  libraries into ``site-packages`` subdirectory of the installation directory,
+  this might be required for "installing" extra dependencies for some plugins.
+  (Alexander Belchenko, #743256)
+
 Documentation
 *************
 

=== modified file 'tools/win32/py2exe_boot_common.py'
--- tools/win32/py2exe_boot_common.py	2010-08-02 16:12:01 +0000
+++ tools/win32/py2exe_boot_common.py	2011-03-28 08:46:28 +0000
@@ -8,7 +8,6 @@
 
 import sys
 if sys.frozen == "windows_exe":
-
     class Blackhole(object):
         softspace = 0
         def write(self, text):
@@ -18,6 +17,12 @@
     sys.stdout = Blackhole()
     sys.stderr = Blackhole()
     del Blackhole
+
+# add more directories to sys.path to allow "installing" third-party libs
+# required by some plugins (see bug #743256)
+import os
+sys.path.append(os.path.join(os.path.dirname(sys.executable), 'site-packages'))
+del os
 del sys
 
 # Disable linecache.getline() which is called by