Merge lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-storage-protocol/trunk into lp:ubuntu/lucid/ubuntuone-storage-protocol

[dobey]

[lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-storage-protocol/trunk]

14. By Luke Yelavich on 2010-03-31

* New upstream release.
* Added debian/source/format.
* Add Build-Depened on python-openssl (LP: #539809)

15. By Luke Yelavich on 2010-03-31

releasing version 1.1.90-0ubuntu1

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-03-04 16:16:33 +0000
+++ PKG-INFO	2010-03-31 23:47:26 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ubuntuone-storage-protocol
-Version: 1.1.3
+Version: 1.1.90
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-05 14:14:58 +0000
+++ debian/changelog	2010-03-31 23:47:26 +0000
@@ -1,3 +1,16 @@
+ubuntuone-storage-protocol (1.1.90-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Added debian/source/format.
+
+ -- Rodney Dawes <[e-mail]>  Wed, 31 Mar 2010 19:40:44 -0400
+
+ubuntuone-storage-protocol (1.1.3-0ubuntu2) lucid; urgency=low
+
+  * Add Build-Depened on python-openssl (LP: #539809)
+
+ -- Rodney Dawes <[e-mail]>  Tue, 16 Mar 2010 16:12:50 -0400
+
 ubuntuone-storage-protocol (1.1.3-0ubuntu1) lucid; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2010-03-04 16:27:48 +0000
+++ debian/control	2010-03-31 23:47:26 +0000
@@ -6,12 +6,13 @@
 XSBC-Original-Maintainer: Rick McBride <[e-mail]>
 Build-Depends: debhelper (>= 5), 
  cdbs,
- python-all-dev (>= 2.5)
-Build-Depends-Indep: protobuf-compiler (> 2.0.3-0ubuntu1),
+ python-all (>= 2.5)
+Build-Depends-Indep: protobuf-compiler (>> 2.0.3-0ubuntu1),
  python-central,
  python-twisted-core,
- python-oauth (>= 1.0~svn1092)
-Standards-Version: 3.8.3
+ python-oauth (>= 1.0~svn1092),
+ python-openssl
+Standards-Version: 3.8.4
 Homepage: https://one.ubuntu.com
 
 Package: python-ubuntuone-storageprotocol

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-03-31 23:47:26 +0000
@@ -0,0 +1,2 @@
+3.0 (quilt)
+

=== modified file 'setup.py'
--- setup.py	2010-03-04 16:16:33 +0000
+++ setup.py	2010-03-31 23:47:26 +0000
@@ -3,13 +3,13 @@
 #
 # Copyright 2009 Canonical Ltd.
 #
-# This program is free software: you can redistribute it and/or modify it 
+# This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
 # as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
@@ -33,6 +33,8 @@
 except ImportError:
     from contrib import check
 
+from ubuntuone.storageprotocol.context import ssl_cert_location
+
 class StorageProtocolBuild(build.build):
     """Class to build the protobuf files."""
 
@@ -45,7 +47,7 @@
             sys.stderr.write("*** Cannot find protoc; is the protobuf-compiler "
                              "package installed?\n")
             sys.exit(-1)
-        
+
         for source in glob.glob("ubuntuone/storageprotocol/*.proto"):
             protoc_command = protoc + " --python_out=. " + source
             if os.system(protoc_command) != 0:
@@ -119,16 +121,17 @@
 
 
 setup(name='ubuntuone-storage-protocol',
-      version='1.1.3',
+      version='1.1.90',
       packages=['ubuntuone',
                 'ubuntuone.storageprotocol'],
-     data_files=[('/etc/ssl/certs', 
-                ['data/UbuntuOne-Go_Daddy_CA.pem', 
+     data_files=[(ssl_cert_location,
+                ['data/UbuntuOne-Go_Daddy_CA.pem',
                  'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
 
       cmdclass = {
         'build' : StorageProtocolBuild,
         'clean' : StorageProtocolClean,
         'check' : StorageProtocolCheck
-        }
+        },
+      namespace_packages = ['ubuntuone'],
       )

=== modified file 'ubuntuone/__init__.py'
--- ubuntuone/__init__.py	2009-06-30 12:00:00 +0000
+++ ubuntuone/__init__.py	2010-03-31 23:47:26 +0000
@@ -2,15 +2,16 @@
 #
 # Copyright 2009 Canonical Ltd.
 #
-# This program is free software: you can redistribute it and/or modify it 
+# This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
 # as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """ubuntuone package"""
+__import__('pkg_resources').declare_namespace(__name__)

=== modified file 'ubuntuone/storageprotocol/client.py'
--- ubuntuone/storageprotocol/client.py	2010-03-04 16:16:33 +0000
+++ ubuntuone/storageprotocol/client.py	2010-03-31 23:47:26 +0000
@@ -164,8 +164,9 @@
             elif msg.type == protocol_pb2.Volumes.UDF:
                 vol = volumes.UDFVolume.from_msg(msg.udf)
             else:
-                raise TypeError("Message.volume_created's type is not valid: %s" %
-                                message.volume_created.type)
+                msg = "Message.volume_created's type is not valid: %s" % \
+                      message.volume_created.type
+                raise TypeError(msg)
 
             self._volume_created_callback(vol)
 
@@ -235,50 +236,50 @@
         p.start()
         return p.deferred
 
-    def get_content(self, share, node, hash, offset=0,
+    def get_content(self, share, node, a_hash, offset=0,
                     callback=None, node_attr_callback=None):
-        """Get the content of node with hash
+        """Get the content of node with 'a_hash'.
 
         the content will be on request.content
         or callback will be called for every piece that arrives.
 
         """
-        req = self.get_content_request(share, node, hash, offset,
+        req = self.get_content_request(share, node, a_hash, offset,
                                        callback, node_attr_callback)
         return req.deferred
 
-    def get_content_request(self, share, node, hash, offset=0,
+    def get_content_request(self, share, node, a_hash, offset=0,
                             callback=None, node_attr_callback=None):
-        """Get the content of node with hash, return the request.
+        """Get the content of node with 'a_hash', return the request.
 
         The content will be on request.content, or callback will be
         called for every piece that arrives.
 
         """
-        p = GetContent(self, share, node, hash, offset,
-                                        callback, node_attr_callback)
+        p = GetContent(self, share, node, a_hash, offset,
+                       callback, node_attr_callback)
         p.start()
         return p
 
-    def put_content(self, share, node, previous_hash, hash,
+    def put_content(self, share, node, previous_hash, new_hash,
                     crc32, size, deflated_size, fd):
         """Put the content of fd into file node."""
-        req = self.put_content_request(share, node, previous_hash,
-                                       hash, crc32, size, deflated_size, fd)
+        req = self.put_content_request(share, node, previous_hash, new_hash,
+                                       crc32, size, deflated_size, fd)
         return req.deferred
 
-    def put_content_request(self, share, node, previous_hash, hash,
+    def put_content_request(self, share, node, previous_hash, new_hash,
                             crc32, size, deflated_size, fd):
         """Put the content of fd into file node, return the request."""
-        p = PutContent(self, share, node, previous_hash, hash, crc32, size,
-                                                            deflated_size, fd)
+        p = PutContent(self, share, node, previous_hash, new_hash,
+                       crc32, size, deflated_size, fd)
         p.start()
         return p
 
     def query(self, items):
-        """Get the current hash for items if changed
+        """Get the current hash for items if changed.
 
-        items is a list of (node, hash) tuples.
+        'items' is a list of (node, hash) tuples.
 
         """
         r = MultiQuery(self, items)
@@ -510,14 +511,14 @@
 
     """
 
-    def __init__(self, protocol, share, node_id, hash,
+    def __init__(self, protocol, share, node_id, a_hash,
                  offset=0, callback=None, node_attr_callback=None):
-        """Request the content of node with hash.
+        """Request the content of node with 'a_hash'.
 
         @param protocol: the request handler
         @param share: the share node or root
         @param node_id: the node id of the node we want to read
-        @param hash: the hash of the content of the version we have
+        @param a_hash: the hash of the content of the version we have
         @param offset: offset for reading
         @param callback: function to call when data arrives
 
@@ -525,7 +526,7 @@
         request.Request.__init__(self, protocol)
         self.share = share
         self.node_id = node_id
-        self.hash = hash
+        self.hash = a_hash
         self.offset = offset
         self.callback = callback
         self.node_attr_callback = node_attr_callback
@@ -981,11 +982,11 @@
 
         def add_items(msg, *args):
             """Add items to query."""
-            for share, node, hash in args:
+            for share, node, content_hash in args:
                 qi = msg.query.add()
                 qi.share = share
                 qi.node = str(node)
-                qi.hash = hash
+                qi.hash = content_hash
 
         for item in items:
             add_items(qm, item)
@@ -1073,7 +1074,7 @@
     """Put content request."""
 
     def __init__(self, protocol, share, node_id,
-                 previous_hash, hash, crc32, size,
+                 previous_hash, new_hash, crc32, size,
                  deflated_size, fd):
         """Put content into a node.
 
@@ -1081,7 +1082,7 @@
         @param share: the share node or root
         @param node_id: the node to receive the content
         @param previous_hash: the hash the node has (for conflict checking)
-        @param hash: the hash hint for the new content
+        @param new_hash: the hash hint for the new content
         @param crc32: the crc32 hint for the new content
         @param size: the size hint for the new content
         @param fd: a file-like object to read data from
@@ -1091,7 +1092,7 @@
         self.share = share
         self.node_id = node_id
         self.previous_hash = previous_hash
-        self.hash = hash
+        self.hash = new_hash
         self.crc32 = crc32
         self.size = size
         self.deflated_size = deflated_size

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2009-07-16 16:30:00 +0000
+++ ubuntuone/storageprotocol/context.py	2010-03-31 23:47:26 +0000
@@ -2,34 +2,47 @@
 #
 # Copyright 2009 Canonical Ltd.
 #
-# This program is free software: you can redistribute it and/or modify it 
+# This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
 # as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""" 
+"""
 Standard Routines for working with ssl context creation
 """
+import os
+import sys
 
 from OpenSSL import SSL
 from twisted.internet import ssl
 
+if sys.platform == "win32":
+    from bzrlib import win32utils as win
+    ssl_cert_location = os.path.join(
+        win.get_appdata_location_unicode(),
+        "ubuntuone-storageprotocol")
+else:
+    ssl_cert_location = '/etc/ssl/certs'
+
+
 def get_ssl_context(no_verify):
     """ Get the ssl context """
     if no_verify:
         ctx = ssl.ClientContextFactory()
     else:
         ca_file = ssl.Certificate.loadPEM(file(
-            '/etc/ssl/certs/UbuntuOne-Go_Daddy_Class_2_CA.pem', 'r').read())
+            os.path.join(ssl_cert_location,
+                         'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
         ca_file_2 = ssl.Certificate.loadPEM(file(
-            '/etc/ssl/certs/UbuntuOne-Go_Daddy_CA.pem', 'r').read())
-        ctx = ssl.CertificateOptions(verify=True, 
+            os.path.join(ssl_cert_location,
+                        'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
+        ctx = ssl.CertificateOptions(verify=True,
             caCerts=[ca_file.original, ca_file_2.original],
                      method=SSL.SSLv23_METHOD)
     return ctx

=== modified file 'ubuntuone/storageprotocol/hash.py'
--- ubuntuone/storageprotocol/hash.py	2009-06-30 12:00:00 +0000
+++ ubuntuone/storageprotocol/hash.py	2010-03-31 23:47:26 +0000
@@ -1,35 +1,35 @@
-# ubuntuone.storageprotocol.hash - hash handling
+# ubuntuone.storageprotocol.hash - content hash handling
 #
 # Author: Lucio Torre <[e-mail]>
 #
 # Copyright 2009 Canonical Ltd.
 #
-# This program is free software: you can redistribute it and/or modify it 
+# This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
 # as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""" Hash Handling Stuffs
-"""
+"""Hash Handling Stuffs."""
+
+import copy
 import hashlib
-import copy
 import zlib
 
-# XXX:
-# lucio.torre
-# rename this module so it doesnt shadow builtin hash
+# XXX: (lucio.torre) Rename this module so it doesnt shadow builtin hash
+# see Bug #384153 for updates
 
 class ContentHash(object):
-    """ encapsulates the generation of content hashes
-
-    we cant subclass openssl hash classes, so we do some
-    composition to get similar methods
+    """Encapsulates the generation of content hashes.
+
+    We cant subclass openssl hash classes, so we do some
+    composition to get similar methods.
+
     """
     method = None
     method_name = ""
@@ -41,20 +41,20 @@
     update = property(lambda self: self.hash_object.update)
     digest = property(lambda self: self.hash_object.digest)
     hexdigest = property(lambda self: self.hash_object.hexdigest)
+
     def copy(self):
-        """ Copies generated hash
-        """
+        """Copies the generated hash."""
         cp = copy.copy(self)
         cp.hash_object = self.hash_object.copy()
         return cp
+
     def content_hash(self):
-        """ adds hex digest to content hash
-        """
+        """Adds hex digest to content hash."""
         return self.method_name +":"+ self.hash_object.hexdigest()
 
 class SHA1ContentHash(ContentHash):
-    """ Generates SHA1 of ConentHash?
-    """
+    """Generates SHA1 of ConentHash."""
+
     method = hashlib.sha1
     method_name = "sha1"
 
@@ -62,8 +62,10 @@
 content_hash_factory = SHA1ContentHash
 
 def crc32(data, previous_crc32=0):
-    """ a correct crc32 function
-
-    always returns positive values
+    """A correct crc32 function.
+
+    Always returns positive values.
+
     """
     return zlib.crc32(data, previous_crc32) & 0xFFFFFFFFL
+

=== modified file 'ubuntuone/storageprotocol/validators.py'
--- ubuntuone/storageprotocol/validators.py	2009-08-11 16:00:00 +0000
+++ ubuntuone/storageprotocol/validators.py	2010-03-31 23:47:26 +0000
@@ -33,19 +33,25 @@
 is_valid_share_id = is_valid_share
 
 def is_valid_sha1(sha1):
-    """
-    A valid sha1 hash says "sha1:", and then a 40 hex characters
+    """Validate 'sha1'.
+
+    A valid sha1 hash reads "sha1:", and then a 40 hex characters.
+
     """
     return bool(re.match(r'sha1:[0-9a-z]{40}$', sha1))
 
-def is_valid_hash(hash):
-    """
-    A valid hash is either the empty string, request.UNKNOWN_HASH, or
-    one of the other known hash types.
+def is_valid_hash(a_hash):
+    """Validate 'a_hash'.
+
+    A valid hash is either the empty string, request.UNKNOWN_HASH, or one of
+    the other known hash types.
+
     """
     # circular import
     from ubuntuone.storageprotocol import request
-    return hash == '' or hash == request.UNKNOWN_HASH or is_valid_sha1(hash)
+    is_valid = a_hash == '' or a_hash == request.UNKNOWN_HASH or \
+               is_valid_sha1(a_hash)
+    return is_valid
 
 def validate_message(message):
     """