Merge lp:~nataliabidart/ubuntuone-storage-protocol/stable-3-0-update-2.99.92 into lp:ubuntuone-storage-protocol/stable-3-0
- stable-3-0-update-2.99.92
- Merge into stable-3-0
Proposed by
Natalia Bidart
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 155 |
Merged at revision: | 154 |
Proposed branch: | lp:~nataliabidart/ubuntuone-storage-protocol/stable-3-0-update-2.99.92 |
Merge into: | lp:ubuntuone-storage-protocol/stable-3-0 |
Diff against target: |
1239 lines (+628/-36) 35 files modified
LICENSE (+28/-0) LICENSE.OpenSSL (+137/-0) MANIFEST.in (+1/-0) samples/easy_client.py (+14/-1) samples/ping_client.py (+14/-1) tests/__init__.py (+14/-1) tests/test_bytesproducer.py (+14/-1) tests/test_client.py (+14/-1) tests/test_delta_info.py (+14/-1) tests/test_dircontent.py (+14/-1) tests/test_errors.py (+14/-1) tests/test_hashes.py (+14/-2) tests/test_proxy_tunnel.py (+14/-1) tests/test_putcontent.py (+14/-1) tests/test_query.py (+14/-1) tests/test_request.py (+14/-1) tests/test_sharersp.py (+14/-1) tests/test_throttling.py (+14/-1) tests/test_volumes.py (+14/-1) ubuntuone/__init__.py (+14/-1) ubuntuone/storageprotocol/__init__.py (+14/-1) ubuntuone/storageprotocol/client.py (+14/-1) ubuntuone/storageprotocol/content_hash.py (+14/-2) ubuntuone/storageprotocol/context.py (+14/-1) ubuntuone/storageprotocol/delta.py (+14/-1) ubuntuone/storageprotocol/dircontent.proto (+14/-1) ubuntuone/storageprotocol/dircontent.py (+14/-1) ubuntuone/storageprotocol/errors.py (+14/-1) ubuntuone/storageprotocol/protocol.proto (+14/-1) ubuntuone/storageprotocol/proxy_tunnel.py (+14/-1) ubuntuone/storageprotocol/request.py (+14/-1) ubuntuone/storageprotocol/sharersp.py (+14/-1) ubuntuone/storageprotocol/utils.py (+14/-1) ubuntuone/storageprotocol/validators.py (+28/-3) ubuntuone/storageprotocol/volumes.py (+14/-1) |
To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-storage-protocol/stable-3-0-update-2.99.92 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alejandro J. Cura (community) | Approve | ||
Review via email: mp+100590@code.launchpad.net |
Commit message
- Updating from trunk up to revno 145:
[ Rodney Dawes <email address hidden> ]
- License exception for use of OpenSSL (LP: #968555).
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'LICENSE' | |||
2 | --- LICENSE 1970-01-01 00:00:00 +0000 | |||
3 | +++ LICENSE 2012-04-03 12:15:42 +0000 | |||
4 | @@ -0,0 +1,28 @@ | |||
5 | 1 | # This is the Ubuntu One storage protocol for file synchronization | ||
6 | 2 | # | ||
7 | 3 | # Copyright (C) 2009-2012 Canonical Ltd. | ||
8 | 4 | # | ||
9 | 5 | # This program is free software: you can redistribute it and/or modify it | ||
10 | 6 | # under the terms of the GNU Affero General Public License version 3, | ||
11 | 7 | # as published by the Free Software Foundation. | ||
12 | 8 | # | ||
13 | 9 | # This program is distributed in the hope that it will be useful, but | ||
14 | 10 | # WITHOUT ANY WARRANTY; without even the implied warranties of | ||
15 | 11 | # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
16 | 12 | # PURPOSE. See the GNU Affero General Public License for more details. | ||
17 | 13 | # | ||
18 | 14 | # You should have received a copy of the GNU Affero General Public License | ||
19 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
20 | 16 | # | ||
21 | 17 | # In addition, as a special exception, the copyright holders give | ||
22 | 18 | # permission to link the code of portions of this program with the | ||
23 | 19 | # OpenSSL library under certain conditions as described in each | ||
24 | 20 | # individual source file, and distribute linked combinations | ||
25 | 21 | # including the two. | ||
26 | 22 | # You must obey the GNU General Public License in all respects | ||
27 | 23 | # for all of the code used other than OpenSSL. If you modify | ||
28 | 24 | # file(s) with this exception, you may extend this exception to your | ||
29 | 25 | # version of the file(s), but you are not obligated to do so. If you | ||
30 | 26 | # do not wish to do so, delete this exception statement from your | ||
31 | 27 | # version. If you delete this exception statement from all source | ||
32 | 28 | # files in the program, then also delete it here. | ||
33 | 0 | 29 | ||
34 | === added file 'LICENSE.OpenSSL' | |||
35 | --- LICENSE.OpenSSL 1970-01-01 00:00:00 +0000 | |||
36 | +++ LICENSE.OpenSSL 2012-04-03 12:15:42 +0000 | |||
37 | @@ -0,0 +1,137 @@ | |||
38 | 1 | Certain source files in this program permit linking with the OpenSSL | ||
39 | 2 | library (http://www.openssl.org), which otherwise wouldn't be allowed | ||
40 | 3 | under the (A)GPL. For purposes of identifying OpenSSL, most source files | ||
41 | 4 | giving this permission limit it to versions of OpenSSL having a license | ||
42 | 5 | identical to that listed in this file (LICENSE.OpenSSL). It is not | ||
43 | 6 | necessary for the copyright years to match between this file and the | ||
44 | 7 | OpenSSL version in question. However, note that because this file is | ||
45 | 8 | an extension of the license statements of these source files, this file | ||
46 | 9 | may not be changed except with permission from all copyright holders | ||
47 | 10 | of source files in this program which reference this file. | ||
48 | 11 | |||
49 | 12 | LICENSE ISSUES | ||
50 | 13 | ============== | ||
51 | 14 | |||
52 | 15 | The OpenSSL toolkit stays under a dual license, i.e. both the conditions of | ||
53 | 16 | the OpenSSL License and the original SSLeay license apply to the toolkit. | ||
54 | 17 | See below for the actual license texts. Actually both licenses are BSD-style | ||
55 | 18 | Open Source licenses. In case of any license issues related to OpenSSL | ||
56 | 19 | please contact openssl-core@openssl.org. | ||
57 | 20 | |||
58 | 21 | OpenSSL License | ||
59 | 22 | --------------- | ||
60 | 23 | |||
61 | 24 | /* ==================================================================== | ||
62 | 25 | * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. | ||
63 | 26 | * | ||
64 | 27 | * Redistribution and use in source and binary forms, with or without | ||
65 | 28 | * modification, are permitted provided that the following conditions | ||
66 | 29 | * are met: | ||
67 | 30 | * | ||
68 | 31 | * 1. Redistributions of source code must retain the above copyright | ||
69 | 32 | * notice, this list of conditions and the following disclaimer. | ||
70 | 33 | * | ||
71 | 34 | * 2. Redistributions in binary form must reproduce the above copyright | ||
72 | 35 | * notice, this list of conditions and the following disclaimer in | ||
73 | 36 | * the documentation and/or other materials provided with the | ||
74 | 37 | * distribution. | ||
75 | 38 | * | ||
76 | 39 | * 3. All advertising materials mentioning features or use of this | ||
77 | 40 | * software must display the following acknowledgment: | ||
78 | 41 | * "This product includes software developed by the OpenSSL Project | ||
79 | 42 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
80 | 43 | * | ||
81 | 44 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
82 | 45 | * endorse or promote products derived from this software without | ||
83 | 46 | * prior written permission. For written permission, please contact | ||
84 | 47 | * openssl-core@openssl.org. | ||
85 | 48 | * | ||
86 | 49 | * 5. Products derived from this software may not be called "OpenSSL" | ||
87 | 50 | * nor may "OpenSSL" appear in their names without prior written | ||
88 | 51 | * permission of the OpenSSL Project. | ||
89 | 52 | * | ||
90 | 53 | * 6. Redistributions of any form whatsoever must retain the following | ||
91 | 54 | * acknowledgment: | ||
92 | 55 | * "This product includes software developed by the OpenSSL Project | ||
93 | 56 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
94 | 57 | * | ||
95 | 58 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
96 | 59 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
97 | 60 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
98 | 61 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
99 | 62 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
100 | 63 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
101 | 64 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
102 | 65 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
103 | 66 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
104 | 67 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
105 | 68 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
106 | 69 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
107 | 70 | * ==================================================================== | ||
108 | 71 | * | ||
109 | 72 | * This product includes cryptographic software written by Eric Young | ||
110 | 73 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
111 | 74 | * Hudson (tjh@cryptsoft.com). | ||
112 | 75 | * | ||
113 | 76 | */ | ||
114 | 77 | |||
115 | 78 | Original SSLeay License | ||
116 | 79 | ----------------------- | ||
117 | 80 | |||
118 | 81 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
119 | 82 | * All rights reserved. | ||
120 | 83 | * | ||
121 | 84 | * This package is an SSL implementation written | ||
122 | 85 | * by Eric Young (eay@cryptsoft.com). | ||
123 | 86 | * The implementation was written so as to conform with Netscapes SSL. | ||
124 | 87 | * | ||
125 | 88 | * This library is free for commercial and non-commercial use as long as | ||
126 | 89 | * the following conditions are aheared to. The following conditions | ||
127 | 90 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
128 | 91 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
129 | 92 | * included with this distribution is covered by the same copyright terms | ||
130 | 93 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
131 | 94 | * | ||
132 | 95 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
133 | 96 | * the code are not to be removed. | ||
134 | 97 | * If this package is used in a product, Eric Young should be given attribution | ||
135 | 98 | * as the author of the parts of the library used. | ||
136 | 99 | * This can be in the form of a textual message at program startup or | ||
137 | 100 | * in documentation (online or textual) provided with the package. | ||
138 | 101 | * | ||
139 | 102 | * Redistribution and use in source and binary forms, with or without | ||
140 | 103 | * modification, are permitted provided that the following conditions | ||
141 | 104 | * are met: | ||
142 | 105 | * 1. Redistributions of source code must retain the copyright | ||
143 | 106 | * notice, this list of conditions and the following disclaimer. | ||
144 | 107 | * 2. Redistributions in binary form must reproduce the above copyright | ||
145 | 108 | * notice, this list of conditions and the following disclaimer in the | ||
146 | 109 | * documentation and/or other materials provided with the distribution. | ||
147 | 110 | * 3. All advertising materials mentioning features or use of this software | ||
148 | 111 | * must display the following acknowledgement: | ||
149 | 112 | * "This product includes cryptographic software written by | ||
150 | 113 | * Eric Young (eay@cryptsoft.com)" | ||
151 | 114 | * The word 'cryptographic' can be left out if the rouines from the library | ||
152 | 115 | * being used are not cryptographic related :-). | ||
153 | 116 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
154 | 117 | * the apps directory (application code) you must include an acknowledgement: | ||
155 | 118 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
156 | 119 | * | ||
157 | 120 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
158 | 121 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
159 | 122 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
160 | 123 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
161 | 124 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
162 | 125 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
163 | 126 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
164 | 127 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
165 | 128 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
166 | 129 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
167 | 130 | * SUCH DAMAGE. | ||
168 | 131 | * | ||
169 | 132 | * The licence and distribution terms for any publically available version or | ||
170 | 133 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
171 | 134 | * copied and put under another distribution licence | ||
172 | 135 | * [including the GNU Public Licence.] | ||
173 | 136 | */ | ||
174 | 137 | |||
175 | 0 | 138 | ||
176 | === modified file 'MANIFEST.in' | |||
177 | --- MANIFEST.in 2011-02-07 22:57:54 +0000 | |||
178 | +++ MANIFEST.in 2012-04-03 12:15:42 +0000 | |||
179 | @@ -1,5 +1,6 @@ | |||
180 | 1 | include MANIFEST.in | 1 | include MANIFEST.in |
181 | 2 | include COPYING HACKING README README.windows | 2 | include COPYING HACKING README README.windows |
182 | 3 | include LICENSE LICENSE.OpenSSL | ||
183 | 3 | include run-tests | 4 | include run-tests |
184 | 4 | include *.pth | 5 | include *.pth |
185 | 5 | recursive-include ubuntuone *.proto | 6 | recursive-include ubuntuone *.proto |
186 | 6 | 7 | ||
187 | === modified file 'samples/easy_client.py' | |||
188 | --- samples/easy_client.py 2010-11-05 18:05:46 +0000 | |||
189 | +++ samples/easy_client.py 2012-04-03 12:15:42 +0000 | |||
190 | @@ -2,7 +2,7 @@ | |||
191 | 2 | # | 2 | # |
192 | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> |
193 | 4 | # | 4 | # |
195 | 5 | # Copyright 2009 Canonical Ltd. | 5 | # Copyright 2009-2012 Canonical Ltd. |
196 | 6 | # | 6 | # |
197 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
198 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
199 | @@ -15,6 +15,19 @@ | |||
200 | 15 | # | 15 | # |
201 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
202 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
203 | 18 | # | ||
204 | 19 | # In addition, as a special exception, the copyright holders give | ||
205 | 20 | # permission to link the code of portions of this program with the | ||
206 | 21 | # OpenSSL library under certain conditions as described in each | ||
207 | 22 | # individual source file, and distribute linked combinations | ||
208 | 23 | # including the two. | ||
209 | 24 | # You must obey the GNU General Public License in all respects | ||
210 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
211 | 26 | # file(s) with this exception, you may extend this exception to your | ||
212 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
213 | 28 | # do not wish to do so, delete this exception statement from your | ||
214 | 29 | # version. If you delete this exception statement from all source | ||
215 | 30 | # files in the program, then also delete it here. | ||
216 | 18 | """A simple client with some tests | 31 | """A simple client with some tests |
217 | 19 | """ | 32 | """ |
218 | 20 | import os | 33 | import os |
219 | 21 | 34 | ||
220 | === modified file 'samples/ping_client.py' | |||
221 | --- samples/ping_client.py 2010-11-04 14:18:06 +0000 | |||
222 | +++ samples/ping_client.py 2012-04-03 12:15:42 +0000 | |||
223 | @@ -2,7 +2,7 @@ | |||
224 | 2 | # | 2 | # |
225 | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> |
226 | 4 | # | 4 | # |
228 | 5 | # Copyright 2009 Canonical Ltd. | 5 | # Copyright 2009-2012 Canonical Ltd. |
229 | 6 | # | 6 | # |
230 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
231 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
232 | @@ -15,6 +15,19 @@ | |||
233 | 15 | # | 15 | # |
234 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
235 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
236 | 18 | # | ||
237 | 19 | # In addition, as a special exception, the copyright holders give | ||
238 | 20 | # permission to link the code of portions of this program with the | ||
239 | 21 | # OpenSSL library under certain conditions as described in each | ||
240 | 22 | # individual source file, and distribute linked combinations | ||
241 | 23 | # including the two. | ||
242 | 24 | # You must obey the GNU General Public License in all respects | ||
243 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
244 | 26 | # file(s) with this exception, you may extend this exception to your | ||
245 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
246 | 28 | # do not wish to do so, delete this exception statement from your | ||
247 | 29 | # version. If you delete this exception statement from all source | ||
248 | 30 | # files in the program, then also delete it here. | ||
249 | 18 | """A simple ping client | 31 | """A simple ping client |
250 | 19 | """ | 32 | """ |
251 | 20 | 33 | ||
252 | 21 | 34 | ||
253 | === modified file 'tests/__init__.py' | |||
254 | --- tests/__init__.py 2010-11-04 14:18:06 +0000 | |||
255 | +++ tests/__init__.py 2012-04-03 12:15:42 +0000 | |||
256 | @@ -1,6 +1,6 @@ | |||
257 | 1 | # __init__.py | 1 | # __init__.py |
258 | 2 | # | 2 | # |
260 | 3 | # Copyright 2009 Canonical Ltd. | 3 | # Copyright 2009-2012 Canonical Ltd. |
261 | 4 | # | 4 | # |
262 | 5 | # This program is free software: you can redistribute it and/or modify it | 5 | # This program is free software: you can redistribute it and/or modify it |
263 | 6 | # under the terms of the GNU Affero General Public License version 3, | 6 | # under the terms of the GNU Affero General Public License version 3, |
264 | @@ -13,4 +13,17 @@ | |||
265 | 13 | # | 13 | # |
266 | 14 | # You should have received a copy of the GNU Affero General Public License | 14 | # You should have received a copy of the GNU Affero General Public License |
267 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
268 | 16 | # | ||
269 | 17 | # In addition, as a special exception, the copyright holders give | ||
270 | 18 | # permission to link the code of portions of this program with the | ||
271 | 19 | # OpenSSL library under certain conditions as described in each | ||
272 | 20 | # individual source file, and distribute linked combinations | ||
273 | 21 | # including the two. | ||
274 | 22 | # You must obey the GNU General Public License in all respects | ||
275 | 23 | # for all of the code used other than OpenSSL. If you modify | ||
276 | 24 | # file(s) with this exception, you may extend this exception to your | ||
277 | 25 | # version of the file(s), but you are not obligated to do so. If you | ||
278 | 26 | # do not wish to do so, delete this exception statement from your | ||
279 | 27 | # version. If you delete this exception statement from all source | ||
280 | 28 | # files in the program, then also delete it here. | ||
281 | 16 | """Tests for ubuntuone.storageprotocol""" | 29 | """Tests for ubuntuone.storageprotocol""" |
282 | 17 | 30 | ||
283 | === modified file 'tests/test_bytesproducer.py' | |||
284 | --- tests/test_bytesproducer.py 2011-12-20 16:06:36 +0000 | |||
285 | +++ tests/test_bytesproducer.py 2012-04-03 12:15:42 +0000 | |||
286 | @@ -3,7 +3,7 @@ | |||
287 | 3 | # | 3 | # |
288 | 4 | # Author: Facundo Batista <facundo@canonical.com> | 4 | # Author: Facundo Batista <facundo@canonical.com> |
289 | 5 | # | 5 | # |
291 | 6 | # Copyright (C) 2009 Canonical | 6 | # Copyright (C) 2009-2012 Canonical Ltd. |
292 | 7 | # | 7 | # |
293 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
294 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
295 | @@ -16,6 +16,19 @@ | |||
296 | 16 | # | 16 | # |
297 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
298 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
299 | 19 | # | ||
300 | 20 | # In addition, as a special exception, the copyright holders give | ||
301 | 21 | # permission to link the code of portions of this program with the | ||
302 | 22 | # OpenSSL library under certain conditions as described in each | ||
303 | 23 | # individual source file, and distribute linked combinations | ||
304 | 24 | # including the two. | ||
305 | 25 | # You must obey the GNU General Public License in all respects | ||
306 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
307 | 27 | # file(s) with this exception, you may extend this exception to your | ||
308 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
309 | 29 | # do not wish to do so, delete this exception statement from your | ||
310 | 30 | # version. If you delete this exception statement from all source | ||
311 | 31 | # files in the program, then also delete it here. | ||
312 | 19 | """Tests for directory content serialization/unserialization.""" | 32 | """Tests for directory content serialization/unserialization.""" |
313 | 20 | 33 | ||
314 | 21 | from __future__ import with_statement | 34 | from __future__ import with_statement |
315 | 22 | 35 | ||
316 | === modified file 'tests/test_client.py' | |||
317 | --- tests/test_client.py 2011-12-20 16:06:36 +0000 | |||
318 | +++ tests/test_client.py 2012-04-03 12:15:42 +0000 | |||
319 | @@ -3,7 +3,7 @@ | |||
320 | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> |
321 | 4 | # Author: Alejandro J. Cura <alecu@canonical.com> | 4 | # Author: Alejandro J. Cura <alecu@canonical.com> |
322 | 5 | # | 5 | # |
324 | 6 | # Copyright (C) 2009, 2011 Canonical Ltd. | 6 | # Copyright (C) 2009-2012 Canonical Ltd. |
325 | 7 | # | 7 | # |
326 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
327 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
328 | @@ -16,6 +16,19 @@ | |||
329 | 16 | # | 16 | # |
330 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
331 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
332 | 19 | # | ||
333 | 20 | # In addition, as a special exception, the copyright holders give | ||
334 | 21 | # permission to link the code of portions of this program with the | ||
335 | 22 | # OpenSSL library under certain conditions as described in each | ||
336 | 23 | # individual source file, and distribute linked combinations | ||
337 | 24 | # including the two. | ||
338 | 25 | # You must obey the GNU General Public License in all respects | ||
339 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
340 | 27 | # file(s) with this exception, you may extend this exception to your | ||
341 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
342 | 29 | # do not wish to do so, delete this exception statement from your | ||
343 | 30 | # version. If you delete this exception statement from all source | ||
344 | 31 | # files in the program, then also delete it here. | ||
345 | 19 | """Tests for the protocol client.""" | 32 | """Tests for the protocol client.""" |
346 | 20 | 33 | ||
347 | 21 | import StringIO | 34 | import StringIO |
348 | 22 | 35 | ||
349 | === modified file 'tests/test_delta_info.py' | |||
350 | --- tests/test_delta_info.py 2010-11-04 14:18:06 +0000 | |||
351 | +++ tests/test_delta_info.py 2012-04-03 12:15:42 +0000 | |||
352 | @@ -2,7 +2,7 @@ | |||
353 | 2 | # | 2 | # |
354 | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> |
355 | 4 | # | 4 | # |
357 | 5 | # Copyright (C) 2009 Canonical Ltd. | 5 | # Copyright (C) 2009-2012 Canonical Ltd. |
358 | 6 | # | 6 | # |
359 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
360 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
361 | @@ -15,6 +15,19 @@ | |||
362 | 15 | # | 15 | # |
363 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
364 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
365 | 18 | # | ||
366 | 19 | # In addition, as a special exception, the copyright holders give | ||
367 | 20 | # permission to link the code of portions of this program with the | ||
368 | 21 | # OpenSSL library under certain conditions as described in each | ||
369 | 22 | # individual source file, and distribute linked combinations | ||
370 | 23 | # including the two. | ||
371 | 24 | # You must obey the GNU General Public License in all respects | ||
372 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
373 | 26 | # file(s) with this exception, you may extend this exception to your | ||
374 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
375 | 28 | # do not wish to do so, delete this exception statement from your | ||
376 | 29 | # version. If you delete this exception statement from all source | ||
377 | 30 | # files in the program, then also delete it here. | ||
378 | 18 | """Tests for generation node data type.""" | 31 | """Tests for generation node data type.""" |
379 | 19 | 32 | ||
380 | 20 | import unittest | 33 | import unittest |
381 | 21 | 34 | ||
382 | === modified file 'tests/test_dircontent.py' | |||
383 | --- tests/test_dircontent.py 2010-11-05 18:05:46 +0000 | |||
384 | +++ tests/test_dircontent.py 2012-04-03 12:15:42 +0000 | |||
385 | @@ -3,7 +3,7 @@ | |||
386 | 3 | # | 3 | # |
387 | 4 | # Author: Tim Cole <tim.cole@canonical.com> | 4 | # Author: Tim Cole <tim.cole@canonical.com> |
388 | 5 | # | 5 | # |
390 | 6 | # Copyright (C) 2009 Canonical | 6 | # Copyright (C) 2009-2012 Canonical Ltd. |
391 | 7 | # | 7 | # |
392 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
393 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
394 | @@ -16,6 +16,19 @@ | |||
395 | 16 | # | 16 | # |
396 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
397 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
398 | 19 | # | ||
399 | 20 | # In addition, as a special exception, the copyright holders give | ||
400 | 21 | # permission to link the code of portions of this program with the | ||
401 | 22 | # OpenSSL library under certain conditions as described in each | ||
402 | 23 | # individual source file, and distribute linked combinations | ||
403 | 24 | # including the two. | ||
404 | 25 | # You must obey the GNU General Public License in all respects | ||
405 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
406 | 27 | # file(s) with this exception, you may extend this exception to your | ||
407 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
408 | 29 | # do not wish to do so, delete this exception statement from your | ||
409 | 30 | # version. If you delete this exception statement from all source | ||
410 | 31 | # files in the program, then also delete it here. | ||
411 | 19 | """Tests for directory content serialization/unserialization.""" | 32 | """Tests for directory content serialization/unserialization.""" |
412 | 20 | 33 | ||
413 | 21 | from __future__ import with_statement | 34 | from __future__ import with_statement |
414 | 22 | 35 | ||
415 | === modified file 'tests/test_errors.py' | |||
416 | --- tests/test_errors.py 2010-11-04 14:18:06 +0000 | |||
417 | +++ tests/test_errors.py 2012-04-03 12:15:42 +0000 | |||
418 | @@ -2,7 +2,7 @@ | |||
419 | 2 | # | 2 | # |
420 | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> |
421 | 4 | # | 4 | # |
423 | 5 | # Copyright (C) 2010 Canonical Ltd. | 5 | # Copyright (C) 2010-2012 Canonical Ltd. |
424 | 6 | # | 6 | # |
425 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
426 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
427 | @@ -15,6 +15,19 @@ | |||
428 | 15 | # | 15 | # |
429 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
430 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
431 | 18 | # | ||
432 | 19 | # In addition, as a special exception, the copyright holders give | ||
433 | 20 | # permission to link the code of portions of this program with the | ||
434 | 21 | # OpenSSL library under certain conditions as described in each | ||
435 | 22 | # individual source file, and distribute linked combinations | ||
436 | 23 | # including the two. | ||
437 | 24 | # You must obey the GNU General Public License in all respects | ||
438 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
439 | 26 | # file(s) with this exception, you may extend this exception to your | ||
440 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
441 | 28 | # do not wish to do so, delete this exception statement from your | ||
442 | 29 | # version. If you delete this exception statement from all source | ||
443 | 30 | # files in the program, then also delete it here. | ||
444 | 18 | """Tests for errors module.""" | 31 | """Tests for errors module.""" |
445 | 19 | 32 | ||
446 | 20 | import unittest | 33 | import unittest |
447 | 21 | 34 | ||
448 | === modified file 'tests/test_hashes.py' | |||
449 | --- tests/test_hashes.py 2011-02-15 15:09:14 +0000 | |||
450 | +++ tests/test_hashes.py 2012-04-03 12:15:42 +0000 | |||
451 | @@ -2,7 +2,7 @@ | |||
452 | 2 | # | 2 | # |
453 | 3 | # Author: Facundo Batista <facundo@canonical.com> | 3 | # Author: Facundo Batista <facundo@canonical.com> |
454 | 4 | # | 4 | # |
456 | 5 | # Copyright (C) 2011 Canonical Ltd. | 5 | # Copyright (C) 2011-2012 Canonical Ltd. |
457 | 6 | # | 6 | # |
458 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
459 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
460 | @@ -15,7 +15,19 @@ | |||
461 | 15 | # | 15 | # |
462 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
463 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
465 | 18 | 18 | # | |
466 | 19 | # In addition, as a special exception, the copyright holders give | ||
467 | 20 | # permission to link the code of portions of this program with the | ||
468 | 21 | # OpenSSL library under certain conditions as described in each | ||
469 | 22 | # individual source file, and distribute linked combinations | ||
470 | 23 | # including the two. | ||
471 | 24 | # You must obey the GNU General Public License in all respects | ||
472 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
473 | 26 | # file(s) with this exception, you may extend this exception to your | ||
474 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
475 | 28 | # do not wish to do so, delete this exception statement from your | ||
476 | 29 | # version. If you delete this exception statement from all source | ||
477 | 30 | # files in the program, then also delete it here. | ||
478 | 19 | """Tests for the protocol hashing methods.""" | 31 | """Tests for the protocol hashing methods.""" |
479 | 20 | 32 | ||
480 | 21 | import hashlib | 33 | import hashlib |
481 | 22 | 34 | ||
482 | === modified file 'tests/test_proxy_tunnel.py' | |||
483 | --- tests/test_proxy_tunnel.py 2010-11-04 14:18:06 +0000 | |||
484 | +++ tests/test_proxy_tunnel.py 2012-04-03 12:15:42 +0000 | |||
485 | @@ -1,6 +1,6 @@ | |||
486 | 1 | # Test for proxy tunnel | 1 | # Test for proxy tunnel |
487 | 2 | # | 2 | # |
489 | 3 | # Copyright 2009 Canonical Ltd. | 3 | # Copyright 2009-2012 Canonical Ltd. |
490 | 4 | # | 4 | # |
491 | 5 | # This program is free software: you can redistribute it and/or modify it | 5 | # This program is free software: you can redistribute it and/or modify it |
492 | 6 | # under the terms of the GNU Affero General Public License version 3, | 6 | # under the terms of the GNU Affero General Public License version 3, |
493 | @@ -13,6 +13,19 @@ | |||
494 | 13 | # | 13 | # |
495 | 14 | # You should have received a copy of the GNU Affero General Public License | 14 | # You should have received a copy of the GNU Affero General Public License |
496 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
497 | 16 | # | ||
498 | 17 | # In addition, as a special exception, the copyright holders give | ||
499 | 18 | # permission to link the code of portions of this program with the | ||
500 | 19 | # OpenSSL library under certain conditions as described in each | ||
501 | 20 | # individual source file, and distribute linked combinations | ||
502 | 21 | # including the two. | ||
503 | 22 | # You must obey the GNU General Public License in all respects | ||
504 | 23 | # for all of the code used other than OpenSSL. If you modify | ||
505 | 24 | # file(s) with this exception, you may extend this exception to your | ||
506 | 25 | # version of the file(s), but you are not obligated to do so. If you | ||
507 | 26 | # do not wish to do so, delete this exception statement from your | ||
508 | 27 | # version. If you delete this exception statement from all source | ||
509 | 28 | # files in the program, then also delete it here. | ||
510 | 16 | """Test for proxy tunnel""" | 29 | """Test for proxy tunnel""" |
511 | 17 | 30 | ||
512 | 18 | import unittest | 31 | import unittest |
513 | 19 | 32 | ||
514 | === modified file 'tests/test_putcontent.py' | |||
515 | --- tests/test_putcontent.py 2011-04-20 18:49:55 +0000 | |||
516 | +++ tests/test_putcontent.py 2012-04-03 12:15:42 +0000 | |||
517 | @@ -4,7 +4,7 @@ | |||
518 | 4 | # Author: John R. Lenton <john.lenton@canonical.com> | 4 | # Author: John R. Lenton <john.lenton@canonical.com> |
519 | 5 | # Guillermo Gonzalez <guillermo.gonzalez@canonical.com> | 5 | # Guillermo Gonzalez <guillermo.gonzalez@canonical.com> |
520 | 6 | # | 6 | # |
522 | 7 | # Copyright (C) 2009-2011 Canonical | 7 | # Copyright (C) 2009-2012 Canonical Ltd. |
523 | 8 | # | 8 | # |
524 | 9 | # This program is free software: you can redistribute it and/or modify it | 9 | # This program is free software: you can redistribute it and/or modify it |
525 | 10 | # under the terms of the GNU Affero General Public License version 3, | 10 | # under the terms of the GNU Affero General Public License version 3, |
526 | @@ -17,6 +17,19 @@ | |||
527 | 17 | # | 17 | # |
528 | 18 | # You should have received a copy of the GNU Affero General Public License | 18 | # You should have received a copy of the GNU Affero General Public License |
529 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
530 | 20 | # | ||
531 | 21 | # In addition, as a special exception, the copyright holders give | ||
532 | 22 | # permission to link the code of portions of this program with the | ||
533 | 23 | # OpenSSL library under certain conditions as described in each | ||
534 | 24 | # individual source file, and distribute linked combinations | ||
535 | 25 | # including the two. | ||
536 | 26 | # You must obey the GNU General Public License in all respects | ||
537 | 27 | # for all of the code used other than OpenSSL. If you modify | ||
538 | 28 | # file(s) with this exception, you may extend this exception to your | ||
539 | 29 | # version of the file(s), but you are not obligated to do so. If you | ||
540 | 30 | # do not wish to do so, delete this exception statement from your | ||
541 | 31 | # version. If you delete this exception statement from all source | ||
542 | 32 | # files in the program, then also delete it here. | ||
543 | 20 | """Tests for PutContent request""" | 33 | """Tests for PutContent request""" |
544 | 21 | 34 | ||
545 | 22 | import unittest | 35 | import unittest |
546 | 23 | 36 | ||
547 | === modified file 'tests/test_query.py' | |||
548 | --- tests/test_query.py 2010-11-04 14:18:06 +0000 | |||
549 | +++ tests/test_query.py 2012-04-03 12:15:42 +0000 | |||
550 | @@ -3,7 +3,7 @@ | |||
551 | 3 | # | 3 | # |
552 | 4 | # Author: John R. Lenton <john.lenton@canonical.com> | 4 | # Author: John R. Lenton <john.lenton@canonical.com> |
553 | 5 | # | 5 | # |
555 | 6 | # Copyright (C) 2009 Canonical | 6 | # Copyright (C) 2009-2012 Canonical Ltd. |
556 | 7 | # | 7 | # |
557 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
558 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
559 | @@ -16,6 +16,19 @@ | |||
560 | 16 | # | 16 | # |
561 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
562 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
563 | 19 | # | ||
564 | 20 | # In addition, as a special exception, the copyright holders give | ||
565 | 21 | # permission to link the code of portions of this program with the | ||
566 | 22 | # OpenSSL library under certain conditions as described in each | ||
567 | 23 | # individual source file, and distribute linked combinations | ||
568 | 24 | # including the two. | ||
569 | 25 | # You must obey the GNU General Public License in all respects | ||
570 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
571 | 27 | # file(s) with this exception, you may extend this exception to your | ||
572 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
573 | 29 | # do not wish to do so, delete this exception statement from your | ||
574 | 30 | # version. If you delete this exception statement from all source | ||
575 | 31 | # files in the program, then also delete it here. | ||
576 | 19 | """Tests for querying lots of items""" | 32 | """Tests for querying lots of items""" |
577 | 20 | 33 | ||
578 | 21 | import unittest | 34 | import unittest |
579 | 22 | 35 | ||
580 | === modified file 'tests/test_request.py' | |||
581 | --- tests/test_request.py 2011-12-20 16:06:36 +0000 | |||
582 | +++ tests/test_request.py 2012-04-03 12:15:42 +0000 | |||
583 | @@ -4,7 +4,7 @@ | |||
584 | 4 | # Author: Tim Cole <tim.cole@canonical.com> | 4 | # Author: Tim Cole <tim.cole@canonical.com> |
585 | 5 | # Author: Natalia Bidart <natalia.bidart@canonical.com> | 5 | # Author: Natalia Bidart <natalia.bidart@canonical.com> |
586 | 6 | # | 6 | # |
588 | 7 | # Copyright (C) 2009 Canonical | 7 | # Copyright (C) 2009-2012 Canonical Ltd. |
589 | 8 | # | 8 | # |
590 | 9 | # This program is free software: you can redistribute it and/or modify it | 9 | # This program is free software: you can redistribute it and/or modify it |
591 | 10 | # under the terms of the GNU Affero General Public License version 3, | 10 | # under the terms of the GNU Affero General Public License version 3, |
592 | @@ -17,6 +17,19 @@ | |||
593 | 17 | # | 17 | # |
594 | 18 | # You should have received a copy of the GNU Affero General Public License | 18 | # You should have received a copy of the GNU Affero General Public License |
595 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
596 | 20 | # | ||
597 | 21 | # In addition, as a special exception, the copyright holders give | ||
598 | 22 | # permission to link the code of portions of this program with the | ||
599 | 23 | # OpenSSL library under certain conditions as described in each | ||
600 | 24 | # individual source file, and distribute linked combinations | ||
601 | 25 | # including the two. | ||
602 | 26 | # You must obey the GNU General Public License in all respects | ||
603 | 27 | # for all of the code used other than OpenSSL. If you modify | ||
604 | 28 | # file(s) with this exception, you may extend this exception to your | ||
605 | 29 | # version of the file(s), but you are not obligated to do so. If you | ||
606 | 30 | # do not wish to do so, delete this exception statement from your | ||
607 | 31 | # version. If you delete this exception statement from all source | ||
608 | 32 | # files in the program, then also delete it here. | ||
609 | 20 | """Tests for directory content serialization/unserialization.""" | 33 | """Tests for directory content serialization/unserialization.""" |
610 | 21 | 34 | ||
611 | 22 | from __future__ import with_statement | 35 | from __future__ import with_statement |
612 | 23 | 36 | ||
613 | === modified file 'tests/test_sharersp.py' | |||
614 | --- tests/test_sharersp.py 2011-12-20 16:06:36 +0000 | |||
615 | +++ tests/test_sharersp.py 2012-04-03 12:15:42 +0000 | |||
616 | @@ -2,7 +2,7 @@ | |||
617 | 2 | # | 2 | # |
618 | 3 | # Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com> | 3 | # Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com> |
619 | 4 | # | 4 | # |
621 | 5 | # Copyright (C) 2010 Canonical | 5 | # Copyright (C) 2010-2012 Canonical Ltd. |
622 | 6 | # | 6 | # |
623 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
624 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
625 | @@ -15,6 +15,19 @@ | |||
626 | 15 | # | 15 | # |
627 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
628 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
629 | 18 | # | ||
630 | 19 | # In addition, as a special exception, the copyright holders give | ||
631 | 20 | # permission to link the code of portions of this program with the | ||
632 | 21 | # OpenSSL library under certain conditions as described in each | ||
633 | 22 | # individual source file, and distribute linked combinations | ||
634 | 23 | # including the two. | ||
635 | 24 | # You must obey the GNU General Public License in all respects | ||
636 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
637 | 26 | # file(s) with this exception, you may extend this exception to your | ||
638 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
639 | 28 | # do not wish to do so, delete this exception statement from your | ||
640 | 29 | # version. If you delete this exception statement from all source | ||
641 | 30 | # files in the program, then also delete it here. | ||
642 | 18 | """Tests for shares response.""" | 31 | """Tests for shares response.""" |
643 | 19 | 32 | ||
644 | 20 | import uuid | 33 | import uuid |
645 | 21 | 34 | ||
646 | === modified file 'tests/test_throttling.py' | |||
647 | --- tests/test_throttling.py 2011-12-20 16:06:36 +0000 | |||
648 | +++ tests/test_throttling.py 2012-04-03 12:15:42 +0000 | |||
649 | @@ -3,7 +3,7 @@ | |||
650 | 3 | # | 3 | # |
651 | 4 | # Author: Facundo Batista <facundo@canonical.com> | 4 | # Author: Facundo Batista <facundo@canonical.com> |
652 | 5 | # | 5 | # |
654 | 6 | # Copyright (C) 2009 Canonical | 6 | # Copyright (C) 2009-2012 Canonical |
655 | 7 | # | 7 | # |
656 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
657 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
658 | @@ -16,6 +16,19 @@ | |||
659 | 16 | # | 16 | # |
660 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
661 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
662 | 19 | # | ||
663 | 20 | # In addition, as a special exception, the copyright holders give | ||
664 | 21 | # permission to link the code of portions of this program with the | ||
665 | 22 | # OpenSSL library under certain conditions as described in each | ||
666 | 23 | # individual source file, and distribute linked combinations | ||
667 | 24 | # including the two. | ||
668 | 25 | # You must obey the GNU General Public License in all respects | ||
669 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
670 | 27 | # file(s) with this exception, you may extend this exception to your | ||
671 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
672 | 29 | # do not wish to do so, delete this exception statement from your | ||
673 | 30 | # version. If you delete this exception statement from all source | ||
674 | 31 | # files in the program, then also delete it here. | ||
675 | 19 | """Tests for directory content serialization/unserialization.""" | 32 | """Tests for directory content serialization/unserialization.""" |
676 | 20 | 33 | ||
677 | 21 | from __future__ import with_statement | 34 | from __future__ import with_statement |
678 | 22 | 35 | ||
679 | === modified file 'tests/test_volumes.py' | |||
680 | --- tests/test_volumes.py 2010-11-04 14:18:06 +0000 | |||
681 | +++ tests/test_volumes.py 2012-04-03 12:15:42 +0000 | |||
682 | @@ -2,7 +2,7 @@ | |||
683 | 2 | # | 2 | # |
684 | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> |
685 | 4 | # | 4 | # |
687 | 5 | # Copyright (C) 2009 Canonical Ltd. | 5 | # Copyright (C) 2009-2012 Canonical Ltd. |
688 | 6 | # | 6 | # |
689 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
690 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
691 | @@ -15,6 +15,19 @@ | |||
692 | 15 | # | 15 | # |
693 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
694 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
695 | 18 | # | ||
696 | 19 | # In addition, as a special exception, the copyright holders give | ||
697 | 20 | # permission to link the code of portions of this program with the | ||
698 | 21 | # OpenSSL library under certain conditions as described in each | ||
699 | 22 | # individual source file, and distribute linked combinations | ||
700 | 23 | # including the two. | ||
701 | 24 | # You must obey the GNU General Public License in all respects | ||
702 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
703 | 26 | # file(s) with this exception, you may extend this exception to your | ||
704 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
705 | 28 | # do not wish to do so, delete this exception statement from your | ||
706 | 29 | # version. If you delete this exception statement from all source | ||
707 | 30 | # files in the program, then also delete it here. | ||
708 | 18 | """Tests for volume data type.""" | 31 | """Tests for volume data type.""" |
709 | 19 | 32 | ||
710 | 20 | import unittest | 33 | import unittest |
711 | 21 | 34 | ||
712 | === modified file 'ubuntuone/__init__.py' | |||
713 | --- ubuntuone/__init__.py 2010-03-15 18:48:27 +0000 | |||
714 | +++ ubuntuone/__init__.py 2012-04-03 12:15:42 +0000 | |||
715 | @@ -1,6 +1,6 @@ | |||
716 | 1 | # __init__.py | 1 | # __init__.py |
717 | 2 | # | 2 | # |
719 | 3 | # Copyright 2009 Canonical Ltd. | 3 | # Copyright 2009-2012 Canonical Ltd. |
720 | 4 | # | 4 | # |
721 | 5 | # This program is free software: you can redistribute it and/or modify it | 5 | # This program is free software: you can redistribute it and/or modify it |
722 | 6 | # under the terms of the GNU Affero General Public License version 3, | 6 | # under the terms of the GNU Affero General Public License version 3, |
723 | @@ -13,5 +13,18 @@ | |||
724 | 13 | # | 13 | # |
725 | 14 | # You should have received a copy of the GNU Affero General Public License | 14 | # You should have received a copy of the GNU Affero General Public License |
726 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
727 | 16 | # | ||
728 | 17 | # In addition, as a special exception, the copyright holders give | ||
729 | 18 | # permission to link the code of portions of this program with the | ||
730 | 19 | # OpenSSL library under certain conditions as described in each | ||
731 | 20 | # individual source file, and distribute linked combinations | ||
732 | 21 | # including the two. | ||
733 | 22 | # You must obey the GNU General Public License in all respects | ||
734 | 23 | # for all of the code used other than OpenSSL. If you modify | ||
735 | 24 | # file(s) with this exception, you may extend this exception to your | ||
736 | 25 | # version of the file(s), but you are not obligated to do so. If you | ||
737 | 26 | # do not wish to do so, delete this exception statement from your | ||
738 | 27 | # version. If you delete this exception statement from all source | ||
739 | 28 | # files in the program, then also delete it here. | ||
740 | 16 | """ubuntuone package""" | 29 | """ubuntuone package""" |
741 | 17 | __import__('pkg_resources').declare_namespace(__name__) | 30 | __import__('pkg_resources').declare_namespace(__name__) |
742 | 18 | 31 | ||
743 | === modified file 'ubuntuone/storageprotocol/__init__.py' | |||
744 | --- ubuntuone/storageprotocol/__init__.py 2010-11-04 14:18:06 +0000 | |||
745 | +++ ubuntuone/storageprotocol/__init__.py 2012-04-03 12:15:42 +0000 | |||
746 | @@ -1,6 +1,6 @@ | |||
747 | 1 | # __init__.py | 1 | # __init__.py |
748 | 2 | # | 2 | # |
750 | 3 | # Copyright 2009 Canonical Ltd. | 3 | # Copyright 2009-2012 Canonical Ltd. |
751 | 4 | # | 4 | # |
752 | 5 | # This program is free software: you can redistribute it and/or modify it | 5 | # This program is free software: you can redistribute it and/or modify it |
753 | 6 | # under the terms of the GNU Affero General Public License version 3, | 6 | # under the terms of the GNU Affero General Public License version 3, |
754 | @@ -13,4 +13,17 @@ | |||
755 | 13 | # | 13 | # |
756 | 14 | # You should have received a copy of the GNU Affero General Public License | 14 | # You should have received a copy of the GNU Affero General Public License |
757 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
758 | 16 | # | ||
759 | 17 | # In addition, as a special exception, the copyright holders give | ||
760 | 18 | # permission to link the code of portions of this program with the | ||
761 | 19 | # OpenSSL library under certain conditions as described in each | ||
762 | 20 | # individual source file, and distribute linked combinations | ||
763 | 21 | # including the two. | ||
764 | 22 | # You must obey the GNU General Public License in all respects | ||
765 | 23 | # for all of the code used other than OpenSSL. If you modify | ||
766 | 24 | # file(s) with this exception, you may extend this exception to your | ||
767 | 25 | # version of the file(s), but you are not obligated to do so. If you | ||
768 | 26 | # do not wish to do so, delete this exception statement from your | ||
769 | 27 | # version. If you delete this exception statement from all source | ||
770 | 28 | # files in the program, then also delete it here. | ||
771 | 16 | """ubuntuone.storageprotocol package.""" | 29 | """ubuntuone.storageprotocol package.""" |
772 | 17 | 30 | ||
773 | === modified file 'ubuntuone/storageprotocol/client.py' | |||
774 | --- ubuntuone/storageprotocol/client.py 2011-10-06 19:28:08 +0000 | |||
775 | +++ ubuntuone/storageprotocol/client.py 2012-04-03 12:15:42 +0000 | |||
776 | @@ -6,7 +6,7 @@ | |||
777 | 6 | # Author: Facundo Batista <facundo@canonical.com> | 6 | # Author: Facundo Batista <facundo@canonical.com> |
778 | 7 | # Author: Alejandro J. Cura <alecu@canonical.com> | 7 | # Author: Alejandro J. Cura <alecu@canonical.com> |
779 | 8 | # | 8 | # |
781 | 9 | # Copyright 2009-2011 Canonical Ltd. | 9 | # Copyright 2009-2012 Canonical Ltd. |
782 | 10 | # | 10 | # |
783 | 11 | # This program is free software: you can redistribute it and/or modify it | 11 | # This program is free software: you can redistribute it and/or modify it |
784 | 12 | # under the terms of the GNU Affero General Public License version 3, | 12 | # under the terms of the GNU Affero General Public License version 3, |
785 | @@ -19,6 +19,19 @@ | |||
786 | 19 | # | 19 | # |
787 | 20 | # You should have received a copy of the GNU Affero General Public License | 20 | # You should have received a copy of the GNU Affero General Public License |
788 | 21 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 21 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
789 | 22 | # | ||
790 | 23 | # In addition, as a special exception, the copyright holders give | ||
791 | 24 | # permission to link the code of portions of this program with the | ||
792 | 25 | # OpenSSL library under certain conditions as described in each | ||
793 | 26 | # individual source file, and distribute linked combinations | ||
794 | 27 | # including the two. | ||
795 | 28 | # You must obey the GNU General Public License in all respects | ||
796 | 29 | # for all of the code used other than OpenSSL. If you modify | ||
797 | 30 | # file(s) with this exception, you may extend this exception to your | ||
798 | 31 | # version of the file(s), but you are not obligated to do so. If you | ||
799 | 32 | # do not wish to do so, delete this exception statement from your | ||
800 | 33 | # version. If you delete this exception statement from all source | ||
801 | 34 | # files in the program, then also delete it here. | ||
802 | 22 | """The storage protocol client.""" | 35 | """The storage protocol client.""" |
803 | 23 | 36 | ||
804 | 24 | import logging | 37 | import logging |
805 | 25 | 38 | ||
806 | === modified file 'ubuntuone/storageprotocol/content_hash.py' | |||
807 | --- ubuntuone/storageprotocol/content_hash.py 2011-02-15 15:09:14 +0000 | |||
808 | +++ ubuntuone/storageprotocol/content_hash.py 2012-04-03 12:15:42 +0000 | |||
809 | @@ -3,7 +3,7 @@ | |||
810 | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> |
811 | 4 | # Natalia B. Bidart <natalia.bidart@canonical.com> | 4 | # Natalia B. Bidart <natalia.bidart@canonical.com> |
812 | 5 | # | 5 | # |
814 | 6 | # Copyright 2009-2010 Canonical Ltd. | 6 | # Copyright 2009-2012 Canonical Ltd. |
815 | 7 | # | 7 | # |
816 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
817 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
818 | @@ -16,7 +16,19 @@ | |||
819 | 16 | # | 16 | # |
820 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
821 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
823 | 19 | 19 | # | |
824 | 20 | # In addition, as a special exception, the copyright holders give | ||
825 | 21 | # permission to link the code of portions of this program with the | ||
826 | 22 | # OpenSSL library under certain conditions as described in each | ||
827 | 23 | # individual source file, and distribute linked combinations | ||
828 | 24 | # including the two. | ||
829 | 25 | # You must obey the GNU General Public License in all respects | ||
830 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
831 | 27 | # file(s) with this exception, you may extend this exception to your | ||
832 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
833 | 29 | # do not wish to do so, delete this exception statement from your | ||
834 | 30 | # version. If you delete this exception statement from all source | ||
835 | 31 | # files in the program, then also delete it here. | ||
836 | 20 | """Hash Handling Stuffs.""" | 32 | """Hash Handling Stuffs.""" |
837 | 21 | 33 | ||
838 | 22 | import copy | 34 | import copy |
839 | 23 | 35 | ||
840 | === modified file 'ubuntuone/storageprotocol/context.py' | |||
841 | --- ubuntuone/storageprotocol/context.py 2010-11-04 14:18:06 +0000 | |||
842 | +++ ubuntuone/storageprotocol/context.py 2012-04-03 12:15:42 +0000 | |||
843 | @@ -1,6 +1,6 @@ | |||
844 | 1 | # ubuntuone.storageprotocol.context - ssl context creation | 1 | # ubuntuone.storageprotocol.context - ssl context creation |
845 | 2 | # | 2 | # |
847 | 3 | # Copyright 2009 Canonical Ltd. | 3 | # Copyright 2009-2012 Canonical Ltd. |
848 | 4 | # | 4 | # |
849 | 5 | # This program is free software: you can redistribute it and/or modify it | 5 | # This program is free software: you can redistribute it and/or modify it |
850 | 6 | # under the terms of the GNU Affero General Public License version 3, | 6 | # under the terms of the GNU Affero General Public License version 3, |
851 | @@ -13,6 +13,19 @@ | |||
852 | 13 | # | 13 | # |
853 | 14 | # You should have received a copy of the GNU Affero General Public License | 14 | # You should have received a copy of the GNU Affero General Public License |
854 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
855 | 16 | # | ||
856 | 17 | # In addition, as a special exception, the copyright holders give | ||
857 | 18 | # permission to link the code of portions of this program with the | ||
858 | 19 | # OpenSSL library under certain conditions as described in each | ||
859 | 20 | # individual source file, and distribute linked combinations | ||
860 | 21 | # including the two. | ||
861 | 22 | # You must obey the GNU General Public License in all respects | ||
862 | 23 | # for all of the code used other than OpenSSL. If you modify | ||
863 | 24 | # file(s) with this exception, you may extend this exception to your | ||
864 | 25 | # version of the file(s), but you are not obligated to do so. If you | ||
865 | 26 | # do not wish to do so, delete this exception statement from your | ||
866 | 27 | # version. If you delete this exception statement from all source | ||
867 | 28 | # files in the program, then also delete it here. | ||
868 | 16 | """ | 29 | """ |
869 | 17 | Standard Routines for working with ssl context creation | 30 | Standard Routines for working with ssl context creation |
870 | 18 | """ | 31 | """ |
871 | 19 | 32 | ||
872 | === modified file 'ubuntuone/storageprotocol/delta.py' | |||
873 | --- ubuntuone/storageprotocol/delta.py 2010-11-04 14:18:06 +0000 | |||
874 | +++ ubuntuone/storageprotocol/delta.py 2012-04-03 12:15:42 +0000 | |||
875 | @@ -2,7 +2,7 @@ | |||
876 | 2 | # | 2 | # |
877 | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> |
878 | 4 | # | 4 | # |
880 | 5 | # Copyright 2009 Canonical Ltd. | 5 | # Copyright 2009-2012 Canonical Ltd. |
881 | 6 | # | 6 | # |
882 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
883 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
884 | @@ -15,6 +15,19 @@ | |||
885 | 15 | # | 15 | # |
886 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
887 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
888 | 18 | # | ||
889 | 19 | # In addition, as a special exception, the copyright holders give | ||
890 | 20 | # permission to link the code of portions of this program with the | ||
891 | 21 | # OpenSSL library under certain conditions as described in each | ||
892 | 22 | # individual source file, and distribute linked combinations | ||
893 | 23 | # including the two. | ||
894 | 24 | # You must obey the GNU General Public License in all respects | ||
895 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
896 | 26 | # file(s) with this exception, you may extend this exception to your | ||
897 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
898 | 28 | # do not wish to do so, delete this exception statement from your | ||
899 | 29 | # version. If you delete this exception statement from all source | ||
900 | 30 | # files in the program, then also delete it here. | ||
901 | 18 | """ | 31 | """ |
902 | 19 | Provides wrapper classes for delta nodes messages | 32 | Provides wrapper classes for delta nodes messages |
903 | 20 | """ | 33 | """ |
904 | 21 | 34 | ||
905 | === modified file 'ubuntuone/storageprotocol/dircontent.proto' | |||
906 | --- ubuntuone/storageprotocol/dircontent.proto 2010-01-25 15:18:44 +0000 | |||
907 | +++ ubuntuone/storageprotocol/dircontent.proto 2012-04-03 12:15:42 +0000 | |||
908 | @@ -1,7 +1,7 @@ | |||
909 | 1 | /* | 1 | /* |
910 | 2 | ubuntuone.storageprotocol.dircontent_pb2 - dircontent protocol | 2 | ubuntuone.storageprotocol.dircontent_pb2 - dircontent protocol |
911 | 3 | 3 | ||
913 | 4 | Copyright 2009 Canonical Ltd. | 4 | Copyright 2009-2012 Canonical Ltd. |
914 | 5 | 5 | ||
915 | 6 | This program is free software: you can redistribute it and/or modify it | 6 | This program is free software: you can redistribute it and/or modify it |
916 | 7 | under the terms of the GNU Affero General Public License version 3, | 7 | under the terms of the GNU Affero General Public License version 3, |
917 | @@ -14,6 +14,19 @@ | |||
918 | 14 | 14 | ||
919 | 15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
920 | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
921 | 17 | |||
922 | 18 | In addition, as a special exception, the copyright holders give | ||
923 | 19 | permission to link the code of portions of this program with the | ||
924 | 20 | OpenSSL library under certain conditions as described in each | ||
925 | 21 | individual source file, and distribute linked combinations | ||
926 | 22 | including the two. | ||
927 | 23 | You must obey the GNU General Public License in all respects | ||
928 | 24 | for all of the code used other than OpenSSL. If you modify | ||
929 | 25 | file(s) with this exception, you may extend this exception to your | ||
930 | 26 | version of the file(s), but you are not obligated to do so. If you | ||
931 | 27 | do not wish to do so, delete this exception statement from your | ||
932 | 28 | version. If you delete this exception statement from all source | ||
933 | 29 | files in the program, then also delete it here. | ||
934 | 17 | */ | 30 | */ |
935 | 18 | package ubuntuone.storageprotocol; | 31 | package ubuntuone.storageprotocol; |
936 | 19 | 32 | ||
937 | 20 | 33 | ||
938 | === modified file 'ubuntuone/storageprotocol/dircontent.py' | |||
939 | --- ubuntuone/storageprotocol/dircontent.py 2010-11-05 18:05:46 +0000 | |||
940 | +++ ubuntuone/storageprotocol/dircontent.py 2012-04-03 12:15:42 +0000 | |||
941 | @@ -2,7 +2,7 @@ | |||
942 | 2 | # | 2 | # |
943 | 3 | # Author: Tim Cole <tim.cole@canonical.com> | 3 | # Author: Tim Cole <tim.cole@canonical.com> |
944 | 4 | # | 4 | # |
946 | 5 | # Copyright 2009 Canonical Ltd. | 5 | # Copyright 2009-2012 Canonical Ltd. |
947 | 6 | # | 6 | # |
948 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
949 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
950 | @@ -15,6 +15,19 @@ | |||
951 | 15 | # | 15 | # |
952 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
953 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
954 | 18 | # | ||
955 | 19 | # In addition, as a special exception, the copyright holders give | ||
956 | 20 | # permission to link the code of portions of this program with the | ||
957 | 21 | # OpenSSL library under certain conditions as described in each | ||
958 | 22 | # individual source file, and distribute linked combinations | ||
959 | 23 | # including the two. | ||
960 | 24 | # You must obey the GNU General Public License in all respects | ||
961 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
962 | 26 | # file(s) with this exception, you may extend this exception to your | ||
963 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
964 | 28 | # do not wish to do so, delete this exception statement from your | ||
965 | 29 | # version. If you delete this exception statement from all source | ||
966 | 30 | # files in the program, then also delete it here. | ||
967 | 18 | """ | 31 | """ |
968 | 19 | Standard routines for working with directory content. | 32 | Standard routines for working with directory content. |
969 | 20 | 33 | ||
970 | 21 | 34 | ||
971 | === modified file 'ubuntuone/storageprotocol/errors.py' | |||
972 | --- ubuntuone/storageprotocol/errors.py 2010-11-04 14:18:06 +0000 | |||
973 | +++ ubuntuone/storageprotocol/errors.py 2012-04-03 12:15:42 +0000 | |||
974 | @@ -2,7 +2,7 @@ | |||
975 | 2 | # | 2 | # |
976 | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> |
977 | 4 | # | 4 | # |
979 | 5 | # Copyright 2010 Canonical Ltd. | 5 | # Copyright 2010-2012 Canonical Ltd. |
980 | 6 | # | 6 | # |
981 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
982 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
983 | @@ -15,6 +15,19 @@ | |||
984 | 15 | # | 15 | # |
985 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
986 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
987 | 18 | # | ||
988 | 19 | # In addition, as a special exception, the copyright holders give | ||
989 | 20 | # permission to link the code of portions of this program with the | ||
990 | 21 | # OpenSSL library under certain conditions as described in each | ||
991 | 22 | # individual source file, and distribute linked combinations | ||
992 | 23 | # including the two. | ||
993 | 24 | # You must obey the GNU General Public License in all respects | ||
994 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
995 | 26 | # file(s) with this exception, you may extend this exception to your | ||
996 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
997 | 28 | # do not wish to do so, delete this exception statement from your | ||
998 | 29 | # version. If you delete this exception statement from all source | ||
999 | 30 | # files in the program, then also delete it here. | ||
1000 | 18 | """The errors abstraction.""" | 31 | """The errors abstraction.""" |
1001 | 19 | 32 | ||
1002 | 20 | import uuid | 33 | import uuid |
1003 | 21 | 34 | ||
1004 | === modified file 'ubuntuone/storageprotocol/protocol.proto' | |||
1005 | --- ubuntuone/storageprotocol/protocol.proto 2011-07-29 21:37:22 +0000 | |||
1006 | +++ ubuntuone/storageprotocol/protocol.proto 2012-04-03 12:15:42 +0000 | |||
1007 | @@ -1,7 +1,7 @@ | |||
1008 | 1 | /* | 1 | /* |
1009 | 2 | ubuntuone.storageprotocol.protocol_pb2 - storage protocol | 2 | ubuntuone.storageprotocol.protocol_pb2 - storage protocol |
1010 | 3 | 3 | ||
1012 | 4 | Copyright 2009-2011 Canonical Ltd. | 4 | Copyright 2009-2012 Canonical Ltd. |
1013 | 5 | 5 | ||
1014 | 6 | This program is free software: you can redistribute it and/or modify it | 6 | This program is free software: you can redistribute it and/or modify it |
1015 | 7 | under the terms of the GNU Affero General Public License version 3, | 7 | under the terms of the GNU Affero General Public License version 3, |
1016 | @@ -14,6 +14,19 @@ | |||
1017 | 14 | 14 | ||
1018 | 15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
1019 | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
1020 | 17 | |||
1021 | 18 | In addition, as a special exception, the copyright holders give | ||
1022 | 19 | permission to link the code of portions of this program with the | ||
1023 | 20 | OpenSSL library under certain conditions as described in each | ||
1024 | 21 | individual source file, and distribute linked combinations | ||
1025 | 22 | including the two. | ||
1026 | 23 | You must obey the GNU General Public License in all respects | ||
1027 | 24 | for all of the code used other than OpenSSL. If you modify | ||
1028 | 25 | file(s) with this exception, you may extend this exception to your | ||
1029 | 26 | version of the file(s), but you are not obligated to do so. If you | ||
1030 | 27 | do not wish to do so, delete this exception statement from your | ||
1031 | 28 | version. If you delete this exception statement from all source | ||
1032 | 29 | files in the program, then also delete it here. | ||
1033 | 17 | */ | 30 | */ |
1034 | 18 | package ubuntuone.storageprotocol; | 31 | package ubuntuone.storageprotocol; |
1035 | 19 | 32 | ||
1036 | 20 | 33 | ||
1037 | === modified file 'ubuntuone/storageprotocol/proxy_tunnel.py' | |||
1038 | --- ubuntuone/storageprotocol/proxy_tunnel.py 2010-11-04 14:18:06 +0000 | |||
1039 | +++ ubuntuone/storageprotocol/proxy_tunnel.py 2012-04-03 12:15:42 +0000 | |||
1040 | @@ -2,7 +2,7 @@ | |||
1041 | 2 | # | 2 | # |
1042 | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> | 3 | # Author: Lucio Torre <lucio.torre@canonical.com> |
1043 | 4 | # | 4 | # |
1045 | 5 | # Copyright 2009 Canonical Ltd. | 5 | # Copyright 2009-2012 Canonical Ltd. |
1046 | 6 | # | 6 | # |
1047 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
1048 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
1049 | @@ -15,6 +15,19 @@ | |||
1050 | 15 | # | 15 | # |
1051 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
1052 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
1053 | 18 | # | ||
1054 | 19 | # In addition, as a special exception, the copyright holders give | ||
1055 | 20 | # permission to link the code of portions of this program with the | ||
1056 | 21 | # OpenSSL library under certain conditions as described in each | ||
1057 | 22 | # individual source file, and distribute linked combinations | ||
1058 | 23 | # including the two. | ||
1059 | 24 | # You must obey the GNU General Public License in all respects | ||
1060 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
1061 | 26 | # file(s) with this exception, you may extend this exception to your | ||
1062 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
1063 | 28 | # do not wish to do so, delete this exception statement from your | ||
1064 | 29 | # version. If you delete this exception statement from all source | ||
1065 | 30 | # files in the program, then also delete it here. | ||
1066 | 18 | """Proxy tunelling""" | 31 | """Proxy tunelling""" |
1067 | 19 | import base64 | 32 | import base64 |
1068 | 20 | 33 | ||
1069 | 21 | 34 | ||
1070 | === modified file 'ubuntuone/storageprotocol/request.py' | |||
1071 | --- ubuntuone/storageprotocol/request.py 2011-06-02 16:40:43 +0000 | |||
1072 | +++ ubuntuone/storageprotocol/request.py 2012-04-03 12:15:42 +0000 | |||
1073 | @@ -3,7 +3,7 @@ | |||
1074 | 3 | # | 3 | # |
1075 | 4 | # Author: Lucio Torre <lucio.torre@canonical.com> | 4 | # Author: Lucio Torre <lucio.torre@canonical.com> |
1076 | 5 | # | 5 | # |
1078 | 6 | # Copyright 2009 Canonical Ltd. | 6 | # Copyright 2009-2012 Canonical Ltd. |
1079 | 7 | # | 7 | # |
1080 | 8 | # This program is free software: you can redistribute it and/or modify it | 8 | # This program is free software: you can redistribute it and/or modify it |
1081 | 9 | # under the terms of the GNU Affero General Public License version 3, | 9 | # under the terms of the GNU Affero General Public License version 3, |
1082 | @@ -16,6 +16,19 @@ | |||
1083 | 16 | # | 16 | # |
1084 | 17 | # You should have received a copy of the GNU Affero General Public License | 17 | # You should have received a copy of the GNU Affero General Public License |
1085 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
1086 | 19 | # | ||
1087 | 20 | # In addition, as a special exception, the copyright holders give | ||
1088 | 21 | # permission to link the code of portions of this program with the | ||
1089 | 22 | # OpenSSL library under certain conditions as described in each | ||
1090 | 23 | # individual source file, and distribute linked combinations | ||
1091 | 24 | # including the two. | ||
1092 | 25 | # You must obey the GNU General Public License in all respects | ||
1093 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
1094 | 27 | # file(s) with this exception, you may extend this exception to your | ||
1095 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
1096 | 29 | # do not wish to do so, delete this exception statement from your | ||
1097 | 30 | # version. If you delete this exception statement from all source | ||
1098 | 31 | # files in the program, then also delete it here. | ||
1099 | 19 | """ | 32 | """ |
1100 | 20 | The base classes for the network client and server. | 33 | The base classes for the network client and server. |
1101 | 21 | 34 | ||
1102 | 22 | 35 | ||
1103 | === modified file 'ubuntuone/storageprotocol/sharersp.py' | |||
1104 | --- ubuntuone/storageprotocol/sharersp.py 2010-11-05 14:54:42 +0000 | |||
1105 | +++ ubuntuone/storageprotocol/sharersp.py 2012-04-03 12:15:42 +0000 | |||
1106 | @@ -4,7 +4,7 @@ | |||
1107 | 4 | # Author: Facundo Batista <facundo@canonical.com> | 4 | # Author: Facundo Batista <facundo@canonical.com> |
1108 | 5 | # Guillermo Gonzalez <guillermo.gonzalez@canonical.com> | 5 | # Guillermo Gonzalez <guillermo.gonzalez@canonical.com> |
1109 | 6 | # | 6 | # |
1111 | 7 | # Copyright 2009-2010 Canonical Ltd. | 7 | # Copyright 2009-2012 Canonical Ltd. |
1112 | 8 | # | 8 | # |
1113 | 9 | # This program is free software: you can redistribute it and/or modify it | 9 | # This program is free software: you can redistribute it and/or modify it |
1114 | 10 | # under the terms of the GNU Affero General Public License version 3, | 10 | # under the terms of the GNU Affero General Public License version 3, |
1115 | @@ -16,6 +16,19 @@ | |||
1116 | 16 | # PURPOSE. See the GNU Affero General Public License for more details. | 16 | # PURPOSE. See the GNU Affero General Public License for more details. |
1117 | 17 | # | 17 | # |
1118 | 18 | # You should have received a copy of the GNU Affero General Public License | 18 | # You should have received a copy of the GNU Affero General Public License |
1119 | 19 | # | ||
1120 | 20 | # In addition, as a special exception, the copyright holders give | ||
1121 | 21 | # permission to link the code of portions of this program with the | ||
1122 | 22 | # OpenSSL library under certain conditions as described in each | ||
1123 | 23 | # individual source file, and distribute linked combinations | ||
1124 | 24 | # including the two. | ||
1125 | 25 | # You must obey the GNU General Public License in all respects | ||
1126 | 26 | # for all of the code used other than OpenSSL. If you modify | ||
1127 | 27 | # file(s) with this exception, you may extend this exception to your | ||
1128 | 28 | # version of the file(s), but you are not obligated to do so. If you | ||
1129 | 29 | # do not wish to do so, delete this exception statement from your | ||
1130 | 30 | # version. If you delete this exception statement from all source | ||
1131 | 31 | # files in the program, then also delete it here. | ||
1132 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 32 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
1133 | 20 | """A handy class to use Shares.""" | 33 | """A handy class to use Shares.""" |
1134 | 21 | 34 | ||
1135 | 22 | 35 | ||
1136 | === modified file 'ubuntuone/storageprotocol/utils.py' | |||
1137 | --- ubuntuone/storageprotocol/utils.py 2011-12-20 16:06:36 +0000 | |||
1138 | +++ ubuntuone/storageprotocol/utils.py 2012-04-03 12:15:42 +0000 | |||
1139 | @@ -2,7 +2,7 @@ | |||
1140 | 2 | # | 2 | # |
1141 | 3 | # Author: Alejandro J. Cura <alecu@canonical.com> | 3 | # Author: Alejandro J. Cura <alecu@canonical.com> |
1142 | 4 | # | 4 | # |
1144 | 5 | # Copyright 2011 Canonical Ltd. | 5 | # Copyright 2011-2012 Canonical Ltd. |
1145 | 6 | # | 6 | # |
1146 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
1147 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
1148 | @@ -15,6 +15,19 @@ | |||
1149 | 15 | # | 15 | # |
1150 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
1151 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
1152 | 18 | # | ||
1153 | 19 | # In addition, as a special exception, the copyright holders give | ||
1154 | 20 | # permission to link the code of portions of this program with the | ||
1155 | 21 | # OpenSSL library under certain conditions as described in each | ||
1156 | 22 | # individual source file, and distribute linked combinations | ||
1157 | 23 | # including the two. | ||
1158 | 24 | # You must obey the GNU General Public License in all respects | ||
1159 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
1160 | 26 | # file(s) with this exception, you may extend this exception to your | ||
1161 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
1162 | 28 | # do not wish to do so, delete this exception statement from your | ||
1163 | 29 | # version. If you delete this exception statement from all source | ||
1164 | 30 | # files in the program, then also delete it here. | ||
1165 | 18 | """Some storage protocol utils.""" | 31 | """Some storage protocol utils.""" |
1166 | 19 | 32 | ||
1167 | 20 | import logging | 33 | import logging |
1168 | 21 | 34 | ||
1169 | === modified file 'ubuntuone/storageprotocol/validators.py' | |||
1170 | --- ubuntuone/storageprotocol/validators.py 2010-11-05 18:05:46 +0000 | |||
1171 | +++ ubuntuone/storageprotocol/validators.py 2012-04-03 12:15:42 +0000 | |||
1172 | @@ -1,6 +1,31 @@ | |||
1176 | 1 | """ | 1 | # |
1177 | 2 | Message validation. | 2 | # Copyright (C) 2009-2012 Canonical Ltd. |
1178 | 3 | """ | 3 | # |
1179 | 4 | # This program is free software: you can redistribute it and/or modify it | ||
1180 | 5 | # under the terms of the GNU Affero General Public License version 3, | ||
1181 | 6 | # as published by the Free Software Foundation. | ||
1182 | 7 | # | ||
1183 | 8 | # This program is distributed in the hope that it will be useful, but | ||
1184 | 9 | # WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1185 | 10 | # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1186 | 11 | # PURPOSE. See the GNU Affero General Public License for more details. | ||
1187 | 12 | # | ||
1188 | 13 | # You should have received a copy of the GNU Affero General Public License | ||
1189 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1190 | 15 | # | ||
1191 | 16 | # In addition, as a special exception, the copyright holders give | ||
1192 | 17 | # permission to link the code of portions of this program with the | ||
1193 | 18 | # OpenSSL library under certain conditions as described in each | ||
1194 | 19 | # individual source file, and distribute linked combinations | ||
1195 | 20 | # including the two. | ||
1196 | 21 | # You must obey the GNU General Public License in all respects | ||
1197 | 22 | # for all of the code used other than OpenSSL. If you modify | ||
1198 | 23 | # file(s) with this exception, you may extend this exception to your | ||
1199 | 24 | # version of the file(s), but you are not obligated to do so. If you | ||
1200 | 25 | # do not wish to do so, delete this exception statement from your | ||
1201 | 26 | # version. If you delete this exception statement from all source | ||
1202 | 27 | # files in the program, then also delete it here. | ||
1203 | 28 | """Message validation.""" | ||
1204 | 4 | 29 | ||
1205 | 5 | import re | 30 | import re |
1206 | 6 | from uuid import UUID | 31 | from uuid import UUID |
1207 | 7 | 32 | ||
1208 | === modified file 'ubuntuone/storageprotocol/volumes.py' | |||
1209 | --- ubuntuone/storageprotocol/volumes.py 2010-11-05 18:05:46 +0000 | |||
1210 | +++ ubuntuone/storageprotocol/volumes.py 2012-04-03 12:15:42 +0000 | |||
1211 | @@ -2,7 +2,7 @@ | |||
1212 | 2 | # | 2 | # |
1213 | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> | 3 | # Author: Natalia B. Bidart <natalia.bidart@canonical.com> |
1214 | 4 | # | 4 | # |
1216 | 5 | # Copyright 2009 Canonical Ltd. | 5 | # Copyright 2009-2012 Canonical Ltd. |
1217 | 6 | # | 6 | # |
1218 | 7 | # This program is free software: you can redistribute it and/or modify it | 7 | # This program is free software: you can redistribute it and/or modify it |
1219 | 8 | # under the terms of the GNU Affero General Public License version 3, | 8 | # under the terms of the GNU Affero General Public License version 3, |
1220 | @@ -15,6 +15,19 @@ | |||
1221 | 15 | # | 15 | # |
1222 | 16 | # You should have received a copy of the GNU Affero General Public License | 16 | # You should have received a copy of the GNU Affero General Public License |
1223 | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
1224 | 18 | # | ||
1225 | 19 | # In addition, as a special exception, the copyright holders give | ||
1226 | 20 | # permission to link the code of portions of this program with the | ||
1227 | 21 | # OpenSSL library under certain conditions as described in each | ||
1228 | 22 | # individual source file, and distribute linked combinations | ||
1229 | 23 | # including the two. | ||
1230 | 24 | # You must obey the GNU General Public License in all respects | ||
1231 | 25 | # for all of the code used other than OpenSSL. If you modify | ||
1232 | 26 | # file(s) with this exception, you may extend this exception to your | ||
1233 | 27 | # version of the file(s), but you are not obligated to do so. If you | ||
1234 | 28 | # do not wish to do so, delete this exception statement from your | ||
1235 | 29 | # version. If you delete this exception statement from all source | ||
1236 | 30 | # files in the program, then also delete it here. | ||
1237 | 18 | """The volumes abstraction.""" | 31 | """The volumes abstraction.""" |
1238 | 19 | 32 | ||
1239 | 20 | import uuid | 33 | import uuid |
+1