Merge lp:~nataliabidart/magicicada-server/use-protocol-2.0-from-wheel into lp:magicicada-server

Proposed by Natalia Bidart on 2018-04-27
Status: Merged
Approved by: Natalia Bidart on 2018-05-06
Approved revision: 90
Merged at revision: 91
Proposed branch: lp:~nataliabidart/magicicada-server/use-protocol-2.0-from-wheel
Merge into: lp:magicicada-server
Diff against target: 681 lines (+70/-83)
40 files modified
Makefile (+0/-6)
config-manager.txt (+1/-1)
magicicada/server/content.py (+1/-1)
magicicada/server/errors.py (+1/-2)
magicicada/server/integtests/test_action_queue.py (+2/-2)
magicicada/server/integtests/test_aq_cancel.py (+2/-2)
magicicada/server/integtests/test_cleanup.py (+1/-1)
magicicada/server/integtests/test_server_scan.py (+2/-2)
magicicada/server/integtests/test_share_sync.py (+1/-1)
magicicada/server/integtests/test_sync.py (+4/-6)
magicicada/server/server.py (+1/-1)
magicicada/server/testing/aq_helpers.py (+2/-2)
magicicada/server/testing/testcase.py (+2/-3)
magicicada/server/tests/test_account.py (+1/-1)
magicicada/server/tests/test_auth.py (+1/-1)
magicicada/server/tests/test_basic.py (+1/-1)
magicicada/server/tests/test_content.py (+6/-6)
magicicada/server/tests/test_fileops.py (+2/-3)
magicicada/server/tests/test_generations.py (+1/-1)
magicicada/server/tests/test_make.py (+2/-2)
magicicada/server/tests/test_notify_delivery.py (+1/-1)
magicicada/server/tests/test_server.py (+1/-1)
magicicada/server/tests/test_sharing.py (+2/-2)
magicicada/server/tests/test_shutdown.py (+3/-4)
magicicada/server/tests/test_ssl_proxy.py (+1/-2)
magicicada/server/tests/test_throttling.py (+2/-2)
magicicada/server/tests/test_udfs.py (+2/-2)
magicicada/server/tests/test_upload.py (+2/-2)
magicicada/server/tests/test_validation.py (+1/-1)
magicicada/server/tests/test_volumes.py (+2/-3)
magicicada/server/upload.py (+2/-2)
magicicada/u1sync/client.py (+7/-7)
magicicada/u1sync/genericmerge.py (+1/-1)
magicicada/u1sync/main.py (+2/-2)
magicicada/u1sync/merge.py (+1/-1)
magicicada/u1sync/metadata.py (+1/-1)
magicicada/u1sync/scan.py (+1/-1)
magicicada/u1sync/sync.py (+2/-2)
magicicada/u1sync/tests/test_merge.py (+1/-1)
requirements.txt (+1/-0)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-server/use-protocol-2.0-from-wheel
Reviewer Review Type Date Requested Status
Facundo Batista 2018-04-27 Approve on 2018-05-06
Review via email: mp+344567@code.launchpad.net

Commit message

- Use magicicadaprotocol 2.0

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

Awesome!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2018-04-20 01:22:24 +0000
3+++ Makefile 2018-04-27 03:13:22 +0000
4@@ -27,9 +27,6 @@
5 DJANGO_MANAGE = $(PYTHON) manage.py
6
7 MAKEFLAGS:=$(MAKEFLAGS) --no-print-directory
8-# use protobuf cpp
9-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
10-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
11
12 START_SUPERVISORD = lib/ubuntuone/supervisor/start-supervisord.py
13 SUPERVISOR_CTL = $(ENV)/bin/supervisorctl
14@@ -37,8 +34,6 @@
15 export PATH
16 export PYTHONPATH
17 export DJANGO_SETTINGS_MODULE
18-export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION
19-export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION
20 export ROOTDIR ?= $(CURDIR)
21
22 SOURCEDEPS_TAG = .sourcecode/sourcedeps-tag
23@@ -101,7 +96,6 @@
24 test -d $(ENV) || virtualenv $(ENV)
25 $(ENV)/bin/pip install -Ur requirements.txt
26 $(ENV)/bin/pip install -Ur requirements-devel.txt
27- $(ENV)/bin/pip install ubuntuone-storageprotocol --no-deps -t "$(TARGET_SOURCECODE_DIR)/magicicada-protocol"
28 touch $(ENV)/bin/activate
29
30 raw-test:
31
32=== modified file 'config-manager.txt'
33--- config-manager.txt 2018-04-19 12:58:42 +0000
34+++ config-manager.txt 2018-04-27 03:13:22 +0000
35@@ -21,4 +21,4 @@
36 #
37 # make clean-sourcedeps sourcedeps
38
39-./.sourcecode/magicicada-client ~chicharreros/magicicada-client/trunk;revno=1442
40+./.sourcecode/magicicada-client ~chicharreros/magicicada-client/trunk;revno=1444
41
42=== removed symlink 'lib/ubuntuone/storageprotocol'
43=== target was u'../../.sourcecode/magicicada-protocol/ubuntuone/storageprotocol'
44=== modified file 'magicicada/server/content.py'
45--- magicicada/server/content.py 2018-04-05 21:08:25 +0000
46+++ magicicada/server/content.py 2018-04-27 03:13:22 +0000
47@@ -31,8 +31,8 @@
48 import twisted.internet.error
49 import twisted.web.error
50
51+from magicicadaprotocol import protocol_pb2
52 from twisted.internet import defer
53-from ubuntuone.storageprotocol import protocol_pb2
54
55 from magicicada import settings
56 from magicicada.filesync import errors as dataerrors
57
58=== modified file 'magicicada/server/errors.py'
59--- magicicada/server/errors.py 2018-04-05 21:08:25 +0000
60+++ magicicada/server/errors.py 2018-04-27 03:13:22 +0000
61@@ -16,8 +16,7 @@
62 #
63 # For further info, check http://launchpad.net/magicicada-server
64
65-from ubuntuone.storageprotocol import request
66-from ubuntuone.storageprotocol import protocol_pb2
67+from magicicadaprotocol import protocol_pb2, request
68
69
70 class StorageServerError(request.StorageProtocolError):
71
72=== modified file 'magicicada/server/integtests/test_action_queue.py'
73--- magicicada/server/integtests/test_action_queue.py 2018-04-05 21:08:25 +0000
74+++ magicicada/server/integtests/test_action_queue.py 2018-04-27 03:13:22 +0000
75@@ -25,9 +25,9 @@
76 import uuid
77 import zlib
78
79+from magicicadaprotocol import request
80+from magicicadaprotocol.client import StorageClient
81 from twisted.internet import defer, reactor
82-from ubuntuone.storageprotocol import request
83-from ubuntuone.storageprotocol.client import StorageClient
84 from ubuntuone.syncdaemon.states import (
85 StateManager, QueueManager, ConnectionManager)
86 from ubuntuone.syncdaemon import action_queue
87
88=== modified file 'magicicada/server/integtests/test_aq_cancel.py'
89--- magicicada/server/integtests/test_aq_cancel.py 2018-04-05 21:08:25 +0000
90+++ magicicada/server/integtests/test_aq_cancel.py 2018-04-27 03:13:22 +0000
91@@ -22,9 +22,9 @@
92
93 from cStringIO import StringIO
94
95+from magicicadaprotocol import request
96+from magicicadaprotocol.content_hash import content_hash_factory, crc32
97 from twisted.internet import defer, error
98-from ubuntuone.storageprotocol import request
99-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
100 from ubuntuone.syncdaemon.marker import MDMarker as Marker
101
102 from magicicada.server.testing.aq_helpers import (
103
104=== modified file 'magicicada/server/integtests/test_cleanup.py'
105--- magicicada/server/integtests/test_cleanup.py 2018-04-05 21:08:25 +0000
106+++ magicicada/server/integtests/test_cleanup.py 2018-04-27 03:13:22 +0000
107@@ -20,8 +20,8 @@
108
109 import os
110
111+from magicicadaprotocol import request
112 from twisted.internet import reactor, defer
113-from ubuntuone.storageprotocol import request
114
115 from magicicada.server.testing.aq_helpers import (
116 NO_CONTENT_HASH,
117
118=== modified file 'magicicada/server/integtests/test_server_scan.py'
119--- magicicada/server/integtests/test_server_scan.py 2018-04-05 21:08:25 +0000
120+++ magicicada/server/integtests/test_server_scan.py 2018-04-27 03:13:22 +0000
121@@ -22,9 +22,9 @@
122
123 from cStringIO import StringIO
124
125+from magicicadaprotocol import request
126+from magicicadaprotocol.content_hash import content_hash_factory, crc32
127 from twisted.internet import defer
128-from ubuntuone.storageprotocol import request
129-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
130
131 from magicicada.server.integtests.test_sync import TestServerBase
132 from magicicada.server.testing.aq_helpers import NO_CONTENT_HASH
133
134=== modified file 'magicicada/server/integtests/test_share_sync.py'
135--- magicicada/server/integtests/test_share_sync.py 2018-04-05 21:08:25 +0000
136+++ magicicada/server/integtests/test_share_sync.py 2018-04-27 03:13:22 +0000
137@@ -23,9 +23,9 @@
138
139 from cStringIO import StringIO
140
141+from magicicadaprotocol import request
142 from twisted.internet import reactor, defer
143 from twisted.python.failure import Failure
144-from ubuntuone.storageprotocol import request
145 from ubuntuone.syncdaemon import states
146
147 from magicicada.server.integtests import test_sync
148
149=== modified file 'magicicada/server/integtests/test_sync.py'
150--- magicicada/server/integtests/test_sync.py 2018-04-20 01:21:03 +0000
151+++ magicicada/server/integtests/test_sync.py 2018-04-27 03:13:22 +0000
152@@ -35,15 +35,13 @@
153 from twisted.internet import reactor, defer
154 from twisted.python.failure import Failure
155
156-from ubuntuone.platform import tools
157-from ubuntuone.storageprotocol import client as protocol_client
158-from ubuntuone.storageprotocol import request
159-from ubuntuone.storageprotocol.client import (
160+from magicicadaprotocol import client as protocol_client, protocol_pb2, request
161+from magicicadaprotocol.client import (
162 StorageClient,
163 StorageClientFactory,
164 )
165-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
166-from ubuntuone.storageprotocol import protocol_pb2
167+from magicicadaprotocol.content_hash import content_hash_factory, crc32
168+from ubuntuone.platform import tools
169 from ubuntuone.syncdaemon import REQUIRED_CAPS, hash_queue
170 from ubuntuone.syncdaemon.main import Main
171
172
173=== modified file 'magicicada/server/server.py'
174--- magicicada/server/server.py 2018-04-19 00:45:24 +0000
175+++ magicicada/server/server.py 2018-04-27 03:13:22 +0000
176@@ -40,13 +40,13 @@
177 import twisted
178 import twisted.web.error
179
180+from magicicadaprotocol import protocol_pb2, request, sharersp
181 from twisted.application.service import MultiService, Service
182 from twisted.application.internet import TCPServer
183 from twisted.internet.defer import maybeDeferred, inlineCallbacks
184 from twisted.internet.protocol import Factory
185 from twisted.internet import defer, reactor, error, task, stdio
186 from twisted.python.failure import Failure
187-from ubuntuone.storageprotocol import protocol_pb2, request, sharersp
188 from ubuntuone.supervisor import utils as supervisor_utils
189
190 from magicicada import metrics, settings
191
192=== modified file 'magicicada/server/testing/aq_helpers.py'
193--- magicicada/server/testing/aq_helpers.py 2018-04-05 21:08:25 +0000
194+++ magicicada/server/testing/aq_helpers.py 2018-04-27 03:13:22 +0000
195@@ -31,13 +31,13 @@
196 import dbus.service
197
198 from dbus.mainloop.glib import DBusGMainLoop
199+from magicicadaprotocol import request, sharersp, client
200+from magicicadaprotocol.content_hash import content_hash_factory, crc32
201 from twisted.internet import defer, reactor
202 from twisted.names import dns
203 from twisted.names.common import ResolverBase
204 from twisted.python.failure import Failure
205 from ubuntuone import platform
206-from ubuntuone.storageprotocol import request, sharersp, client
207-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
208 from ubuntuone.syncdaemon.action_queue import ActionQueue, ActionQueueCommand
209 from ubuntuone.syncdaemon import (
210 main,
211
212=== modified file 'magicicada/server/testing/testcase.py'
213--- magicicada/server/testing/testcase.py 2018-04-05 21:08:25 +0000
214+++ magicicada/server/testing/testcase.py 2018-04-27 03:13:22 +0000
215@@ -27,14 +27,13 @@
216 from functools import wraps
217 from StringIO import StringIO
218
219+from magicicadaprotocol import client, request, protocol_pb2
220+from magicicadaprotocol.client import StorageClientFactory, StorageClient
221 from OpenSSL import crypto
222 from twisted.internet import reactor, defer, ssl
223 from twisted.internet.protocol import connectionDone
224 from twisted.python.failure import Failure
225 from twisted.trial.unittest import TestCase as TwistedTestCase
226-from ubuntuone.storageprotocol import client, request, protocol_pb2
227-from ubuntuone.storageprotocol.client import (
228- StorageClientFactory, StorageClient)
229
230 from magicicada import settings
231 from magicicada.filesync import services
232
233=== modified file 'magicicada/server/tests/test_account.py'
234--- magicicada/server/tests/test_account.py 2018-04-05 21:08:25 +0000
235+++ magicicada/server/tests/test_account.py 2018-04-27 03:13:22 +0000
236@@ -18,8 +18,8 @@
237
238 """Account info tests."""
239
240+from magicicadaprotocol import request
241 from twisted.internet import defer
242-from ubuntuone.storageprotocol import request
243
244 from magicicada.filesync import services
245 from magicicada.filesync.models import StorageUser
246
247=== modified file 'magicicada/server/tests/test_auth.py'
248--- magicicada/server/tests/test_auth.py 2018-04-05 21:08:25 +0000
249+++ magicicada/server/tests/test_auth.py 2018-04-27 03:13:22 +0000
250@@ -20,8 +20,8 @@
251
252 import logging
253
254+from magicicadaprotocol import errors as protocol_errors, request
255 from twisted.internet import defer
256-from ubuntuone.storageprotocol import errors as protocol_errors, request
257
258 from magicicada.filesync.errors import DoesNotExist
259 from magicicada.filesync.models import StorageUser
260
261=== modified file 'magicicada/server/tests/test_basic.py'
262--- magicicada/server/tests/test_basic.py 2018-04-05 21:08:25 +0000
263+++ magicicada/server/tests/test_basic.py 2018-04-27 03:13:22 +0000
264@@ -28,11 +28,11 @@
265 from StringIO import StringIO
266
267 from django.conf import settings
268+from magicicadaprotocol import request
269 from mocker import Mocker, ANY
270 from twisted.internet import reactor, defer
271 from twisted.internet.error import ConnectionDone
272 from twisted.web import client, error
273-from ubuntuone.storageprotocol import request
274 from ubuntuone.supervisor import utils as supervisor_utils
275
276 from magicicada.filesync.models import StorageUser
277
278=== modified file 'magicicada/server/tests/test_content.py'
279--- magicicada/server/tests/test_content.py 2018-04-05 21:08:25 +0000
280+++ magicicada/server/tests/test_content.py 2018-04-27 03:13:22 +0000
281@@ -25,21 +25,21 @@
282
283 from StringIO import StringIO
284
285-from mocker import Mocker, expect, ARGS, KWARGS, ANY
286-from twisted.internet import defer, reactor, threads, task, address
287-from twisted.trial.unittest import TestCase
288-from twisted.test.proto_helpers import StringTransport
289-from ubuntuone.storageprotocol import (
290+from magicicadaprotocol import (
291 request,
292 client as sp_client,
293 errors as protoerrors,
294 protocol_pb2,
295 )
296-from ubuntuone.storageprotocol.content_hash import (
297+from magicicadaprotocol.content_hash import (
298 content_hash_factory,
299 crc32,
300 magic_hash_factory,
301 )
302+from mocker import Mocker, expect, ARGS, KWARGS, ANY
303+from twisted.internet import defer, reactor, threads, task, address
304+from twisted.trial.unittest import TestCase
305+from twisted.test.proto_helpers import StringTransport
306
307 from magicicada import settings
308 from magicicada.filesync import errors
309
310=== modified file 'magicicada/server/tests/test_fileops.py'
311--- magicicada/server/tests/test_fileops.py 2018-04-05 21:08:25 +0000
312+++ magicicada/server/tests/test_fileops.py 2018-04-27 03:13:22 +0000
313@@ -20,10 +20,9 @@
314
315 from StringIO import StringIO
316
317+from magicicadaprotocol import errors as protocol_errors, request
318+from magicicadaprotocol.content_hash import content_hash_factory, crc32
319 from twisted.internet import threads, defer
320-from ubuntuone.storageprotocol import request
321-from ubuntuone.storageprotocol import errors as protocol_errors
322-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
323
324 from magicicada.filesync import errors
325 from magicicada.filesync.models import STATUS_LIVE, STATUS_DEAD
326
327=== modified file 'magicicada/server/tests/test_generations.py'
328--- magicicada/server/tests/test_generations.py 2018-04-05 21:08:25 +0000
329+++ magicicada/server/tests/test_generations.py 2018-04-27 03:13:22 +0000
330@@ -22,8 +22,8 @@
331
332 import calendar
333
334+from magicicadaprotocol import request, delta as protodelta
335 from twisted.internet import defer
336-from ubuntuone.storageprotocol import request, delta as protodelta
337
338 from magicicada.filesync.models import StorageObject
339 from magicicada.server import server
340
341=== modified file 'magicicada/server/tests/test_make.py'
342--- magicicada/server/tests/test_make.py 2018-04-05 21:08:25 +0000
343+++ magicicada/server/tests/test_make.py 2018-04-27 03:13:22 +0000
344@@ -25,9 +25,9 @@
345
346 from StringIO import StringIO
347
348+from magicicadaprotocol import request, volumes
349+from magicicadaprotocol.content_hash import content_hash_factory, crc32
350 from twisted.internet import defer
351-from ubuntuone.storageprotocol import request, volumes
352-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
353
354 from magicicada.filesync import errors
355 from magicicada.server.testing.testcase import TestWithDatabase
356
357=== modified file 'magicicada/server/tests/test_notify_delivery.py'
358--- magicicada/server/tests/test_notify_delivery.py 2018-04-05 21:08:25 +0000
359+++ magicicada/server/tests/test_notify_delivery.py 2018-04-27 03:13:22 +0000
360@@ -21,12 +21,12 @@
361 import logging
362 import uuid
363
364+from magicicadaprotocol import protocol_pb2, request
365 from mocker import Mocker, expect
366 from twisted.internet.defer import inlineCallbacks, succeed
367 from twisted.internet import defer, reactor
368 from twisted.python.failure import Failure
369 from twisted.trial.unittest import TestCase as TwistedTestCase
370-from ubuntuone.storageprotocol import protocol_pb2, request
371
372 from magicicada.filesync.models import Share
373 from magicicada.filesync.notifier import notifier
374
375=== modified file 'magicicada/server/tests/test_server.py'
376--- magicicada/server/tests/test_server.py 2018-04-19 00:45:24 +0000
377+++ magicicada/server/tests/test_server.py 2018-04-27 03:13:22 +0000
378@@ -29,12 +29,12 @@
379 import weakref
380
381 from django.utils.timezone import now
382+from magicicadaprotocol import protocol_pb2, request
383 from mocker import expect, Mocker, MockerTestCase, ARGS, KWARGS, ANY
384 from twisted.python.failure import Failure
385 from twisted.python import log
386 from twisted.internet import defer, task, error as txerror
387 from twisted.trial.unittest import TestCase as TwistedTestCase
388-from ubuntuone.storageprotocol import protocol_pb2, request
389
390 from magicicada import metrics, settings
391 from magicicada.filesync import errors as dataerror
392
393=== modified file 'magicicada/server/tests/test_sharing.py'
394--- magicicada/server/tests/test_sharing.py 2018-04-05 21:08:25 +0000
395+++ magicicada/server/tests/test_sharing.py 2018-04-27 03:13:22 +0000
396@@ -23,9 +23,9 @@
397
398 from StringIO import StringIO
399
400+from magicicadaprotocol import errors as protocol_errors, request
401+from magicicadaprotocol.content_hash import content_hash_factory, crc32
402 from twisted.internet import reactor, defer
403-from ubuntuone.storageprotocol import errors as protocol_errors, request
404-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
405
406 from magicicada.filesync import errors
407 from magicicada.filesync.models import STATUS_LIVE, Share
408
409=== modified file 'magicicada/server/tests/test_shutdown.py'
410--- magicicada/server/tests/test_shutdown.py 2018-04-05 21:08:25 +0000
411+++ magicicada/server/tests/test_shutdown.py 2018-04-27 03:13:22 +0000
412@@ -20,12 +20,11 @@
413
414 import os
415
416+from magicicadaprotocol import request
417+from magicicadaprotocol.content_hash import content_hash_factory
418+from magicicadaprotocol.client import StorageClientFactory, StorageClient
419 from twisted.trial.unittest import TestCase as TwistedTestCase
420 from twisted.internet import reactor, defer, error
421-from ubuntuone.storageprotocol import request
422-from ubuntuone.storageprotocol.content_hash import content_hash_factory
423-from ubuntuone.storageprotocol.client import (
424- StorageClientFactory, StorageClient)
425
426 from magicicada.filesync.services import make_storage_user
427 from magicicada.server.auth import DummyAuthProvider
428
429=== modified file 'magicicada/server/tests/test_ssl_proxy.py'
430--- magicicada/server/tests/test_ssl_proxy.py 2018-04-19 00:45:24 +0000
431+++ magicicada/server/tests/test_ssl_proxy.py 2018-04-27 03:13:22 +0000
432@@ -25,13 +25,12 @@
433
434 import OpenSSL
435
436+from magicicadaprotocol.client import StorageClientFactory, StorageClient
437 from mocker import Mocker, expect
438 from twisted.internet import defer, reactor, error as txerror, ssl
439 from twisted.python import failure
440 from twisted.web import client, error as web_error
441 from twisted.trial.unittest import TestCase
442-from ubuntuone.storageprotocol.client import (
443- StorageClientFactory, StorageClient)
444 from ubuntuone.supervisor import utils as supervisor_utils
445
446 from magicicada import metrics, settings
447
448=== modified file 'magicicada/server/tests/test_throttling.py'
449--- magicicada/server/tests/test_throttling.py 2018-04-05 21:08:25 +0000
450+++ magicicada/server/tests/test_throttling.py 2018-04-27 03:13:22 +0000
451@@ -24,10 +24,10 @@
452 from StringIO import StringIO
453
454 from django.db import transaction
455+from magicicadaprotocol import request, client
456+from magicicadaprotocol.content_hash import content_hash_factory, crc32
457 from twisted.internet import threads, defer
458 from twisted.internet.protocol import connectionDone
459-from ubuntuone.storageprotocol import request, client
460-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
461
462 from magicicada.filesync import services
463 from magicicada.filesync.models import ContentBlob
464
465=== modified file 'magicicada/server/tests/test_udfs.py'
466--- magicicada/server/tests/test_udfs.py 2018-04-05 21:08:25 +0000
467+++ magicicada/server/tests/test_udfs.py 2018-04-27 03:13:22 +0000
468@@ -25,9 +25,9 @@
469
470 from StringIO import StringIO
471
472+from magicicadaprotocol import request
473+from magicicadaprotocol.content_hash import content_hash_factory, crc32
474 from twisted.internet import reactor, defer
475-from ubuntuone.storageprotocol import request
476-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
477
478 from magicicada.filesync.errors import DoesNotExist
479 from magicicada.server.testing.testcase import FactoryHelper, TestWithDatabase
480
481=== modified file 'magicicada/server/tests/test_upload.py'
482--- magicicada/server/tests/test_upload.py 2018-04-05 21:08:25 +0000
483+++ magicicada/server/tests/test_upload.py 2018-04-27 03:13:22 +0000
484@@ -22,12 +22,12 @@
485 import shutil
486 import zlib
487
488-from twisted.internet import defer, reactor, task
489-from ubuntuone.storageprotocol.content_hash import (
490+from magicicadaprotocol.content_hash import (
491 content_hash_factory,
492 crc32,
493 magic_hash_factory,
494 )
495+from twisted.internet import defer, reactor, task
496
497 from magicicada.server import upload, diskstorage
498 from magicicada.server.auth import DummyAuthProvider
499
500=== modified file 'magicicada/server/tests/test_validation.py'
501--- magicicada/server/tests/test_validation.py 2018-04-05 21:08:25 +0000
502+++ magicicada/server/tests/test_validation.py 2018-04-27 03:13:22 +0000
503@@ -22,7 +22,7 @@
504
505 import re
506
507-from ubuntuone.storageprotocol import request
508+from magicicadaprotocol import request
509
510 from magicicada.server.testing.testcase import TestWithDatabase
511
512
513=== modified file 'magicicada/server/tests/test_volumes.py'
514--- magicicada/server/tests/test_volumes.py 2018-04-05 21:08:25 +0000
515+++ magicicada/server/tests/test_volumes.py 2018-04-27 03:13:22 +0000
516@@ -20,10 +20,9 @@
517
518 """Test volume operations."""
519
520+from magicicadaprotocol import request
521+from magicicadaprotocol.volumes import RootVolume, UDFVolume, ShareVolume
522 from twisted.internet import defer
523-from ubuntuone.storageprotocol import request
524-from ubuntuone.storageprotocol.volumes import (
525- RootVolume, UDFVolume, ShareVolume)
526
527 from magicicada.filesync.models import Share
528 from magicicada.filesync.services import get_storage_user
529
530=== modified file 'magicicada/server/upload.py'
531--- magicicada/server/upload.py 2018-04-05 21:08:25 +0000
532+++ magicicada/server/upload.py 2018-04-27 03:13:22 +0000
533@@ -29,12 +29,12 @@
534
535 from cStringIO import StringIO
536
537-from twisted.internet import defer
538-from ubuntuone.storageprotocol.content_hash import (
539+from magicicadaprotocol.content_hash import (
540 content_hash_factory,
541 crc32,
542 magic_hash_factory,
543 )
544+from twisted.internet import defer
545
546 from magicicada.server import errors
547 from magicicada.server.diskstorage import FileReaderProducer
548
549=== modified file 'magicicada/u1sync/client.py'
550--- magicicada/u1sync/client.py 2018-04-20 01:21:03 +0000
551+++ magicicada/u1sync/client.py 2018-04-27 03:13:22 +0000
552@@ -31,15 +31,15 @@
553 from threading import Lock
554
555 from dirspec.basedir import xdg_cache_home
556+from magicicadaprotocol import request, volumes
557+from magicicadaprotocol.content_hash import crc32
558+from magicicadaprotocol.context import get_ssl_context
559+from magicicadaprotocol.client import (
560+ StorageClientFactory, StorageClient)
561+from magicicadaprotocol.delta import DIRECTORY as delta_DIR
562+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, FILE
563 from twisted.internet import reactor, defer
564 from twisted.internet.defer import inlineCallbacks, returnValue
565-from ubuntuone.storageprotocol import request, volumes
566-from ubuntuone.storageprotocol.content_hash import crc32
567-from ubuntuone.storageprotocol.context import get_ssl_context
568-from ubuntuone.storageprotocol.client import (
569- StorageClientFactory, StorageClient)
570-from ubuntuone.storageprotocol.delta import DIRECTORY as delta_DIR
571-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, FILE
572
573 from magicicada.u1sync.genericmerge import MergeNode
574 from magicicada.u1sync.utils import should_sync
575
576=== modified file 'magicicada/u1sync/genericmerge.py'
577--- magicicada/u1sync/genericmerge.py 2018-04-20 01:17:24 +0000
578+++ magicicada/u1sync/genericmerge.py 2018-04-27 03:13:22 +0000
579@@ -17,7 +17,7 @@
580
581 from itertools import chain
582
583-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
584+from magicicadaprotocol.dircontent_pb2 import DIRECTORY
585
586
587 class MergeNode(object):
588
589=== modified file 'magicicada/u1sync/main.py'
590--- magicicada/u1sync/main.py 2018-04-20 01:21:03 +0000
591+++ magicicada/u1sync/main.py 2018-04-27 03:13:22 +0000
592@@ -28,8 +28,8 @@
593
594 import gobject
595
596-import ubuntuone.storageprotocol.dircontent_pb2 as dircontent_pb2
597-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
598+import magicicadaprotocol.dircontent_pb2 as dircontent_pb2
599+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
600 from twisted.internet import reactor
601
602 from magicicada.u1sync import metadata
603
604=== modified file 'magicicada/u1sync/merge.py'
605--- magicicada/u1sync/merge.py 2018-04-20 01:21:03 +0000
606+++ magicicada/u1sync/merge.py 2018-04-27 03:13:22 +0000
607@@ -20,7 +20,7 @@
608 import os
609 import uuid
610
611-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
612+from magicicadaprotocol.dircontent_pb2 import DIRECTORY
613
614 from magicicada.u1sync.genericmerge import MergeNode, generic_merge
615
616
617=== modified file 'magicicada/u1sync/metadata.py'
618--- magicicada/u1sync/metadata.py 2018-04-20 01:21:03 +0000
619+++ magicicada/u1sync/metadata.py 2018-04-27 03:13:22 +0000
620@@ -24,7 +24,7 @@
621 import cPickle as pickle
622 from errno import ENOENT
623
624-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
625+from magicicadaprotocol.dircontent_pb2 import DIRECTORY
626
627 from magicicada.u1sync.merge import MergeNode
628 from magicicada.u1sync.utils import safe_unlink
629
630=== modified file 'magicicada/u1sync/scan.py'
631--- magicicada/u1sync/scan.py 2018-04-20 01:21:03 +0000
632+++ magicicada/u1sync/scan.py 2018-04-27 03:13:22 +0000
633@@ -23,7 +23,7 @@
634
635 from errno import ENOTDIR, EINVAL
636
637-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, FILE, SYMLINK
638+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, FILE, SYMLINK
639
640 from magicicada.u1sync.genericmerge import MergeNode
641 from magicicada.u1sync.utils import should_sync
642
643=== modified file 'magicicada/u1sync/sync.py'
644--- magicicada/u1sync/sync.py 2018-04-20 01:21:03 +0000
645+++ magicicada/u1sync/sync.py 2018-04-27 03:13:22 +0000
646@@ -24,8 +24,8 @@
647
648 import os
649
650-from ubuntuone.storageprotocol import request
651-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
652+from magicicadaprotocol import request
653+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
654
655 from magicicada.u1sync.client import UnsupportedOperationError
656 from magicicada.u1sync.genericmerge import MergeNode, generic_merge
657
658=== modified file 'magicicada/u1sync/tests/test_merge.py'
659--- magicicada/u1sync/tests/test_merge.py 2018-04-20 01:21:03 +0000
660+++ magicicada/u1sync/tests/test_merge.py 2018-04-27 03:13:22 +0000
661@@ -20,7 +20,7 @@
662
663 from unittest import TestCase
664
665-from ubuntuone.storageprotocol.dircontent_pb2 import FILE, DIRECTORY
666+from magicicadaprotocol.dircontent_pb2 import FILE, DIRECTORY
667
668 from magicicada.u1sync.genericmerge import MergeNode, generic_merge
669 from magicicada.u1sync.merge import (
670
671=== modified file 'requirements.txt'
672--- requirements.txt 2018-04-12 02:07:28 +0000
673+++ requirements.txt 2018-04-27 03:13:22 +0000
674@@ -2,6 +2,7 @@
675 bzr
676 configglue
677 cython
678+magicicadaprotocol==2.0
679 pyOpenSSL
680 protobuf
681 psycopg2-binary

Subscribers

People subscribed via source and target branches

to all changes: