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

[Natalia Bidart]

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

[Facundo Batista (facundo)]

Go!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2018-04-08 19:22:33 +0000
+++ .bzrignore	2018-04-14 22:31:56 +0000
@@ -1,11 +1,7 @@
 MANIFEST
 build
-debian/files
-debian/ubuntuone-storage-protocol
 dist
 _trial_temp
-*.debhelper*
-*.substvars
 *_pb2.py
 *.pyc
 *.egg-info
 
=== removed file 'HACKING'
--- HACKING	2010-11-12 14:36:58 +0000
+++ HACKING	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-Ubuntu One requires acceptance of the Canonical Contributor Agreement. You
-will need to follow the instructions at:
-
-http://www.canonical.com/contributors
-
-Once the agreement is accepted, you will be added to the Ubuntu One Contributor
-Agreement team on Launchpad, so that your branches may be merged in upstream.
-
-
-In order to run tests in ubuntuone-storage-protocol, you will first need
-to build the portion of code which uses Google Protocol Buffers.
-
-$: ./setup.py build
-
-Then you will need to run the tests. This will run lint and style checkers,
-and the unit tests for the package.
-
-$: ./run-tests
-
-
-Ubuntu One uses branch based development on Launchpad, and bugs to track
-features and issues. Make sure a bug is filed for the piece of code you wish
-to work on. When committing your changes, be sure to specify the bug # it
-fixes using the --fixes option in bzr.
-
-$: bzr commit --fixes=lp:<BUGNUMBER>
-
-If you forget to do this, you can link the branch manually on the Launchpad
-web page. After pushing your branch to Launchpad, you will need to propose it
-for merging into the parent branch. You can do this from the Launchpad web
-page for your branch. In order for your branch to be accepted, you will have
-to have accepted the Canonical Contributor Agreement as stated above, and
-there will need to be at least two approvals from Ubuntu One developers.
 
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2013-05-23 18:58:06 +0000
+++ MANIFEST.in	2018-04-14 22:31:56 +0000
@@ -1,8 +1,5 @@
 include MANIFEST.in
-include COPYING HACKING README README.windows
+include COPYING README
 include LICENSE LICENSE.OpenSSL
-include run-tests
-include *.pth
-recursive-include ubuntuone *.proto
+recursive-include magicicadaprotocol *.proto
 recursive-include samples *.py
-recursive-include tests *.py
 
=== modified file 'Makefile'
--- Makefile	2018-04-08 19:22:33 +0000
+++ Makefile	2018-04-14 22:31:56 +0000
@@ -16,7 +16,7 @@
 # For further info, check  http://launchpad.net/magicicada-protocol
 
 ENV = $(CURDIR)/.env
-SRC_DIR = $(CURDIR)/ubuntuone
+SRC_DIR = $(CURDIR)/magicicadaprotocol
 PATH := $(ENV)/bin:$(PATH)
 PYTHON = $(ENV)/bin/python
 PYTHONPATH := $(ENV)/lib/python2.7:$(ENV)/lib/python2.7/site-packages:$(SRC_DIR):$(PYTHONPATH)
@@ -49,12 +49,12 @@
 	$(ENV)/bin/twine upload dist/*.whl
 
 test: lint
-	SSL_CERTIFICATES_DIR=ubuntuone/storageprotocol/tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python $(ENV)/bin/trial ubuntuone
+	SSL_CERTIFICATES_DIR=$(SRC_DIR)/tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python $(ENV)/bin/trial magicicadaprotocol
 
 clean:
 	$(PYTHON) setup.py clean
 	find -name '*.pyc' -delete
-	rm -rf build dist sdist _trial_temp ubuntuone_storageprotocol.egg-info
+	rm -rf build dist sdist _trial_temp magicicadaprotocol.egg-info
 
 lint: $(ENV)
 	$(ENV)/bin/flake8 --filename='*.py' --exclude='$(ENV),*_pb2.py,build'
 
=== modified file 'README'
--- README	2009-06-06 01:25:56 +0000
+++ README	2018-04-14 22:31:56 +0000
@@ -1,18 +1,5 @@
 This package contains definitions for the protocol messages used by the
-Ubuntu One file storage/sharing service, as well as python code for a
-minimal client to talk directly to the storage servers.  Python code for
-local/offline functionality may be found in the ubuntuone-client package
-instead, as part of the official clients.
-
-This protocol applies only to the file storage service and not other
-Ubuntu One services.
-
-===
-
-Note: contributions to this package are accepted only from those who have
-signed the Ubuntu One Contributor agreement:
-
- https://launchpad.net/~ubuntuone-contributor-agreement
+Magicicada file storage/sharing service (open source fork of Ubuntu One).
 
 ===
 
@@ -29,7 +16,7 @@
 doing, if you are installing on an Ubuntu system it is probably better
 to build and install a Debian package.  Recent versions of Ubuntu do not
 load python modules from /usr/local by default, and you are likely to
-already have an installed ubuntuone-storage-protocol package in any case.
+already have an installed magicicadaprotocol package in any case.
 
 Protocol Overview:
 
 
=== renamed directory 'ubuntuone/storageprotocol' => 'magicicadaprotocol'
=== modified file 'magicicadaprotocol/__init__.py'
--- ubuntuone/storageprotocol/__init__.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/__init__.py	2018-04-14 22:31:56 +0000
@@ -28,4 +28,4 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 
-"""ubuntuone.storageprotocol package."""
+"""magicicadaprotocol package."""
 
=== modified file 'magicicadaprotocol/client.py'
--- ubuntuone/storageprotocol/client.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/client.py	2018-04-14 22:31:56 +0000
@@ -40,7 +40,7 @@
 from twisted.internet import reactor, defer
 from twisted.python import log
 
-from ubuntuone.storageprotocol import (
+from magicicadaprotocol import (
     delta,
     protocol_pb2,
     public_file_info,
@@ -1896,7 +1896,7 @@
     #           ssl.ClientContextFactory())
 
     # using ssl over a proxy
-    # from ubuntuone.storageprotocol import proxy_tunnel
+    # from magicicadaprotocol import proxy_tunnel
     # proxy_tunnel.connectHTTPS('localhost', 3128,
     #        'localhost', 20101, StorageClientFactory(),
     #        user="test", passwd="test")
 
=== modified file 'magicicadaprotocol/delta.py'
--- ubuntuone/storageprotocol/delta.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/delta.py	2018-04-14 22:31:56 +0000
@@ -30,7 +30,7 @@
 
 """Provides wrapper classes for delta nodes messages."""
 
-from ubuntuone.storageprotocol import protocol_pb2
+from magicicadaprotocol import protocol_pb2
 
 FILE = 0
 DIRECTORY = 1
 
=== modified file 'magicicadaprotocol/dircontent.proto'
--- ubuntuone/storageprotocol/dircontent.proto	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/dircontent.proto	2018-04-14 22:31:56 +0000
@@ -27,9 +27,9 @@
  version.  If you delete this exception statement from all source
  files in the program, then also delete it here.
 */
-package ubuntuone.storageprotocol;
+package magicicadaprotocol;
 
-option java_package = "com.ubuntuone.storageprotocol";
+option java_package = "com.magicicadaprotocol";
 option java_outer_classname = "DirectoryContentProtocol";
 
 enum NodeType {
 
=== modified file 'magicicadaprotocol/dircontent.py'
--- ubuntuone/storageprotocol/dircontent.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/dircontent.py	2018-04-14 22:31:56 +0000
@@ -31,7 +31,8 @@
 """Standard routines for working with directory content."""
 
 import re
-from ubuntuone.storageprotocol.dircontent_pb2 import DirectoryContent
+
+from magicicadaprotocol.dircontent_pb2 import DirectoryContent
 
 ILLEGAL_FILENAMES = [u".", u".."]
 ILLEGAL_FILENAME_CHARS_RE_SOURCE = r'[\000/]'
 
=== modified file 'magicicadaprotocol/errors.py'
--- ubuntuone/storageprotocol/errors.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/errors.py	2018-04-14 22:31:56 +0000
@@ -32,7 +32,7 @@
 
 import uuid
 
-from ubuntuone.storageprotocol import protocol_pb2
+from magicicadaprotocol import protocol_pb2
 
 
 class StorageProtocolError(Exception):
@@ -149,7 +149,7 @@
         share_id will be None if we got the exception without free space info.
         """
         # to avoid circular dependencies
-        from ubuntuone.storageprotocol.request import ROOT
+        from magicicadaprotocol.request import ROOT
         super(QuotaExceededError, self).__init__(request, message)
         self.free_bytes = message.free_space_info.free_bytes
         if message.free_space_info.share_id:
 
=== modified file 'magicicadaprotocol/protocol.proto'
--- ubuntuone/storageprotocol/protocol.proto	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/protocol.proto	2018-04-14 22:31:56 +0000
@@ -27,9 +27,9 @@
  version.  If you delete this exception statement from all source
  files in the program, then also delete it here.
 */
-package ubuntuone.storageprotocol;
+package magicicadaprotocol;
 
-option java_package = "com.ubuntuone.storageprotocol";
+option java_package = "com.magicicadaprotocol";
 option java_outer_classname = "StorageProtocol";
 
 message Message {
 
=== modified file 'magicicadaprotocol/request.py'
--- ubuntuone/storageprotocol/request.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/request.py	2018-04-14 22:31:56 +0000
@@ -43,8 +43,8 @@
 from twisted.internet import defer
 from zope.interface import implements
 
-from ubuntuone.storageprotocol import protocol_pb2, validators
-from ubuntuone.storageprotocol.errors import (
+from magicicadaprotocol import protocol_pb2, validators
+from magicicadaprotocol.errors import (
     StorageProtocolError, StorageProtocolErrorSizeTooBig,
     StorageProtocolProtocolError, StorageRequestError,
     RequestCancelledError, error_to_exception)
 
=== modified file 'magicicadaprotocol/sharersp.py'
--- ubuntuone/storageprotocol/sharersp.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/sharersp.py	2018-04-14 22:31:56 +0000
@@ -32,7 +32,7 @@
 
 import uuid
 
-from ubuntuone.storageprotocol import volumes
+from magicicadaprotocol import volumes
 
 
 class ShareResponse(object):
 
=== modified file 'magicicadaprotocol/tests/__init__.py'
--- ubuntuone/storageprotocol/tests/__init__.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/__init__.py	2018-04-14 22:31:56 +0000
@@ -26,4 +26,4 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 
-"""Tests for ubuntuone.storageprotocol."""
+"""Tests for magicicadaprotocol."""
 
=== modified file 'magicicadaprotocol/tests/test_bytesproducer.py'
--- ubuntuone/storageprotocol/tests/test_bytesproducer.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_bytesproducer.py	2018-04-14 22:31:56 +0000
@@ -38,7 +38,7 @@
 from twisted.internet import defer, task
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
-from ubuntuone.storageprotocol import client, protocol_pb2
+from magicicadaprotocol import client, protocol_pb2
 
 
 class FakeRequest(object):
 
=== modified file 'magicicadaprotocol/tests/test_client.py'
--- ubuntuone/storageprotocol/tests/test_client.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_client.py	2018-04-14 22:31:56 +0000
@@ -42,8 +42,8 @@
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from twisted.web import server, resource
 
-from ubuntuone.storageprotocol import protocol_pb2, sharersp, delta, request
-from ubuntuone.storageprotocol.client import (
+from magicicadaprotocol import delta, protocol_pb2, request, sharersp, volumes
+from magicicadaprotocol.client import (
     Authenticate,
     BytesMessageProducer,
     ChangePublicAccess,
@@ -60,8 +60,7 @@
     Unlink,
 )
 
-from ubuntuone.storageprotocol import volumes
-from ubuntuone.storageprotocol.tests import test_delta_info
+from magicicadaprotocol.tests import test_delta_info
 
 
 PATH = u'~/Documents/pdfs/moño/'
 
=== modified file 'magicicadaprotocol/tests/test_context.py'
--- ubuntuone/storageprotocol/tests/test_context.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_context.py	2018-04-14 22:31:56 +0000
@@ -35,7 +35,7 @@
 from twisted.trial import unittest
 from twisted.web import client, resource, server
 
-from ubuntuone.storageprotocol import context
+from magicicadaprotocol import context
 
 
 class FakeCerts(object):
 
=== modified file 'magicicadaprotocol/tests/test_delta_info.py'
--- ubuntuone/storageprotocol/tests/test_delta_info.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_delta_info.py	2018-04-14 22:31:56 +0000
@@ -32,7 +32,7 @@
 
 import unittest
 
-from ubuntuone.storageprotocol import (
+from magicicadaprotocol import (
     protocol_pb2,
     delta,
     content_hash,
 
=== modified file 'magicicadaprotocol/tests/test_dircontent.py'
--- ubuntuone/storageprotocol/tests/test_dircontent.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_dircontent.py	2018-04-14 22:31:56 +0000
@@ -33,11 +33,12 @@
 from __future__ import with_statement
 
 from cStringIO import StringIO
-from ubuntuone.storageprotocol.dircontent import (
+from unittest import TestCase
+
+from magicicadaprotocol.dircontent import (
     parse_dir_content, write_dir_content, DirEntry,
     normalize_filename, validate_filename, InvalidFilename)
-from ubuntuone.storageprotocol.dircontent_pb2 import (DIRECTORY, FILE)
-from unittest import TestCase
+from magicicadaprotocol.dircontent_pb2 import DIRECTORY, FILE
 
 
 class TestFilenames(TestCase):
 
=== modified file 'magicicadaprotocol/tests/test_errors.py'
--- ubuntuone/storageprotocol/tests/test_errors.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_errors.py	2018-04-14 22:31:56 +0000
@@ -33,7 +33,7 @@
 import unittest
 import uuid
 
-from ubuntuone.storageprotocol import errors, protocol_pb2
+from magicicadaprotocol import errors, protocol_pb2
 
 REQ_ARGS = dict(request=None, message=protocol_pb2.Message())
 
 
=== modified file 'magicicadaprotocol/tests/test_hashes.py'
--- ubuntuone/storageprotocol/tests/test_hashes.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_hashes.py	2018-04-14 22:31:56 +0000
@@ -35,7 +35,7 @@
 import pickle
 import unittest
 
-from ubuntuone.storageprotocol.content_hash import (
+from magicicadaprotocol.content_hash import (
     MagicContentHash,
     SHA1ContentHash,
     content_hash_factory,
 
=== modified file 'magicicadaprotocol/tests/test_proxy_tunnel.py'
--- ubuntuone/storageprotocol/tests/test_proxy_tunnel.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_proxy_tunnel.py	2018-04-14 22:31:56 +0000
@@ -36,7 +36,8 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from twisted.test.proto_helpers import StringTransport
-from ubuntuone.storageprotocol.proxy_tunnel import ProxyTunnelFactory
+
+from magicicadaprotocol.proxy_tunnel import ProxyTunnelFactory
 
 
 class FakeTransport(StringTransport):
 
=== modified file 'magicicadaprotocol/tests/test_public_file_info.py'
--- ubuntuone/storageprotocol/tests/test_public_file_info.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_public_file_info.py	2018-04-14 22:31:56 +0000
@@ -31,7 +31,7 @@
 
 import unittest
 
-from ubuntuone.storageprotocol import protocol_pb2, public_file_info, request
+from magicicadaprotocol import protocol_pb2, public_file_info, request
 
 SHARE = "share_id"
 NODE = "node_id"
 
=== modified file 'magicicadaprotocol/tests/test_putcontent.py'
--- ubuntuone/storageprotocol/tests/test_putcontent.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_putcontent.py	2018-04-14 22:31:56 +0000
@@ -34,12 +34,11 @@
 
 from StringIO import StringIO
 
+from mocker import Mocker, ANY
 from twisted.test.proto_helpers import StringTransport
 
-from ubuntuone.storageprotocol.client import PutContent, StorageClient
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol import protocol_pb2
-from mocker import Mocker, ANY
+from magicicadaprotocol import protocol_pb2, request
+from magicicadaprotocol.client import PutContent, StorageClient
 
 
 class TestOffset(unittest.TestCase):
 
=== modified file 'magicicadaprotocol/tests/test_query.py'
--- ubuntuone/storageprotocol/tests/test_query.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_query.py	2018-04-14 22:31:56 +0000
@@ -33,7 +33,7 @@
 import os
 import unittest
 
-from ubuntuone.storageprotocol.client import MultiQuery
+from magicicadaprotocol.client import MultiQuery
 
 
 class TestQuery10(unittest.TestCase):
 
=== modified file 'magicicadaprotocol/tests/test_request.py'
--- ubuntuone/storageprotocol/tests/test_request.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_request.py	2018-04-14 22:31:56 +0000
@@ -38,8 +38,8 @@
 from twisted.python.failure import Failure
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
-from ubuntuone.storageprotocol import errors, protocol_pb2
-from ubuntuone.storageprotocol.request import (
+from magicicadaprotocol import errors, protocol_pb2
+from magicicadaprotocol.request import (
     RequestHandler, Request, RequestResponse)
 
 
 
=== modified file 'magicicadaprotocol/tests/test_sharersp.py'
--- ubuntuone/storageprotocol/tests/test_sharersp.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_sharersp.py	2018-04-14 22:31:56 +0000
@@ -35,8 +35,8 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.storageprotocol.sharersp import ShareResponse
-from ubuntuone.storageprotocol import protocol_pb2
+from magicicadaprotocol import protocol_pb2
+from magicicadaprotocol.sharersp import ShareResponse
 
 
 class ShareResponseFromParamsTest(TestCase):
 
=== modified file 'magicicadaprotocol/tests/test_throttling.py'
--- ubuntuone/storageprotocol/tests/test_throttling.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_throttling.py	2018-04-14 22:31:56 +0000
@@ -35,7 +35,7 @@
 from twisted.internet import defer, task
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
-from ubuntuone.storageprotocol import client
+from magicicadaprotocol import client
 
 
 class FakeClient(object):
 
=== modified file 'magicicadaprotocol/tests/test_volumes.py'
--- ubuntuone/storageprotocol/tests/test_volumes.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/tests/test_volumes.py	2018-04-14 22:31:56 +0000
@@ -35,7 +35,7 @@
 
 from copy import copy
 
-from ubuntuone.storageprotocol import protocol_pb2, volumes
+from magicicadaprotocol import protocol_pb2, volumes
 
 PATH = u'~/Documents/pdfs/moño/'
 NAME = u'What a beatiful volume'
 
=== modified file 'magicicadaprotocol/validators.py'
--- ubuntuone/storageprotocol/validators.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/validators.py	2018-04-14 22:31:56 +0000
@@ -84,7 +84,7 @@
 
     """
     # circular import
-    from ubuntuone.storageprotocol import request
+    from magicicadaprotocol import request
     is_valid = (a_hash == '' or a_hash == request.UNKNOWN_HASH or
                 is_valid_sha1(a_hash))
     return is_valid
@@ -95,7 +95,7 @@
     Recursively validate a message's fields
     """
     is_invalid = []
-    from ubuntuone.storageprotocol import validators  # this is us!
+    from magicicadaprotocol import validators  # this is us!
     for descriptor, submsg in message.ListFields():
         if isinstance(submsg, CONTAINER_CLASSES):
             # containers are iterables that have messages in them
 
=== modified file 'magicicadaprotocol/volumes.py'
--- ubuntuone/storageprotocol/volumes.py	2018-04-08 19:38:42 +0000
+++ magicicadaprotocol/volumes.py	2018-04-14 22:31:56 +0000
@@ -32,7 +32,7 @@
 
 import uuid
 
-from ubuntuone.storageprotocol import protocol_pb2
+from magicicadaprotocol import protocol_pb2
 
 _direction_prot2nice = {
     protocol_pb2.Shares.FROM_ME: "from_me",
 
=== modified file 'samples/easy_client.py'
--- samples/easy_client.py	2018-04-08 19:38:42 +0000
+++ samples/easy_client.py	2018-04-14 22:31:56 +0000
@@ -38,10 +38,10 @@
 
 from twisted.internet import reactor, defer
 
-from ubuntuone.storageprotocol.client import (
+from magicicadaprotocol import request, protocol_pb2
+from magicicadaprotocol.client import (
     StorageClientFactory, StorageClient)
-from ubuntuone.storageprotocol import request, protocol_pb2
-from ubuntuone.storageprotocol.dircontent_pb2 import (
+from magicicadaprotocol.dircontent_pb2 import (
     DirectoryContent, DIRECTORY)
 
 
@@ -302,7 +302,7 @@
     NUM_CLIENTS = 200
     NUM_FILES = 50
 
-    port_num = int(open("tmp/ubuntuone-api.port").read())
+    port_num = int(open("tmp/magicicada-api.port").read())
     deferred = authenticated_client("localhost", int(port_num))
     deferred.addCallback(create_dirs, NUM_CLIENTS)
 
 
=== modified file 'samples/ping_client.py'
--- samples/ping_client.py	2018-04-08 19:38:42 +0000
+++ samples/ping_client.py	2018-04-14 22:31:56 +0000
@@ -32,8 +32,7 @@
 
 from twisted.internet import reactor
 
-from ubuntuone.storageprotocol.client import (
-    StorageClientFactory, StorageClient)
+from magicicadaprotocol.client import StorageClientFactory, StorageClient
 
 
 class PingClient(StorageClient):
@@ -83,7 +82,7 @@
     #           ssl.ClientContextFactory())
 
     # using ssl over a proxy
-    # from ubuntuone.storageprotocol import proxy_tunnel
+    # from magicicadaprotocol import proxy_tunnel
     # proxy_tunnel.connectHTTPS('localhost', 3128,
     #        'localhost', 20101, StorageClientFactory(),
     #        user="test", passwd="test")
 
=== modified file 'setup.py'
--- setup.py	2018-04-14 22:08:27 +0000
+++ setup.py	2018-04-14 22:31:56 +0000
@@ -39,7 +39,7 @@
                              " package installed?\n")
             sys.exit(-1)
 
-        for source in glob.glob('ubuntuone/storageprotocol/*.proto'):
+        for source in glob.glob('magicicadaprotocol/*.proto'):
             # glob works with unix and does not like \ in the search path,
             # we use / and correct the issue on windows when appropiate
             if sys.platform == "win32":
@@ -58,7 +58,7 @@
 
     def run(self):
         """Do the clean up"""
-        for source in glob.glob("ubuntuone/storageprotocol/*_pb2.py"):
+        for source in glob.glob("magicicadaprotocol/*_pb2.py"):
             os.unlink(source)
 
         # Call the parent class clean command
@@ -66,9 +66,8 @@
 
 
 setup(
-    name='ubuntuone-storageprotocol',
-    namespace_packages=['ubuntuone'],
-    version='1.0',
+    name='magicicadaprotocol',
+    version='2.0',
     description=(
         'The protocol implementation for the Magicicada filesync server '
         '(open source fork of the Ubuntu One filesync).'),
 
=== removed directory 'ubuntuone'
=== removed file 'ubuntuone/__init__.py'
--- ubuntuone/__init__.py	2018-04-08 19:38:42 +0000
+++ ubuntuone/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2009-2012 Canonical Ltd.
-# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License version 3,
-# as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-
-"""ubuntuone package."""
-
-__import__('pkg_resources').declare_namespace(__name__)