Merge lp:~mikemc/ubuntuone-client/fix-1018125-darwin-no-gireactor into lp:ubuntuone-client

[Mike McCracken]

- Avoid importing gireactor and dbus on darwin as well as on win32. (LP: #1018125)

- Avoid importing gireactor and dbus on darwin as well as on win32. (LP: #1018125)

[lp:~mikemc/ubuntuone-client/fix-1018125-darwin-no-gireactor]

1272. By Mike McCracken on 2012-06-29

Make switch test for linux instead of against win and darwin.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

Any reason to not do "not in ['win32', 'darwin'] here instead? This change does break it for anyone who might be currently using it on FreeBSD or some other *nix for example, while doing the "not in []" would limit the number of potential platforms we have to test for in a better way I think.

review: Needs Information

[Mike McCracken (mikemc)]

> Any reason to not do "not in ['win32', 'darwin'] here instead? This change
> does break it for anyone who might be currently using it on FreeBSD or some
> other *nix for example, while doing the "not in []" would limit the number of
> potential platforms we have to test for in a better way I think.

Hmm, good point. I originally had it that way, but diego suggested that the == 'linux2' would be clearer, and I agreed.
I don't think either of us was thinking about a fourth linux-y platform.

[lp:~mikemc/ubuntuone-client/fix-1018125-darwin-no-gireactor]

1273. By Mike McCracken on 2012-07-02

Revert prev commit, test platform against win and darwin to be robust for other linuxes

[dobey (dobey)]

review: Approve

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2012-06-27 20:13:43 +0000
+++ bin/u1sdtool	2012-07-02 15:41:18 +0000
@@ -30,7 +30,7 @@
 
 import sys
 
-if sys.platform != 'win32':
+if sys.platform not in ('win32', 'darwin'):
     try:
         from twisted.internet import gireactor
         gireactor.install()

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2012-06-21 18:58:50 +0000
+++ bin/ubuntuone-syncdaemon	2012-07-02 15:41:18 +0000
@@ -30,7 +30,7 @@
 
 import sys
 
-if sys.platform != 'win32':
+if sys.platform not in ('win32', 'darwin'):
     try:
         from twisted.internet import gireactor
         gireactor.install()