Merge lp:~mikemc/ubuntuone-storage-protocol/darwin-certs into lp:ubuntuone-storage-protocol

[Mike McCracken]

- Use XDG_DATA_HOME to store SSL certs on darwin. (LP: #1025950)

- Use XDG_DATA_HOME to store SSL certs on darwin. (LP: #1025950)

This is similar in spirit to the windows solution, but uses dirspec instead of registry entries.

There don't appear to be relevant tests, but I have verified that this works in the packaged app.

[dobey (dobey)]

We shouldn't be using the _HOME variables for this, and you can just import "xdg_data_home" for example, if you need to use that variable.

review: Disapprove

Unmerged revisions

152. By Mike McCracken on 2012-07-18

Use dirspec get_xdg_data_home to find path to certificates on darwin

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2012-06-12 16:32:06 +0000
+++ ubuntuone/storageprotocol/context.py	2012-07-18 18:03:37 +0000
@@ -36,6 +36,8 @@
 from twisted.internet import error, ssl
 from twisted.python import log
 
+from dirspec.basedir import get_xdg_data_home
+
 if sys.platform == "win32":
     # diable pylint warning, as it may be the wrong platform
     # pylint: disable=F0401
@@ -55,6 +57,8 @@
             ssl_cert_location = os.path.join(value,
                                              "ubuntuone-storageprotocol")
             break
+elif sys.platform == "darwin":
+    ssl_cert_location = get_xdg_data_home()
 else:
     ssl_cert_location = '/etc/ssl/certs'