Merge lp:~dobey/ubuntuone-client/subprocess-env into lp:ubuntuone-client

[dobey]

Pass os.environ to all the subprocesses and throw them in separate threads

[Vincenzo Di Somma (vds)]

review: Approve

[Joshua Blount (jblount)]

Two thumbs, way up!

review: Approve

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-10-22 14:21:27 +0000
+++ bin/ubuntuone-client-applet	2009-10-22 19:20:40 +0000
@@ -41,7 +41,7 @@
 from dbus.mainloop.glib import DBusGMainLoop
 from ubuntuone.oauthdesktop.main import Login
 from xdg.BaseDirectory import xdg_config_home
-from threading import Lock
+from threading import Lock, Thread
 from urllib import quote
 
 from ubuntuone.oauthdesktop.logger import setupLogging
@@ -393,7 +393,7 @@
 
 
 
-def do_config_open():
+def do_config_open_real():
       """Opens the preferences dialog."""
       paths = os.environ["PATH"].split(":")
       dirpath = os.path.join(os.getcwd(), "bin")
@@ -401,18 +401,28 @@
             paths.insert(0, dirpath)
       os.environ["PATH"] = ":".join(paths)
       try:
-            ret = subprocess.call(["ubuntuone-client-preferences"])
+            ret = subprocess.call(["ubuntuone-client-preferences"],
+                                  env=os.environ)
       except OSError:
             ret = -1
       if ret != 0:
             logger.error(_("Failed to open Ubuntu One preferences"))
 
-def do_xdg_open(path_or_url):
+def do_config_open():
+      """Do the preferences opening in a thread."""
+      Thread(target=do_config_open_real, name="preferences").start()
+
+def do_xdg_open_real(path_or_url):
       """Utility method to run xdg-open with path_or_url."""
-      ret = subprocess.call(["xdg-open", path_or_url])
+      ret = subprocess.call(["xdg-open", path_or_url], env=os.environ)
       if ret != 0:
             logger.error(_("Failed to run 'xdg-open %s'") % path_or_url)
 
+def do_xdg_open(path_or_url):
+      """Do the xdg-open in a thread."""
+      Thread(target=do_xdg_open_real, name="xdg", args=(path_or_url,)).start()
+
+
 class AppletIcon(gtk.StatusIcon):
       """
       Custom StatusIcon derived from gtk.StatusIcon which supports
@@ -955,13 +965,17 @@
             # Popup the status menu
             self.emit("popup-menu", 0, gtk.get_current_event_time())
 
-      def __report_problem(self, data=None):
+      def __report_problem_real(self):
             """Runs apport to report a problem against our code."""
             args = ["ubuntu-bug", "ubuntuone-client"]
-            ret = subprocess.call(args)
+            ret = subprocess.call(args, env=os.environ)
             if ret != 0:
                   logger.error(_("Failed to run 'ubuntu-bug'"))
 
+      def __report_problem(self, data=None):
+            """Pops another thread to run apport in."""
+            Thread(target=self.__report_problem_real, name="apport").start()
+
       def __open_website(self, data=None, url=None):
             """Opens the one.ubuntu.com web site."""
             if url:

=== modified file 'ubuntuone/oauthdesktop/auth.py'
--- ubuntuone/oauthdesktop/auth.py	2009-10-21 20:51:47 +0000
+++ ubuntuone/oauthdesktop/auth.py	2009-10-22 19:20:40 +0000
@@ -38,6 +38,7 @@
     ubuntuone_client_version = "Unknown"
 from ubuntuone.oauthdesktop.key_acls import set_all_key_acls
 
+from threading import Thread
 from twisted.internet import reactor
 from twisted.web import server, resource
 
@@ -356,7 +357,8 @@
         nodename = os.uname()[1]
         if nodename:
             oauth_request.set_parameter("description", nodename)
-        self.open_in_browser(oauth_request.to_url())
+        Thread(target=self.open_in_browser, name="authorization",
+               args=(oauth_request.to_url(),)).start()
 
     def get_temporary_httpd(self, nonce, retrieve_function, store):
         "A separate class so it can be mocked in testing"