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

[Natalia Bidart]

- Use magicicadaprotocol 2.0

[Facundo Batista (facundo)]

Awesome!

review: Approve

=== modified file 'Makefile'
--- Makefile	2018-04-20 01:22:24 +0000
+++ Makefile	2018-04-27 03:13:22 +0000
@@ -27,9 +27,6 @@
 DJANGO_MANAGE = $(PYTHON) manage.py
 
 MAKEFLAGS:=$(MAKEFLAGS) --no-print-directory
-# use protobuf cpp
-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
 
 START_SUPERVISORD = lib/ubuntuone/supervisor/start-supervisord.py
 SUPERVISOR_CTL = $(ENV)/bin/supervisorctl
@@ -37,8 +34,6 @@
 export PATH
 export PYTHONPATH
 export DJANGO_SETTINGS_MODULE
-export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION
-export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION
 export ROOTDIR ?= $(CURDIR)
 
 SOURCEDEPS_TAG = .sourcecode/sourcedeps-tag
@@ -101,7 +96,6 @@
 	test -d $(ENV) || virtualenv $(ENV)
 	$(ENV)/bin/pip install -Ur requirements.txt
 	$(ENV)/bin/pip install -Ur requirements-devel.txt
-	$(ENV)/bin/pip install ubuntuone-storageprotocol --no-deps -t "$(TARGET_SOURCECODE_DIR)/magicicada-protocol"
 	touch $(ENV)/bin/activate
 
 raw-test:
 
=== modified file 'config-manager.txt'
--- config-manager.txt	2018-04-19 12:58:42 +0000
+++ config-manager.txt	2018-04-27 03:13:22 +0000
@@ -21,4 +21,4 @@
 #
 #   make clean-sourcedeps sourcedeps
 
-./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk;revno=1442
+./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk;revno=1444
 
=== removed symlink 'lib/ubuntuone/storageprotocol'
=== target was u'../../.sourcecode/magicicada-protocol/ubuntuone/storageprotocol'
=== modified file 'magicicada/server/content.py'
--- magicicada/server/content.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/content.py	2018-04-27 03:13:22 +0000
@@ -31,8 +31,8 @@
 import twisted.internet.error
 import twisted.web.error
 
+from magicicadaprotocol import protocol_pb2
 from twisted.internet import defer
-from ubuntuone.storageprotocol import protocol_pb2
 
 from magicicada import settings
 from magicicada.filesync import errors as dataerrors
 
=== modified file 'magicicada/server/errors.py'
--- magicicada/server/errors.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/errors.py	2018-04-27 03:13:22 +0000
@@ -16,8 +16,7 @@
 #
 # For further info, check  http://launchpad.net/magicicada-server
 
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol import protocol_pb2
+from magicicadaprotocol import protocol_pb2, request
 
 
 class StorageServerError(request.StorageProtocolError):
 
=== modified file 'magicicada/server/integtests/test_action_queue.py'
--- magicicada/server/integtests/test_action_queue.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/integtests/test_action_queue.py	2018-04-27 03:13:22 +0000
@@ -25,9 +25,9 @@
 import uuid
 import zlib
 
+from magicicadaprotocol import request
+from magicicadaprotocol.client import StorageClient
 from twisted.internet import defer, reactor
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.client import StorageClient
 from ubuntuone.syncdaemon.states import (
     StateManager, QueueManager, ConnectionManager)
 from ubuntuone.syncdaemon import action_queue
 
=== modified file 'magicicada/server/integtests/test_aq_cancel.py'
--- magicicada/server/integtests/test_aq_cancel.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/integtests/test_aq_cancel.py	2018-04-27 03:13:22 +0000
@@ -22,9 +22,9 @@
 
 from cStringIO import StringIO
 
+from magicicadaprotocol import request
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import defer, error
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 from ubuntuone.syncdaemon.marker import MDMarker as Marker
 
 from magicicada.server.testing.aq_helpers import (
 
=== modified file 'magicicada/server/integtests/test_cleanup.py'
--- magicicada/server/integtests/test_cleanup.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/integtests/test_cleanup.py	2018-04-27 03:13:22 +0000
@@ -20,8 +20,8 @@
 
 import os
 
+from magicicadaprotocol import request
 from twisted.internet import reactor, defer
-from ubuntuone.storageprotocol import request
 
 from magicicada.server.testing.aq_helpers import (
     NO_CONTENT_HASH,
 
=== modified file 'magicicada/server/integtests/test_server_scan.py'
--- magicicada/server/integtests/test_server_scan.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/integtests/test_server_scan.py	2018-04-27 03:13:22 +0000
@@ -22,9 +22,9 @@
 
 from cStringIO import StringIO
 
+from magicicadaprotocol import request
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import defer
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 from magicicada.server.integtests.test_sync import TestServerBase
 from magicicada.server.testing.aq_helpers import NO_CONTENT_HASH
 
=== modified file 'magicicada/server/integtests/test_share_sync.py'
--- magicicada/server/integtests/test_share_sync.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/integtests/test_share_sync.py	2018-04-27 03:13:22 +0000
@@ -23,9 +23,9 @@
 
 from cStringIO import StringIO
 
+from magicicadaprotocol import request
 from twisted.internet import reactor, defer
 from twisted.python.failure import Failure
-from ubuntuone.storageprotocol import request
 from ubuntuone.syncdaemon import states
 
 from magicicada.server.integtests import test_sync
 
=== modified file 'magicicada/server/integtests/test_sync.py'
--- magicicada/server/integtests/test_sync.py	2018-04-20 01:21:03 +0000
+++ magicicada/server/integtests/test_sync.py	2018-04-27 03:13:22 +0000
@@ -35,15 +35,13 @@
 from twisted.internet import reactor, defer
 from twisted.python.failure import Failure
 
-from ubuntuone.platform import tools
-from ubuntuone.storageprotocol import client as protocol_client
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.client import (
+from magicicadaprotocol import client as protocol_client, protocol_pb2, request
+from magicicadaprotocol.client import (
     StorageClient,
     StorageClientFactory,
 )
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
-from ubuntuone.storageprotocol import protocol_pb2
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
+from ubuntuone.platform import tools
 from ubuntuone.syncdaemon import REQUIRED_CAPS, hash_queue
 from ubuntuone.syncdaemon.main import Main
 
 
=== modified file 'magicicada/server/server.py'
--- magicicada/server/server.py	2018-04-19 00:45:24 +0000
+++ magicicada/server/server.py	2018-04-27 03:13:22 +0000
@@ -40,13 +40,13 @@
 import twisted
 import twisted.web.error
 
+from magicicadaprotocol import protocol_pb2, request, sharersp
 from twisted.application.service import MultiService, Service
 from twisted.application.internet import TCPServer
 from twisted.internet.defer import maybeDeferred, inlineCallbacks
 from twisted.internet.protocol import Factory
 from twisted.internet import defer, reactor, error, task, stdio
 from twisted.python.failure import Failure
-from ubuntuone.storageprotocol import protocol_pb2, request, sharersp
 from ubuntuone.supervisor import utils as supervisor_utils
 
 from magicicada import metrics, settings
 
=== modified file 'magicicada/server/testing/aq_helpers.py'
--- magicicada/server/testing/aq_helpers.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/testing/aq_helpers.py	2018-04-27 03:13:22 +0000
@@ -31,13 +31,13 @@
 import dbus.service
 
 from dbus.mainloop.glib import DBusGMainLoop
+from magicicadaprotocol import request, sharersp, client
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import defer, reactor
 from twisted.names import dns
 from twisted.names.common import ResolverBase
 from twisted.python.failure import Failure
 from ubuntuone import platform
-from ubuntuone.storageprotocol import request, sharersp, client
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 from ubuntuone.syncdaemon.action_queue import ActionQueue, ActionQueueCommand
 from ubuntuone.syncdaemon import (
     main,
 
=== modified file 'magicicada/server/testing/testcase.py'
--- magicicada/server/testing/testcase.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/testing/testcase.py	2018-04-27 03:13:22 +0000
@@ -27,14 +27,13 @@
 from functools import wraps
 from StringIO import StringIO
 
+from magicicadaprotocol import client, request, protocol_pb2
+from magicicadaprotocol.client import StorageClientFactory, StorageClient
 from OpenSSL import crypto
 from twisted.internet import reactor, defer, ssl
 from twisted.internet.protocol import connectionDone
 from twisted.python.failure import Failure
 from twisted.trial.unittest import TestCase as TwistedTestCase
-from ubuntuone.storageprotocol import client, request, protocol_pb2
-from ubuntuone.storageprotocol.client import (
-    StorageClientFactory, StorageClient)
 
 from magicicada import settings
 from magicicada.filesync import services
 
=== modified file 'magicicada/server/tests/test_account.py'
--- magicicada/server/tests/test_account.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_account.py	2018-04-27 03:13:22 +0000
@@ -18,8 +18,8 @@
 
 """Account info tests."""
 
+from magicicadaprotocol import request
 from twisted.internet import defer
-from ubuntuone.storageprotocol import request
 
 from magicicada.filesync import services
 from magicicada.filesync.models import StorageUser
 
=== modified file 'magicicada/server/tests/test_auth.py'
--- magicicada/server/tests/test_auth.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_auth.py	2018-04-27 03:13:22 +0000
@@ -20,8 +20,8 @@
 
 import logging
 
+from magicicadaprotocol import errors as protocol_errors, request
 from twisted.internet import defer
-from ubuntuone.storageprotocol import errors as protocol_errors, request
 
 from magicicada.filesync.errors import DoesNotExist
 from magicicada.filesync.models import StorageUser
 
=== modified file 'magicicada/server/tests/test_basic.py'
--- magicicada/server/tests/test_basic.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_basic.py	2018-04-27 03:13:22 +0000
@@ -28,11 +28,11 @@
 from StringIO import StringIO
 
 from django.conf import settings
+from magicicadaprotocol import request
 from mocker import Mocker, ANY
 from twisted.internet import reactor, defer
 from twisted.internet.error import ConnectionDone
 from twisted.web import client, error
-from ubuntuone.storageprotocol import request
 from ubuntuone.supervisor import utils as supervisor_utils
 
 from magicicada.filesync.models import StorageUser
 
=== modified file 'magicicada/server/tests/test_content.py'
--- magicicada/server/tests/test_content.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_content.py	2018-04-27 03:13:22 +0000
@@ -25,21 +25,21 @@
 
 from StringIO import StringIO
 
-from mocker import Mocker, expect, ARGS, KWARGS, ANY
-from twisted.internet import defer, reactor, threads, task, address
-from twisted.trial.unittest import TestCase
-from twisted.test.proto_helpers import StringTransport
-from ubuntuone.storageprotocol import (
+from magicicadaprotocol import (
     request,
     client as sp_client,
     errors as protoerrors,
     protocol_pb2,
 )
-from ubuntuone.storageprotocol.content_hash import (
+from magicicadaprotocol.content_hash import (
     content_hash_factory,
     crc32,
     magic_hash_factory,
 )
+from mocker import Mocker, expect, ARGS, KWARGS, ANY
+from twisted.internet import defer, reactor, threads, task, address
+from twisted.trial.unittest import TestCase
+from twisted.test.proto_helpers import StringTransport
 
 from magicicada import settings
 from magicicada.filesync import errors
 
=== modified file 'magicicada/server/tests/test_fileops.py'
--- magicicada/server/tests/test_fileops.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_fileops.py	2018-04-27 03:13:22 +0000
@@ -20,10 +20,9 @@
 
 from StringIO import StringIO
 
+from magicicadaprotocol import errors as protocol_errors, request
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import threads, defer
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol import errors as protocol_errors
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 from magicicada.filesync import errors
 from magicicada.filesync.models import STATUS_LIVE, STATUS_DEAD
 
=== modified file 'magicicada/server/tests/test_generations.py'
--- magicicada/server/tests/test_generations.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_generations.py	2018-04-27 03:13:22 +0000
@@ -22,8 +22,8 @@
 
 import calendar
 
+from magicicadaprotocol import request, delta as protodelta
 from twisted.internet import defer
-from ubuntuone.storageprotocol import request, delta as protodelta
 
 from magicicada.filesync.models import StorageObject
 from magicicada.server import server
 
=== modified file 'magicicada/server/tests/test_make.py'
--- magicicada/server/tests/test_make.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_make.py	2018-04-27 03:13:22 +0000
@@ -25,9 +25,9 @@
 
 from StringIO import StringIO
 
+from magicicadaprotocol import request, volumes
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import defer
-from ubuntuone.storageprotocol import request, volumes
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 from magicicada.filesync import errors
 from magicicada.server.testing.testcase import TestWithDatabase
 
=== modified file 'magicicada/server/tests/test_notify_delivery.py'
--- magicicada/server/tests/test_notify_delivery.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_notify_delivery.py	2018-04-27 03:13:22 +0000
@@ -21,12 +21,12 @@
 import logging
 import uuid
 
+from magicicadaprotocol import protocol_pb2, request
 from mocker import Mocker, expect
 from twisted.internet.defer import inlineCallbacks, succeed
 from twisted.internet import defer, reactor
 from twisted.python.failure import Failure
 from twisted.trial.unittest import TestCase as TwistedTestCase
-from ubuntuone.storageprotocol import protocol_pb2, request
 
 from magicicada.filesync.models import Share
 from magicicada.filesync.notifier import notifier
 
=== modified file 'magicicada/server/tests/test_server.py'
--- magicicada/server/tests/test_server.py	2018-04-19 00:45:24 +0000
+++ magicicada/server/tests/test_server.py	2018-04-27 03:13:22 +0000
@@ -29,12 +29,12 @@
 import weakref
 
 from django.utils.timezone import now
+from magicicadaprotocol import protocol_pb2, request
 from mocker import expect, Mocker, MockerTestCase, ARGS, KWARGS, ANY
 from twisted.python.failure import Failure
 from twisted.python import log
 from twisted.internet import defer, task, error as txerror
 from twisted.trial.unittest import TestCase as TwistedTestCase
-from ubuntuone.storageprotocol import protocol_pb2, request
 
 from magicicada import metrics, settings
 from magicicada.filesync import errors as dataerror
 
=== modified file 'magicicada/server/tests/test_sharing.py'
--- magicicada/server/tests/test_sharing.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_sharing.py	2018-04-27 03:13:22 +0000
@@ -23,9 +23,9 @@
 
 from StringIO import StringIO
 
+from magicicadaprotocol import errors as protocol_errors, request
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import reactor, defer
-from ubuntuone.storageprotocol import errors as protocol_errors, request
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 from magicicada.filesync import errors
 from magicicada.filesync.models import STATUS_LIVE, Share
 
=== modified file 'magicicada/server/tests/test_shutdown.py'
--- magicicada/server/tests/test_shutdown.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_shutdown.py	2018-04-27 03:13:22 +0000
@@ -20,12 +20,11 @@
 
 import os
 
+from magicicadaprotocol import request
+from magicicadaprotocol.content_hash import content_hash_factory
+from magicicadaprotocol.client import StorageClientFactory, StorageClient
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from twisted.internet import reactor, defer, error
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.content_hash import content_hash_factory
-from ubuntuone.storageprotocol.client import (
-    StorageClientFactory, StorageClient)
 
 from magicicada.filesync.services import make_storage_user
 from magicicada.server.auth import DummyAuthProvider
 
=== modified file 'magicicada/server/tests/test_ssl_proxy.py'
--- magicicada/server/tests/test_ssl_proxy.py	2018-04-19 00:45:24 +0000
+++ magicicada/server/tests/test_ssl_proxy.py	2018-04-27 03:13:22 +0000
@@ -25,13 +25,12 @@
 
 import OpenSSL
 
+from magicicadaprotocol.client import StorageClientFactory, StorageClient
 from mocker import Mocker, expect
 from twisted.internet import defer, reactor, error as txerror, ssl
 from twisted.python import failure
 from twisted.web import client, error as web_error
 from twisted.trial.unittest import TestCase
-from ubuntuone.storageprotocol.client import (
-    StorageClientFactory, StorageClient)
 from ubuntuone.supervisor import utils as supervisor_utils
 
 from magicicada import metrics, settings
 
=== modified file 'magicicada/server/tests/test_throttling.py'
--- magicicada/server/tests/test_throttling.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_throttling.py	2018-04-27 03:13:22 +0000
@@ -24,10 +24,10 @@
 from StringIO import StringIO
 
 from django.db import transaction
+from magicicadaprotocol import request, client
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import threads, defer
 from twisted.internet.protocol import connectionDone
-from ubuntuone.storageprotocol import request, client
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 from magicicada.filesync import services
 from magicicada.filesync.models import ContentBlob
 
=== modified file 'magicicada/server/tests/test_udfs.py'
--- magicicada/server/tests/test_udfs.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_udfs.py	2018-04-27 03:13:22 +0000
@@ -25,9 +25,9 @@
 
 from StringIO import StringIO
 
+from magicicadaprotocol import request
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import reactor, defer
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 from magicicada.filesync.errors import DoesNotExist
 from magicicada.server.testing.testcase import FactoryHelper, TestWithDatabase
 
=== modified file 'magicicada/server/tests/test_upload.py'
--- magicicada/server/tests/test_upload.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_upload.py	2018-04-27 03:13:22 +0000
@@ -22,12 +22,12 @@
 import shutil
 import zlib
 
-from twisted.internet import defer, reactor, task
-from ubuntuone.storageprotocol.content_hash import (
+from magicicadaprotocol.content_hash import (
     content_hash_factory,
     crc32,
     magic_hash_factory,
 )
+from twisted.internet import defer, reactor, task
 
 from magicicada.server import upload, diskstorage
 from magicicada.server.auth import DummyAuthProvider
 
=== modified file 'magicicada/server/tests/test_validation.py'
--- magicicada/server/tests/test_validation.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_validation.py	2018-04-27 03:13:22 +0000
@@ -22,7 +22,7 @@
 
 import re
 
-from ubuntuone.storageprotocol import request
+from magicicadaprotocol import request
 
 from magicicada.server.testing.testcase import TestWithDatabase
 
 
=== modified file 'magicicada/server/tests/test_volumes.py'
--- magicicada/server/tests/test_volumes.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/tests/test_volumes.py	2018-04-27 03:13:22 +0000
@@ -20,10 +20,9 @@
 
 """Test volume operations."""
 
+from magicicadaprotocol import request
+from magicicadaprotocol.volumes import RootVolume, UDFVolume, ShareVolume
 from twisted.internet import defer
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.volumes import (
-    RootVolume, UDFVolume, ShareVolume)
 
 from magicicada.filesync.models import Share
 from magicicada.filesync.services import get_storage_user
 
=== modified file 'magicicada/server/upload.py'
--- magicicada/server/upload.py	2018-04-05 21:08:25 +0000
+++ magicicada/server/upload.py	2018-04-27 03:13:22 +0000
@@ -29,12 +29,12 @@
 
 from cStringIO import StringIO
 
-from twisted.internet import defer
-from ubuntuone.storageprotocol.content_hash import (
+from magicicadaprotocol.content_hash import (
     content_hash_factory,
     crc32,
     magic_hash_factory,
 )
+from twisted.internet import defer
 
 from magicicada.server import errors
 from magicicada.server.diskstorage import FileReaderProducer
 
=== modified file 'magicicada/u1sync/client.py'
--- magicicada/u1sync/client.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/client.py	2018-04-27 03:13:22 +0000
@@ -31,15 +31,15 @@
 from threading import Lock
 
 from dirspec.basedir import xdg_cache_home
+from magicicadaprotocol import request, volumes
+from magicicadaprotocol.content_hash import crc32
+from magicicadaprotocol.context import get_ssl_context
+from magicicadaprotocol.client import (
+    StorageClientFactory, StorageClient)
+from magicicadaprotocol.delta import DIRECTORY as delta_DIR
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, FILE
 from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
-from ubuntuone.storageprotocol import request, volumes
-from ubuntuone.storageprotocol.content_hash import crc32
-from ubuntuone.storageprotocol.context import get_ssl_context
-from ubuntuone.storageprotocol.client import (
-    StorageClientFactory, StorageClient)
-from ubuntuone.storageprotocol.delta import DIRECTORY as delta_DIR
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, FILE
 
 from magicicada.u1sync.genericmerge import MergeNode
 from magicicada.u1sync.utils import should_sync
 
=== modified file 'magicicada/u1sync/genericmerge.py'
--- magicicada/u1sync/genericmerge.py	2018-04-20 01:17:24 +0000
+++ magicicada/u1sync/genericmerge.py	2018-04-27 03:13:22 +0000
@@ -17,7 +17,7 @@
 
 from itertools import chain
 
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY
 
 
 class MergeNode(object):
 
=== modified file 'magicicada/u1sync/main.py'
--- magicicada/u1sync/main.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/main.py	2018-04-27 03:13:22 +0000
@@ -28,8 +28,8 @@
 
 import gobject
 
-import ubuntuone.storageprotocol.dircontent_pb2 as dircontent_pb2
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
+import magicicadaprotocol.dircontent_pb2 as dircontent_pb2
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
 from twisted.internet import reactor
 
 from magicicada.u1sync import metadata
 
=== modified file 'magicicada/u1sync/merge.py'
--- magicicada/u1sync/merge.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/merge.py	2018-04-27 03:13:22 +0000
@@ -20,7 +20,7 @@
 import os
 import uuid
 
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY
 
 from magicicada.u1sync.genericmerge import MergeNode, generic_merge
 
 
=== modified file 'magicicada/u1sync/metadata.py'
--- magicicada/u1sync/metadata.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/metadata.py	2018-04-27 03:13:22 +0000
@@ -24,7 +24,7 @@
 import cPickle as pickle
 from errno import ENOENT
 
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY
 
 from magicicada.u1sync.merge import MergeNode
 from magicicada.u1sync.utils import safe_unlink
 
=== modified file 'magicicada/u1sync/scan.py'
--- magicicada/u1sync/scan.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/scan.py	2018-04-27 03:13:22 +0000
@@ -23,7 +23,7 @@
 
 from errno import ENOTDIR, EINVAL
 
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, FILE, SYMLINK
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, FILE, SYMLINK
 
 from magicicada.u1sync.genericmerge import MergeNode
 from magicicada.u1sync.utils import should_sync
 
=== modified file 'magicicada/u1sync/sync.py'
--- magicicada/u1sync/sync.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/sync.py	2018-04-27 03:13:22 +0000
@@ -24,8 +24,8 @@
 
 import os
 
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
+from magicicadaprotocol import request
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
 
 from magicicada.u1sync.client import UnsupportedOperationError
 from magicicada.u1sync.genericmerge import MergeNode, generic_merge
 
=== modified file 'magicicada/u1sync/tests/test_merge.py'
--- magicicada/u1sync/tests/test_merge.py	2018-04-20 01:21:03 +0000
+++ magicicada/u1sync/tests/test_merge.py	2018-04-27 03:13:22 +0000
@@ -20,7 +20,7 @@
 
 from unittest import TestCase
 
-from ubuntuone.storageprotocol.dircontent_pb2 import FILE, DIRECTORY
+from magicicadaprotocol.dircontent_pb2 import FILE, DIRECTORY
 
 from magicicada.u1sync.genericmerge import MergeNode, generic_merge
 from magicicada.u1sync.merge import (
 
=== modified file 'requirements.txt'
--- requirements.txt	2018-04-12 02:07:28 +0000
+++ requirements.txt	2018-04-27 03:13:22 +0000
@@ -2,6 +2,7 @@
 bzr
 configglue
 cython
+magicicadaprotocol==2.0
 pyOpenSSL
 protobuf
 psycopg2-binary