Merge lp:~dobey/ubuntuone-storage-protocol/update-13-10 into lp:ubuntuone-storage-protocol/stable-13-10

[dobey]

[Brian Curtin]

    Remove get_cert_location because it is now implemented as get_cert_dir in ubuntu-sso-client.

[Rodney Dawes]

    Fix pep8 issues.

[Mike McCracken (mikemc)]

yup

review: Approve

[lp:~dobey/ubuntuone-storage-protocol/update-13-10]

159. By Brian Curtin on 2013-06-04

[Brian Curtin]

    Remove get_cert_location because it is now implemented as get_cert_dir in ubuntu-sso-client.

[Rodney Dawes]

    Fix pep8 issues.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-03-29 20:28:09 +0000
+++ MANIFEST.in	2013-06-04 15:08:36 +0000
@@ -4,6 +4,5 @@
 include run-tests
 include *.pth
 recursive-include ubuntuone *.proto
-recursive-include data *.pem
 recursive-include samples *.py
 recursive-include tests *.py

=== removed directory 'data'
=== removed file 'data/UbuntuOne-Go_Daddy_CA.pem'
--- data/UbuntuOne-Go_Daddy_CA.pem	2011-09-21 12:53:10 +0000
+++ data/UbuntuOne-Go_Daddy_CA.pem	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVMx
-ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMTYw
-MTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMH
-QXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5j
-b20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j
-b20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTtwY6vj3D3H
-KrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqVTr9vcyOdQm
-VZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aLGbqGmu75RpR
-SgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo7RJlbmr2EkRT
-cDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgWJCJjPOq8lh8BJ
-6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAwEAAaOCATIwggEu
-MB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVHSMEGDAWgBTSxLDS
-kdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEAMDMGCCsGAQUFBwEB
-BCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWRkeS5jb20wRgYDVR0f
-BD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBv
-c2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVHSAAMDgwNgYIKwYBBQUH
-AgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTAO
-BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBANKGwOy9+aG2Z+5mC6IG
-OgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPIUyIXvJxwqoJKSQ3kbTJSMU
-A2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL5CkKSkB2XIsKd83ASe8T+5o
-0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9p0iRFEUOOjZv2kWzRaJBydTX
-RE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsxuxN89txJx9OjxUUAiKEngHUuH
-qDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZEjYx8WnM25sgVjOuH0aBsXBTWV
-U+4=
------END CERTIFICATE-----

=== removed file 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'
--- data/UbuntuOne-Go_Daddy_Class_2_CA.pem	2009-06-23 19:38:42 +0000
+++ data/UbuntuOne-Go_Daddy_Class_2_CA.pem	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJV
-UzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQL
-EyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMx
-ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMo
-R28gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAw
-DQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d
-/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9
-S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32qRe3H3I2
-TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVl
-OARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFA
-pMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44
-dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLEsNKR1EwRcbNh
-yz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2oatTj
-oWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdy
-b3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYX
-MP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheab
-IZ0KbIIOqPjCDPoQHmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzr
-Tia2cyvk0/ZM/iZx4mERdEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBD
-pqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----

=== removed file 'data/UbuntuOne-ValiCert_Class_2_VA.pem'
--- data/UbuntuOne-ValiCert_Class_2_VA.pem	2012-08-15 21:53:43 +0000
+++ data/UbuntuOne-ValiCert_Class_2_VA.pem	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
-NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
-dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
-WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
-v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
-UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
-IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
-W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
------END CERTIFICATE-----

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-08-15 18:08:39 +0000
+++ run-tests.bat	2013-06-04 15:08:36 +0000
@@ -18,7 +18,7 @@
 SET PYTHONEXEPATH=""
 SET IGNORE_PATHS="ubuntuone\controlpanel\dbustests"
 SET IGNORE_MODULES="test_linux.py, test_darwin.py"
-SET PYTHONPATH=%PYTHONPATH%;..\ubuntuone-dev-tools\;..\dirspec;.
+SET PYTHONPATH=%PYTHONPATH%;..\ubuntu-sso-client;..\ubuntuone-dev-tools\;..\dirspec;.
 
 ECHO Checking for Python on the path
 :: Look for Python from buildout

=== modified file 'setup.py'
--- setup.py	2012-12-03 19:45:43 +0000
+++ setup.py	2013-06-04 15:08:36 +0000
@@ -26,7 +26,6 @@
 from distutils.core import setup
 from distutils.spawn import find_executable
 from distutils.command import clean, build
-from ubuntuone.storageprotocol.context import get_cert_location
 
 
 class StorageProtocolBuild(build.build):
@@ -74,11 +73,6 @@
       packages=['ubuntuone',
                 'ubuntuone.storageprotocol'],
       extra_path='ubuntuone-storage-protocol',
-      data_files=[(get_cert_location(),
-                   ['data/UbuntuOne-Go_Daddy_CA.pem',
-                    'data/UbuntuOne-ValiCert_Class_2_VA.pem',
-                    'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
-
       cmdclass={'build': StorageProtocolBuild,
                 'clean': StorageProtocolClean},
       )

=== modified file 'tests/test_context.py'
--- tests/test_context.py	2012-12-03 19:45:43 +0000
+++ tests/test_context.py	2013-06-04 15:08:36 +0000
@@ -28,7 +28,6 @@
 # files in the program, then also delete it here.
 
 import os
-import sys
 
 from OpenSSL import crypto, SSL
 from twisted.internet import defer, error, reactor, ssl
@@ -36,6 +35,7 @@
 from twisted.web import client, resource, server
 
 from ubuntuone.storageprotocol import context
+from ubuntu_sso.utils import get_cert_dir
 
 
 class FakeCerts(object):
@@ -125,7 +125,8 @@
     def get_certificates(self):
         """Get the uninstalled certificates, for testing."""
         certs = []
-        data_dir = os.path.join(os.path.dirname(__file__), os.pardir, 'data')
+        data_dir = get_cert_dir()
+
         for certname in ['UbuntuOne-Go_Daddy_Class_2_CA.pem',
                          'UbuntuOne-Go_Daddy_CA.pem']:
             cert_path = os.path.abspath(os.path.join(data_dir, certname))
@@ -198,46 +199,3 @@
                                                  hostname="localhost")
 
         yield self.verify_context(server_context, client_context)
-
-
-class SSLCertLocationTestCase(unittest.TestCase):
-    """Test determining the cert location."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(SSLCertLocationTestCase, self).setUp()
-
-    def test_win(self):
-        """Test geting a path when Common AppData is defined."""
-        self.patch(context, "load_config_paths",
-                   lambda x: [os.path.join("returned-value", x)])
-        self.patch(sys, "platform", "win32")
-        path = context.get_cert_location()
-        self.assertEqual(path, os.path.join("returned-value",
-                                            "ubuntuone-storageprotocol"))
-
-    def test_darwin_frozen(self):
-        """Test that we get a path with .app in it on frozen darwin."""
-        self.patch(sys, "platform", "darwin")
-        sys.frozen = "macosx-app"
-        self.addCleanup(delattr, sys, "frozen")
-        self.patch(context, "__file__",
-                   os.path.join("path", "to", "Main.app", "ignore"))
-        path = context.get_cert_location()
-        self.assertEqual(path, os.path.join("path", "to", "Main.app",
-                                            "Contents", "Resources"))
-
-    def test_darwin_unfrozen(self):
-        """Test that we get a source-relative path on unfrozen darwin."""
-        self.patch(sys, "platform", "darwin")
-        self.patch(context, "__file__",
-                   os.path.join("path", "to", "ubuntuone",
-                                "storageprotocol", "context.py"))
-        path = context.get_cert_location()
-        self.assertEqual(path, os.path.join("path", "to", "data"))
-
-    def test_linux(self):
-        """Test that linux gets the right path."""
-        self.patch(sys, "platform", "linux2")
-        path = context.get_cert_location()
-        self.assertEqual(path, "/etc/ssl/certs")

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2012-08-16 19:21:06 +0000
+++ ubuntuone/storageprotocol/context.py	2013-06-04 15:08:36 +0000
@@ -30,38 +30,12 @@
 Standard Routines for working with ssl context creation
 """
 import os
-import sys
 
 from OpenSSL import SSL
 from twisted.internet import error, ssl
 from twisted.python import log
 
-from dirspec.basedir import load_config_paths
-
-
-def get_cert_location():
-    """Return path to certificate files."""
-
-    if sys.platform == "win32":
-        ssl_cert_location = list(load_config_paths(
-                "ubuntuone-storageprotocol"))[0]
-
-    elif sys.platform == "darwin":
-        if getattr(sys, "frozen", None) is not None:
-            main_app_dir = "".join(__file__.partition(".app")[:-1])
-            main_app_resources_dir = os.path.join(main_app_dir,
-                                                  "Contents",
-                                                  "Resources")
-            ssl_cert_location = main_app_resources_dir
-        else:
-            pkg_dir = os.path.dirname(__file__)
-            src_tree_path = os.path.dirname(os.path.dirname(pkg_dir))
-            ssl_cert_location = os.path.join(src_tree_path,
-                                             "data")
-    else:
-        ssl_cert_location = '/etc/ssl/certs'
-
-    return ssl_cert_location
+from ubuntu_sso.utils import get_cert_dir
 
 
 class HostnameVerifyContextFactory(ssl.CertificateOptions):
@@ -93,7 +67,7 @@
 
 def get_certificates():
     """Get a list of certificate paths."""
-    ssl_cert_location = get_cert_location()
+    ssl_cert_location = get_cert_dir()
     ca_file = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
                      'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
     ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,

=== modified file 'ubuntuone/storageprotocol/dircontent.py'
--- ubuntuone/storageprotocol/dircontent.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/dircontent.py	2013-06-04 15:08:36 +0000
@@ -161,8 +161,8 @@
     def __eq__(self, other):
         if isinstance(other, DirEntry):
             return self.name == other.name and \
-                   self.utf8_name == other.utf8_name and \
-                   self.node_type == other.node_type and \
-                   self.uuid == other.uuid
+                self.utf8_name == other.utf8_name and \
+                self.node_type == other.node_type and \
+                self.uuid == other.uuid
         else:
             return False

=== modified file 'ubuntuone/storageprotocol/request.py'
--- ubuntuone/storageprotocol/request.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/request.py	2013-06-04 15:08:36 +0000
@@ -233,8 +233,8 @@
                     self.requests[message.id].error(e)
             else:
                 name = protocol_pb2.Message.DESCRIPTOR \
-                     .enum_types_by_name['MessageType'] \
-                     .values_by_number[message.type].name
+                    .enum_types_by_name['MessageType'] \
+                    .values_by_number[message.type].name
 
                 handler = getattr(self, "handle_" + name, None)
                 if handler is not None: