Merge lp:~nataliabidart/magicicada-protocol/change-python-namespace into lp:magicicada-protocol

Proposed by Natalia Bidart on 2018-04-14
Status: Merged
Approved by: Natalia Bidart on 2018-04-18
Approved revision: 173
Merged at revision: 173
Proposed branch: lp:~nataliabidart/magicicada-protocol/change-python-namespace
Merge into: lp:magicicada-protocol
Diff against target: 665 lines (+61/-148)
36 files modified
.bzrignore (+0/-4)
HACKING (+0/-33)
MANIFEST.in (+2/-5)
Makefile (+3/-3)
README (+2/-15)
magicicadaprotocol/__init__.py (+1/-1)
magicicadaprotocol/client.py (+2/-2)
magicicadaprotocol/delta.py (+1/-1)
magicicadaprotocol/dircontent.proto (+2/-2)
magicicadaprotocol/dircontent.py (+2/-1)
magicicadaprotocol/errors.py (+2/-2)
magicicadaprotocol/protocol.proto (+2/-2)
magicicadaprotocol/request.py (+2/-2)
magicicadaprotocol/sharersp.py (+1/-1)
magicicadaprotocol/tests/__init__.py (+1/-1)
magicicadaprotocol/tests/test_bytesproducer.py (+1/-1)
magicicadaprotocol/tests/test_client.py (+3/-4)
magicicadaprotocol/tests/test_context.py (+1/-1)
magicicadaprotocol/tests/test_delta_info.py (+1/-1)
magicicadaprotocol/tests/test_dircontent.py (+4/-3)
magicicadaprotocol/tests/test_errors.py (+1/-1)
magicicadaprotocol/tests/test_hashes.py (+1/-1)
magicicadaprotocol/tests/test_proxy_tunnel.py (+2/-1)
magicicadaprotocol/tests/test_public_file_info.py (+1/-1)
magicicadaprotocol/tests/test_putcontent.py (+3/-4)
magicicadaprotocol/tests/test_query.py (+1/-1)
magicicadaprotocol/tests/test_request.py (+2/-2)
magicicadaprotocol/tests/test_sharersp.py (+2/-2)
magicicadaprotocol/tests/test_throttling.py (+1/-1)
magicicadaprotocol/tests/test_volumes.py (+1/-1)
magicicadaprotocol/validators.py (+2/-2)
magicicadaprotocol/volumes.py (+1/-1)
samples/easy_client.py (+4/-4)
samples/ping_client.py (+2/-3)
setup.py (+4/-5)
ubuntuone/__init__.py (+0/-33)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-protocol/change-python-namespace
Reviewer Review Type Date Requested Status
Facundo Batista 2018-04-14 Approve on 2018-04-18
Review via email: mp+343269@code.launchpad.net

Commit message

- Renamed python module to magicicadaprotocol, removing the need of the namespace package "ubuntuone".

To post a comment you must log in.
Facundo Batista (facundo) wrote :

Go!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2018-04-08 19:22:33 +0000
3+++ .bzrignore 2018-04-14 22:31:56 +0000
4@@ -1,11 +1,7 @@
5 MANIFEST
6 build
7-debian/files
8-debian/ubuntuone-storage-protocol
9 dist
10 _trial_temp
11-*.debhelper*
12-*.substvars
13 *_pb2.py
14 *.pyc
15 *.egg-info
16
17=== removed file 'HACKING'
18--- HACKING 2010-11-12 14:36:58 +0000
19+++ HACKING 1970-01-01 00:00:00 +0000
20@@ -1,33 +0,0 @@
21-Ubuntu One requires acceptance of the Canonical Contributor Agreement. You
22-will need to follow the instructions at:
23-
24-http://www.canonical.com/contributors
25-
26-Once the agreement is accepted, you will be added to the Ubuntu One Contributor
27-Agreement team on Launchpad, so that your branches may be merged in upstream.
28-
29-
30-In order to run tests in ubuntuone-storage-protocol, you will first need
31-to build the portion of code which uses Google Protocol Buffers.
32-
33-$: ./setup.py build
34-
35-Then you will need to run the tests. This will run lint and style checkers,
36-and the unit tests for the package.
37-
38-$: ./run-tests
39-
40-
41-Ubuntu One uses branch based development on Launchpad, and bugs to track
42-features and issues. Make sure a bug is filed for the piece of code you wish
43-to work on. When committing your changes, be sure to specify the bug # it
44-fixes using the --fixes option in bzr.
45-
46-$: bzr commit --fixes=lp:<BUGNUMBER>
47-
48-If you forget to do this, you can link the branch manually on the Launchpad
49-web page. After pushing your branch to Launchpad, you will need to propose it
50-for merging into the parent branch. You can do this from the Launchpad web
51-page for your branch. In order for your branch to be accepted, you will have
52-to have accepted the Canonical Contributor Agreement as stated above, and
53-there will need to be at least two approvals from Ubuntu One developers.
54
55=== modified file 'MANIFEST.in'
56--- MANIFEST.in 2013-05-23 18:58:06 +0000
57+++ MANIFEST.in 2018-04-14 22:31:56 +0000
58@@ -1,8 +1,5 @@
59 include MANIFEST.in
60-include COPYING HACKING README README.windows
61+include COPYING README
62 include LICENSE LICENSE.OpenSSL
63-include run-tests
64-include *.pth
65-recursive-include ubuntuone *.proto
66+recursive-include magicicadaprotocol *.proto
67 recursive-include samples *.py
68-recursive-include tests *.py
69
70=== modified file 'Makefile'
71--- Makefile 2018-04-08 19:22:33 +0000
72+++ Makefile 2018-04-14 22:31:56 +0000
73@@ -16,7 +16,7 @@
74 # For further info, check http://launchpad.net/magicicada-protocol
75
76 ENV = $(CURDIR)/.env
77-SRC_DIR = $(CURDIR)/ubuntuone
78+SRC_DIR = $(CURDIR)/magicicadaprotocol
79 PATH := $(ENV)/bin:$(PATH)
80 PYTHON = $(ENV)/bin/python
81 PYTHONPATH := $(ENV)/lib/python2.7:$(ENV)/lib/python2.7/site-packages:$(SRC_DIR):$(PYTHONPATH)
82@@ -49,12 +49,12 @@
83 $(ENV)/bin/twine upload dist/*.whl
84
85 test: lint
86- SSL_CERTIFICATES_DIR=ubuntuone/storageprotocol/tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python $(ENV)/bin/trial ubuntuone
87+ SSL_CERTIFICATES_DIR=$(SRC_DIR)/tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python $(ENV)/bin/trial magicicadaprotocol
88
89 clean:
90 $(PYTHON) setup.py clean
91 find -name '*.pyc' -delete
92- rm -rf build dist sdist _trial_temp ubuntuone_storageprotocol.egg-info
93+ rm -rf build dist sdist _trial_temp magicicadaprotocol.egg-info
94
95 lint: $(ENV)
96 $(ENV)/bin/flake8 --filename='*.py' --exclude='$(ENV),*_pb2.py,build'
97
98=== modified file 'README'
99--- README 2009-06-06 01:25:56 +0000
100+++ README 2018-04-14 22:31:56 +0000
101@@ -1,18 +1,5 @@
102 This package contains definitions for the protocol messages used by the
103-Ubuntu One file storage/sharing service, as well as python code for a
104-minimal client to talk directly to the storage servers. Python code for
105-local/offline functionality may be found in the ubuntuone-client package
106-instead, as part of the official clients.
107-
108-This protocol applies only to the file storage service and not other
109-Ubuntu One services.
110-
111-===
112-
113-Note: contributions to this package are accepted only from those who have
114-signed the Ubuntu One Contributor agreement:
115-
116- https://launchpad.net/~ubuntuone-contributor-agreement
117+Magicicada file storage/sharing service (open source fork of Ubuntu One).
118
119 ===
120
121@@ -29,7 +16,7 @@
122 doing, if you are installing on an Ubuntu system it is probably better
123 to build and install a Debian package. Recent versions of Ubuntu do not
124 load python modules from /usr/local by default, and you are likely to
125-already have an installed ubuntuone-storage-protocol package in any case.
126+already have an installed magicicadaprotocol package in any case.
127
128 Protocol Overview:
129
130
131=== renamed directory 'ubuntuone/storageprotocol' => 'magicicadaprotocol'
132=== modified file 'magicicadaprotocol/__init__.py'
133--- ubuntuone/storageprotocol/__init__.py 2018-04-08 19:38:42 +0000
134+++ magicicadaprotocol/__init__.py 2018-04-14 22:31:56 +0000
135@@ -28,4 +28,4 @@
136 # version. If you delete this exception statement from all source
137 # files in the program, then also delete it here.
138
139-"""ubuntuone.storageprotocol package."""
140+"""magicicadaprotocol package."""
141
142=== modified file 'magicicadaprotocol/client.py'
143--- ubuntuone/storageprotocol/client.py 2018-04-08 19:38:42 +0000
144+++ magicicadaprotocol/client.py 2018-04-14 22:31:56 +0000
145@@ -40,7 +40,7 @@
146 from twisted.internet import reactor, defer
147 from twisted.python import log
148
149-from ubuntuone.storageprotocol import (
150+from magicicadaprotocol import (
151 delta,
152 protocol_pb2,
153 public_file_info,
154@@ -1896,7 +1896,7 @@
155 # ssl.ClientContextFactory())
156
157 # using ssl over a proxy
158- # from ubuntuone.storageprotocol import proxy_tunnel
159+ # from magicicadaprotocol import proxy_tunnel
160 # proxy_tunnel.connectHTTPS('localhost', 3128,
161 # 'localhost', 20101, StorageClientFactory(),
162 # user="test", passwd="test")
163
164=== modified file 'magicicadaprotocol/delta.py'
165--- ubuntuone/storageprotocol/delta.py 2018-04-08 19:38:42 +0000
166+++ magicicadaprotocol/delta.py 2018-04-14 22:31:56 +0000
167@@ -30,7 +30,7 @@
168
169 """Provides wrapper classes for delta nodes messages."""
170
171-from ubuntuone.storageprotocol import protocol_pb2
172+from magicicadaprotocol import protocol_pb2
173
174 FILE = 0
175 DIRECTORY = 1
176
177=== modified file 'magicicadaprotocol/dircontent.proto'
178--- ubuntuone/storageprotocol/dircontent.proto 2018-04-08 19:38:42 +0000
179+++ magicicadaprotocol/dircontent.proto 2018-04-14 22:31:56 +0000
180@@ -27,9 +27,9 @@
181 version. If you delete this exception statement from all source
182 files in the program, then also delete it here.
183 */
184-package ubuntuone.storageprotocol;
185+package magicicadaprotocol;
186
187-option java_package = "com.ubuntuone.storageprotocol";
188+option java_package = "com.magicicadaprotocol";
189 option java_outer_classname = "DirectoryContentProtocol";
190
191 enum NodeType {
192
193=== modified file 'magicicadaprotocol/dircontent.py'
194--- ubuntuone/storageprotocol/dircontent.py 2018-04-08 19:38:42 +0000
195+++ magicicadaprotocol/dircontent.py 2018-04-14 22:31:56 +0000
196@@ -31,7 +31,8 @@
197 """Standard routines for working with directory content."""
198
199 import re
200-from ubuntuone.storageprotocol.dircontent_pb2 import DirectoryContent
201+
202+from magicicadaprotocol.dircontent_pb2 import DirectoryContent
203
204 ILLEGAL_FILENAMES = [u".", u".."]
205 ILLEGAL_FILENAME_CHARS_RE_SOURCE = r'[\000/]'
206
207=== modified file 'magicicadaprotocol/errors.py'
208--- ubuntuone/storageprotocol/errors.py 2018-04-08 19:38:42 +0000
209+++ magicicadaprotocol/errors.py 2018-04-14 22:31:56 +0000
210@@ -32,7 +32,7 @@
211
212 import uuid
213
214-from ubuntuone.storageprotocol import protocol_pb2
215+from magicicadaprotocol import protocol_pb2
216
217
218 class StorageProtocolError(Exception):
219@@ -149,7 +149,7 @@
220 share_id will be None if we got the exception without free space info.
221 """
222 # to avoid circular dependencies
223- from ubuntuone.storageprotocol.request import ROOT
224+ from magicicadaprotocol.request import ROOT
225 super(QuotaExceededError, self).__init__(request, message)
226 self.free_bytes = message.free_space_info.free_bytes
227 if message.free_space_info.share_id:
228
229=== modified file 'magicicadaprotocol/protocol.proto'
230--- ubuntuone/storageprotocol/protocol.proto 2018-04-08 19:38:42 +0000
231+++ magicicadaprotocol/protocol.proto 2018-04-14 22:31:56 +0000
232@@ -27,9 +27,9 @@
233 version. If you delete this exception statement from all source
234 files in the program, then also delete it here.
235 */
236-package ubuntuone.storageprotocol;
237+package magicicadaprotocol;
238
239-option java_package = "com.ubuntuone.storageprotocol";
240+option java_package = "com.magicicadaprotocol";
241 option java_outer_classname = "StorageProtocol";
242
243 message Message {
244
245=== modified file 'magicicadaprotocol/request.py'
246--- ubuntuone/storageprotocol/request.py 2018-04-08 19:38:42 +0000
247+++ magicicadaprotocol/request.py 2018-04-14 22:31:56 +0000
248@@ -43,8 +43,8 @@
249 from twisted.internet import defer
250 from zope.interface import implements
251
252-from ubuntuone.storageprotocol import protocol_pb2, validators
253-from ubuntuone.storageprotocol.errors import (
254+from magicicadaprotocol import protocol_pb2, validators
255+from magicicadaprotocol.errors import (
256 StorageProtocolError, StorageProtocolErrorSizeTooBig,
257 StorageProtocolProtocolError, StorageRequestError,
258 RequestCancelledError, error_to_exception)
259
260=== modified file 'magicicadaprotocol/sharersp.py'
261--- ubuntuone/storageprotocol/sharersp.py 2018-04-08 19:38:42 +0000
262+++ magicicadaprotocol/sharersp.py 2018-04-14 22:31:56 +0000
263@@ -32,7 +32,7 @@
264
265 import uuid
266
267-from ubuntuone.storageprotocol import volumes
268+from magicicadaprotocol import volumes
269
270
271 class ShareResponse(object):
272
273=== modified file 'magicicadaprotocol/tests/__init__.py'
274--- ubuntuone/storageprotocol/tests/__init__.py 2018-04-08 19:38:42 +0000
275+++ magicicadaprotocol/tests/__init__.py 2018-04-14 22:31:56 +0000
276@@ -26,4 +26,4 @@
277 # version. If you delete this exception statement from all source
278 # files in the program, then also delete it here.
279
280-"""Tests for ubuntuone.storageprotocol."""
281+"""Tests for magicicadaprotocol."""
282
283=== modified file 'magicicadaprotocol/tests/test_bytesproducer.py'
284--- ubuntuone/storageprotocol/tests/test_bytesproducer.py 2018-04-08 19:38:42 +0000
285+++ magicicadaprotocol/tests/test_bytesproducer.py 2018-04-14 22:31:56 +0000
286@@ -38,7 +38,7 @@
287 from twisted.internet import defer, task
288 from twisted.trial.unittest import TestCase as TwistedTestCase
289
290-from ubuntuone.storageprotocol import client, protocol_pb2
291+from magicicadaprotocol import client, protocol_pb2
292
293
294 class FakeRequest(object):
295
296=== modified file 'magicicadaprotocol/tests/test_client.py'
297--- ubuntuone/storageprotocol/tests/test_client.py 2018-04-08 19:38:42 +0000
298+++ magicicadaprotocol/tests/test_client.py 2018-04-14 22:31:56 +0000
299@@ -42,8 +42,8 @@
300 from twisted.trial.unittest import TestCase as TwistedTestCase
301 from twisted.web import server, resource
302
303-from ubuntuone.storageprotocol import protocol_pb2, sharersp, delta, request
304-from ubuntuone.storageprotocol.client import (
305+from magicicadaprotocol import delta, protocol_pb2, request, sharersp, volumes
306+from magicicadaprotocol.client import (
307 Authenticate,
308 BytesMessageProducer,
309 ChangePublicAccess,
310@@ -60,8 +60,7 @@
311 Unlink,
312 )
313
314-from ubuntuone.storageprotocol import volumes
315-from ubuntuone.storageprotocol.tests import test_delta_info
316+from magicicadaprotocol.tests import test_delta_info
317
318
319 PATH = u'~/Documents/pdfs/moño/'
320
321=== modified file 'magicicadaprotocol/tests/test_context.py'
322--- ubuntuone/storageprotocol/tests/test_context.py 2018-04-08 19:38:42 +0000
323+++ magicicadaprotocol/tests/test_context.py 2018-04-14 22:31:56 +0000
324@@ -35,7 +35,7 @@
325 from twisted.trial import unittest
326 from twisted.web import client, resource, server
327
328-from ubuntuone.storageprotocol import context
329+from magicicadaprotocol import context
330
331
332 class FakeCerts(object):
333
334=== modified file 'magicicadaprotocol/tests/test_delta_info.py'
335--- ubuntuone/storageprotocol/tests/test_delta_info.py 2018-04-08 19:38:42 +0000
336+++ magicicadaprotocol/tests/test_delta_info.py 2018-04-14 22:31:56 +0000
337@@ -32,7 +32,7 @@
338
339 import unittest
340
341-from ubuntuone.storageprotocol import (
342+from magicicadaprotocol import (
343 protocol_pb2,
344 delta,
345 content_hash,
346
347=== modified file 'magicicadaprotocol/tests/test_dircontent.py'
348--- ubuntuone/storageprotocol/tests/test_dircontent.py 2018-04-08 19:38:42 +0000
349+++ magicicadaprotocol/tests/test_dircontent.py 2018-04-14 22:31:56 +0000
350@@ -33,11 +33,12 @@
351 from __future__ import with_statement
352
353 from cStringIO import StringIO
354-from ubuntuone.storageprotocol.dircontent import (
355+from unittest import TestCase
356+
357+from magicicadaprotocol.dircontent import (
358 parse_dir_content, write_dir_content, DirEntry,
359 normalize_filename, validate_filename, InvalidFilename)
360-from ubuntuone.storageprotocol.dircontent_pb2 import (DIRECTORY, FILE)
361-from unittest import TestCase
362+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, FILE
363
364
365 class TestFilenames(TestCase):
366
367=== modified file 'magicicadaprotocol/tests/test_errors.py'
368--- ubuntuone/storageprotocol/tests/test_errors.py 2018-04-08 19:38:42 +0000
369+++ magicicadaprotocol/tests/test_errors.py 2018-04-14 22:31:56 +0000
370@@ -33,7 +33,7 @@
371 import unittest
372 import uuid
373
374-from ubuntuone.storageprotocol import errors, protocol_pb2
375+from magicicadaprotocol import errors, protocol_pb2
376
377 REQ_ARGS = dict(request=None, message=protocol_pb2.Message())
378
379
380=== modified file 'magicicadaprotocol/tests/test_hashes.py'
381--- ubuntuone/storageprotocol/tests/test_hashes.py 2018-04-08 19:38:42 +0000
382+++ magicicadaprotocol/tests/test_hashes.py 2018-04-14 22:31:56 +0000
383@@ -35,7 +35,7 @@
384 import pickle
385 import unittest
386
387-from ubuntuone.storageprotocol.content_hash import (
388+from magicicadaprotocol.content_hash import (
389 MagicContentHash,
390 SHA1ContentHash,
391 content_hash_factory,
392
393=== modified file 'magicicadaprotocol/tests/test_proxy_tunnel.py'
394--- ubuntuone/storageprotocol/tests/test_proxy_tunnel.py 2018-04-08 19:38:42 +0000
395+++ magicicadaprotocol/tests/test_proxy_tunnel.py 2018-04-14 22:31:56 +0000
396@@ -36,7 +36,8 @@
397 from twisted.internet import defer
398 from twisted.trial.unittest import TestCase as TwistedTestCase
399 from twisted.test.proto_helpers import StringTransport
400-from ubuntuone.storageprotocol.proxy_tunnel import ProxyTunnelFactory
401+
402+from magicicadaprotocol.proxy_tunnel import ProxyTunnelFactory
403
404
405 class FakeTransport(StringTransport):
406
407=== modified file 'magicicadaprotocol/tests/test_public_file_info.py'
408--- ubuntuone/storageprotocol/tests/test_public_file_info.py 2018-04-08 19:38:42 +0000
409+++ magicicadaprotocol/tests/test_public_file_info.py 2018-04-14 22:31:56 +0000
410@@ -31,7 +31,7 @@
411
412 import unittest
413
414-from ubuntuone.storageprotocol import protocol_pb2, public_file_info, request
415+from magicicadaprotocol import protocol_pb2, public_file_info, request
416
417 SHARE = "share_id"
418 NODE = "node_id"
419
420=== modified file 'magicicadaprotocol/tests/test_putcontent.py'
421--- ubuntuone/storageprotocol/tests/test_putcontent.py 2018-04-08 19:38:42 +0000
422+++ magicicadaprotocol/tests/test_putcontent.py 2018-04-14 22:31:56 +0000
423@@ -34,12 +34,11 @@
424
425 from StringIO import StringIO
426
427+from mocker import Mocker, ANY
428 from twisted.test.proto_helpers import StringTransport
429
430-from ubuntuone.storageprotocol.client import PutContent, StorageClient
431-from ubuntuone.storageprotocol import request
432-from ubuntuone.storageprotocol import protocol_pb2
433-from mocker import Mocker, ANY
434+from magicicadaprotocol import protocol_pb2, request
435+from magicicadaprotocol.client import PutContent, StorageClient
436
437
438 class TestOffset(unittest.TestCase):
439
440=== modified file 'magicicadaprotocol/tests/test_query.py'
441--- ubuntuone/storageprotocol/tests/test_query.py 2018-04-08 19:38:42 +0000
442+++ magicicadaprotocol/tests/test_query.py 2018-04-14 22:31:56 +0000
443@@ -33,7 +33,7 @@
444 import os
445 import unittest
446
447-from ubuntuone.storageprotocol.client import MultiQuery
448+from magicicadaprotocol.client import MultiQuery
449
450
451 class TestQuery10(unittest.TestCase):
452
453=== modified file 'magicicadaprotocol/tests/test_request.py'
454--- ubuntuone/storageprotocol/tests/test_request.py 2018-04-08 19:38:42 +0000
455+++ magicicadaprotocol/tests/test_request.py 2018-04-14 22:31:56 +0000
456@@ -38,8 +38,8 @@
457 from twisted.python.failure import Failure
458 from twisted.trial.unittest import TestCase as TwistedTestCase
459
460-from ubuntuone.storageprotocol import errors, protocol_pb2
461-from ubuntuone.storageprotocol.request import (
462+from magicicadaprotocol import errors, protocol_pb2
463+from magicicadaprotocol.request import (
464 RequestHandler, Request, RequestResponse)
465
466
467
468=== modified file 'magicicadaprotocol/tests/test_sharersp.py'
469--- ubuntuone/storageprotocol/tests/test_sharersp.py 2018-04-08 19:38:42 +0000
470+++ magicicadaprotocol/tests/test_sharersp.py 2018-04-14 22:31:56 +0000
471@@ -35,8 +35,8 @@
472 from twisted.internet import defer
473 from twisted.trial.unittest import TestCase
474
475-from ubuntuone.storageprotocol.sharersp import ShareResponse
476-from ubuntuone.storageprotocol import protocol_pb2
477+from magicicadaprotocol import protocol_pb2
478+from magicicadaprotocol.sharersp import ShareResponse
479
480
481 class ShareResponseFromParamsTest(TestCase):
482
483=== modified file 'magicicadaprotocol/tests/test_throttling.py'
484--- ubuntuone/storageprotocol/tests/test_throttling.py 2018-04-08 19:38:42 +0000
485+++ magicicadaprotocol/tests/test_throttling.py 2018-04-14 22:31:56 +0000
486@@ -35,7 +35,7 @@
487 from twisted.internet import defer, task
488 from twisted.trial.unittest import TestCase as TwistedTestCase
489
490-from ubuntuone.storageprotocol import client
491+from magicicadaprotocol import client
492
493
494 class FakeClient(object):
495
496=== modified file 'magicicadaprotocol/tests/test_volumes.py'
497--- ubuntuone/storageprotocol/tests/test_volumes.py 2018-04-08 19:38:42 +0000
498+++ magicicadaprotocol/tests/test_volumes.py 2018-04-14 22:31:56 +0000
499@@ -35,7 +35,7 @@
500
501 from copy import copy
502
503-from ubuntuone.storageprotocol import protocol_pb2, volumes
504+from magicicadaprotocol import protocol_pb2, volumes
505
506 PATH = u'~/Documents/pdfs/moño/'
507 NAME = u'What a beatiful volume'
508
509=== modified file 'magicicadaprotocol/validators.py'
510--- ubuntuone/storageprotocol/validators.py 2018-04-08 19:38:42 +0000
511+++ magicicadaprotocol/validators.py 2018-04-14 22:31:56 +0000
512@@ -84,7 +84,7 @@
513
514 """
515 # circular import
516- from ubuntuone.storageprotocol import request
517+ from magicicadaprotocol import request
518 is_valid = (a_hash == '' or a_hash == request.UNKNOWN_HASH or
519 is_valid_sha1(a_hash))
520 return is_valid
521@@ -95,7 +95,7 @@
522 Recursively validate a message's fields
523 """
524 is_invalid = []
525- from ubuntuone.storageprotocol import validators # this is us!
526+ from magicicadaprotocol import validators # this is us!
527 for descriptor, submsg in message.ListFields():
528 if isinstance(submsg, CONTAINER_CLASSES):
529 # containers are iterables that have messages in them
530
531=== modified file 'magicicadaprotocol/volumes.py'
532--- ubuntuone/storageprotocol/volumes.py 2018-04-08 19:38:42 +0000
533+++ magicicadaprotocol/volumes.py 2018-04-14 22:31:56 +0000
534@@ -32,7 +32,7 @@
535
536 import uuid
537
538-from ubuntuone.storageprotocol import protocol_pb2
539+from magicicadaprotocol import protocol_pb2
540
541 _direction_prot2nice = {
542 protocol_pb2.Shares.FROM_ME: "from_me",
543
544=== modified file 'samples/easy_client.py'
545--- samples/easy_client.py 2018-04-08 19:38:42 +0000
546+++ samples/easy_client.py 2018-04-14 22:31:56 +0000
547@@ -38,10 +38,10 @@
548
549 from twisted.internet import reactor, defer
550
551-from ubuntuone.storageprotocol.client import (
552+from magicicadaprotocol import request, protocol_pb2
553+from magicicadaprotocol.client import (
554 StorageClientFactory, StorageClient)
555-from ubuntuone.storageprotocol import request, protocol_pb2
556-from ubuntuone.storageprotocol.dircontent_pb2 import (
557+from magicicadaprotocol.dircontent_pb2 import (
558 DirectoryContent, DIRECTORY)
559
560
561@@ -302,7 +302,7 @@
562 NUM_CLIENTS = 200
563 NUM_FILES = 50
564
565- port_num = int(open("tmp/ubuntuone-api.port").read())
566+ port_num = int(open("tmp/magicicada-api.port").read())
567 deferred = authenticated_client("localhost", int(port_num))
568 deferred.addCallback(create_dirs, NUM_CLIENTS)
569
570
571=== modified file 'samples/ping_client.py'
572--- samples/ping_client.py 2018-04-08 19:38:42 +0000
573+++ samples/ping_client.py 2018-04-14 22:31:56 +0000
574@@ -32,8 +32,7 @@
575
576 from twisted.internet import reactor
577
578-from ubuntuone.storageprotocol.client import (
579- StorageClientFactory, StorageClient)
580+from magicicadaprotocol.client import StorageClientFactory, StorageClient
581
582
583 class PingClient(StorageClient):
584@@ -83,7 +82,7 @@
585 # ssl.ClientContextFactory())
586
587 # using ssl over a proxy
588- # from ubuntuone.storageprotocol import proxy_tunnel
589+ # from magicicadaprotocol import proxy_tunnel
590 # proxy_tunnel.connectHTTPS('localhost', 3128,
591 # 'localhost', 20101, StorageClientFactory(),
592 # user="test", passwd="test")
593
594=== modified file 'setup.py'
595--- setup.py 2018-04-14 22:08:27 +0000
596+++ setup.py 2018-04-14 22:31:56 +0000
597@@ -39,7 +39,7 @@
598 " package installed?\n")
599 sys.exit(-1)
600
601- for source in glob.glob('ubuntuone/storageprotocol/*.proto'):
602+ for source in glob.glob('magicicadaprotocol/*.proto'):
603 # glob works with unix and does not like \ in the search path,
604 # we use / and correct the issue on windows when appropiate
605 if sys.platform == "win32":
606@@ -58,7 +58,7 @@
607
608 def run(self):
609 """Do the clean up"""
610- for source in glob.glob("ubuntuone/storageprotocol/*_pb2.py"):
611+ for source in glob.glob("magicicadaprotocol/*_pb2.py"):
612 os.unlink(source)
613
614 # Call the parent class clean command
615@@ -66,9 +66,8 @@
616
617
618 setup(
619- name='ubuntuone-storageprotocol',
620- namespace_packages=['ubuntuone'],
621- version='1.0',
622+ name='magicicadaprotocol',
623+ version='2.0',
624 description=(
625 'The protocol implementation for the Magicicada filesync server '
626 '(open source fork of the Ubuntu One filesync).'),
627
628=== removed directory 'ubuntuone'
629=== removed file 'ubuntuone/__init__.py'
630--- ubuntuone/__init__.py 2018-04-08 19:38:42 +0000
631+++ ubuntuone/__init__.py 1970-01-01 00:00:00 +0000
632@@ -1,33 +0,0 @@
633-# -*- coding: utf-8 -*-
634-#
635-# Copyright 2009-2012 Canonical Ltd.
636-# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
637-#
638-# This program is free software: you can redistribute it and/or modify it
639-# under the terms of the GNU Affero General Public License version 3,
640-# as published by the Free Software Foundation.
641-#
642-# This program is distributed in the hope that it will be useful, but
643-# WITHOUT ANY WARRANTY; without even the implied warranties of
644-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
645-# PURPOSE. See the GNU Affero General Public License for more details.
646-#
647-# You should have received a copy of the GNU Affero General Public License
648-# along with this program. If not, see <http://www.gnu.org/licenses/>.
649-#
650-# In addition, as a special exception, the copyright holders give
651-# permission to link the code of portions of this program with the
652-# OpenSSL library under certain conditions as described in each
653-# individual source file, and distribute linked combinations
654-# including the two.
655-# You must obey the GNU General Public License in all respects
656-# for all of the code used other than OpenSSL. If you modify
657-# file(s) with this exception, you may extend this exception to your
658-# version of the file(s), but you are not obligated to do so. If you
659-# do not wish to do so, delete this exception statement from your
660-# version. If you delete this exception statement from all source
661-# files in the program, then also delete it here.
662-
663-"""ubuntuone package."""
664-
665-__import__('pkg_resources').declare_namespace(__name__)

Subscribers

People subscribed via source and target branches

to all changes: