Merge lp:~mikemc/ubuntuone-client/darwin-platform-platform into lp:ubuntuone-client

[Mike McCracken]

- Send 'darwin' to server as platform name in auth. (LP: #1037435)

- Send 'darwin' to server as platform name in auth. (LP: #1037435)

per verterok on irc, I can make this string whatever I want and the server metrics will do the right thing:

mmcc: verterok: okay, great. just wanted to check that I won't break anything on that end that expects only those two strings
mmcc: I'll make it send 'darwin'.
verterok: mmcc: we don't use sys.platform because of the linux/linux2 difference
verterok: mmcc: yes, it shouldn't break anything
verterok: mmcc: the only code that uses that info is this: https://pastebin.canonical.com/75285/

To test on darwin, run-mac-tests on tests/platform. the rest of the whole test suite is still kind of broken.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2012-08-06 19:18:57 +0000
+++ ubuntuone/platform/__init__.py	2012-09-25 22:57:25 +0000
@@ -33,11 +33,12 @@
 
 from dirspec.utils import user_home
 
-# very hackish way to avoid "import *" to satisfy pyflakes
-# and to avoid import ubuntuone.platform.X as source (it wont work)
-
+# define a platform string separate from sys.platform to be sent to
+# the server for metrics in ActionQueue.authenticate().
 if sys.platform == "win32":
     platform = "win32"
+elif sys.platform == "darwin":
+    platform = "darwin"
 else:
     platform = "linux"