Merge lp:~nataliabidart/magicicada-client/hook-with-github into lp:magicicada-client

[Natalia Bidart]

- Started gathering dependencies.
- Initial search and replace for s/Ubuntu One/Magicicada/

[Facundo Batista (facundo)]

Awesome

review: Approve

=== modified file 'contrib/testing/__init__.py'
--- contrib/testing/__init__.py	2012-04-09 20:07:05 +0000
+++ contrib/testing/__init__.py	2015-09-17 02:36:40 +0000
@@ -24,4 +24,4 @@
 # 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.
-"""Testing utilities for Ubuntu One client code."""
+"""Testing utilities for Magicicada client code."""

=== added file 'dependencies-devel.txt'
--- dependencies-devel.txt	1970-01-01 00:00:00 +0000
+++ dependencies-devel.txt	2015-09-17 02:36:40 +0000
@@ -0,0 +1,2 @@
+ubuntuone-dev-tools
+python-mocker

=== added file 'dependencies.txt'
--- dependencies.txt	1970-01-01 00:00:00 +0000
+++ dependencies.txt	2015-09-17 02:36:40 +0000
@@ -0,0 +1,1 @@
+python-pyinotify

=== modified file 'setup.py'
--- setup.py	2013-07-10 19:38:26 +0000
+++ setup.py	2015-09-17 02:36:40 +0000
@@ -42,8 +42,8 @@
     'needs DistUtilsExtra.auto >= 2.18'
 
 
-PROJECT_NAME = 'ubuntuone-client'
-VERSION = '99.12'
+PROJECT_NAME = 'magicicada-client'
+VERSION = '1.0'
 
 POT_FILE = 'po/%s.pot' % PROJECT_NAME
 SERVICE_FILES = ['data/com.ubuntuone.Credentials.service',
@@ -248,9 +248,9 @@
     name=PROJECT_NAME,
     version=VERSION,
     license='GPL v3',
-    author='Ubuntu One Developers',
-    author_email='[e-mail]',
-    description='Ubuntu One file synchronization client',
+    author='Chicharreros',
+    author_email='magicicada-hackers@@lists.launchpad.net',
+    description='Magicicada file synchronization client',
     url='https://launchpad.net/%s' % PROJECT_NAME,
     extra_path=PROJECT_NAME,
     scripts=scripts,

=== modified file 'tests/platform/credentials/test_ipc_service.py'
--- tests/platform/credentials/test_ipc_service.py	2012-06-14 16:54:45 +0000
+++ tests/platform/credentials/test_ipc_service.py	2015-09-17 02:36:40 +0000
@@ -28,7 +28,7 @@
 # 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.
-"""Tests for the Ubuntu One credentials management IPC service."""
+"""Tests for the Magicicada credentials management IPC service."""
 
 import logging
 

=== modified file 'tests/platform/credentials/test_linux.py'
--- tests/platform/credentials/test_linux.py	2012-11-30 21:35:32 +0000
+++ tests/platform/credentials/test_linux.py	2015-09-17 02:36:40 +0000
@@ -28,7 +28,7 @@
 # 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.
-"""Tests for the Ubuntu One credentials management dbus service."""
+"""Tests for the Magicicada credentials management dbus service."""
 
 import logging
 
@@ -254,7 +254,7 @@
 
 
 class CredentialsManagementTestCase(BaseTestCase):
-    """Test case for the DBus object that manages Ubuntu One credentials."""
+    """Test case for the DBus object that manages Magicicada credentials."""
 
     signals = ('CredentialsFound', 'CredentialsNotFound', 'CredentialsCleared',
                'CredentialsStored', 'CredentialsError', 'AuthorizationDenied')

=== modified file 'tests/platform/linux/test_vm.py'
--- tests/platform/linux/test_vm.py	2012-04-09 20:07:05 +0000
+++ tests/platform/linux/test_vm.py	2015-09-17 02:36:40 +0000
@@ -145,7 +145,7 @@
                 "serq\x07U\x07subtreeq\x08U$beb0c48c-6755-4fbd-938f-3d20" + \
                 "fa7b102bq\tU\x12other_visible_nameq\nU\tfake userq\x0bU" + \
                 "\x0caccess_levelq\x0cU\x04Viewq\rU\x04pathq\x0eU=/home/" + \
-                "auser/Ubuntu One/Shared With Me/fakeshare from fakeuser" + \
+                "auser/Magicicada/Shared With Me/fakeshare from fakeuser" + \
                 "q\x0fU\x08acceptedq\x10\x88U\x02idq\x11U$0664f050-9254-" + \
                 "45c5-9f31-3482858709e4q\x12ub."
         with open(share_file, 'w') as fd:

=== modified file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	2013-11-08 18:00:18 +0000
+++ tests/platform/sync_menu/test_linux.py	2015-09-17 02:36:40 +0000
@@ -143,7 +143,7 @@
     def __init__(self):
         self.connect_called = False
         self.disconnect_called = False
-        self.fake_root_path = "/home/user/Ubuntu One"
+        self.fake_root_path = "/home/user/Magicicada"
 
     def connect(self):
         """Set connect to True."""

=== modified file 'tests/platform/test_credentials.py'
--- tests/platform/test_credentials.py	2012-04-09 20:07:05 +0000
+++ tests/platform/test_credentials.py	2015-09-17 02:36:40 +0000
@@ -225,7 +225,7 @@
 
 
 class CredentialsManagementToolTestCase(TestCase):
-    """Test case for the object that manages Ubuntu One credentials."""
+    """Test case for the object that manages Magicicada credentials."""
 
     timeout = 3
     error_dict = None

=== modified file 'tests/proxy/__init__.py'
--- tests/proxy/__init__.py	2012-04-09 20:07:05 +0000
+++ tests/proxy/__init__.py	2015-09-17 02:36:40 +0000
@@ -24,7 +24,7 @@
 # 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.
-"""Tests for the Ubuntu One proxy support."""
+"""Tests for the Magicicada proxy support."""
 
 from os import path
 from StringIO import StringIO

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2013-01-24 16:14:31 +0000
+++ tests/syncdaemon/test_fsm.py	2015-09-17 02:36:40 +0000
@@ -323,8 +323,8 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid1")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, 'share1_name')
         make_link(self.shares_dir, old_shares_path)
@@ -386,8 +386,8 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid1")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, 'share1_name')
         make_link(self.shares_dir, old_shares_path)
@@ -448,8 +448,8 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid1")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, 'share1_name')
         make_link(self.shares_dir, old_shares_path)
@@ -506,13 +506,13 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid1")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, 'share1_name')
         make_link(self.shares_dir, old_shares_path)
         old_root_path = os.path.join(os.path.dirname(self.root_dir),
-                                     'Ubuntu One', 'My Files')
+                                     'Magicicada', 'My Files')
 
         # simulate old data in the mdobjs
         share_md = self.fsm.fs[share_mdid]
@@ -3458,8 +3458,8 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid1")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, u'share1_name')
         make_link(self.shares_dir, old_shares_path)
@@ -3525,8 +3525,8 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid3")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, u'share1_name')
         make_link(self.shares_dir, old_shares_path)
@@ -3587,8 +3587,8 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid3")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, u'share1_name')
         make_link(self.shares_dir, old_shares_path)
@@ -3645,13 +3645,13 @@
         other_share = yield self.create_share('share1', u'share1_name')
         share_mdid = self.fsm.create(other_share.path, "share1")
         self.fsm.set_node_id(other_share.path, "uuid1")
-        make_dir(os.path.join(self.root_dir, 'Ubuntu One'), recursive=True)
-        old_shares_path = os.path.join(self.root_dir, 'Ubuntu One',
+        make_dir(os.path.join(self.root_dir, 'Magicicada'), recursive=True)
+        old_shares_path = os.path.join(self.root_dir, 'Magicicada',
                             'Shared With Me')
         old_path = os.path.join(old_shares_path, u'share1_name')
         make_link(self.shares_dir, old_shares_path)
         old_root_path = os.path.join(os.path.dirname(self.root_dir),
-                                     'Ubuntu One', 'My Files')
+                                     'Magicicada', 'My Files')
 
         # put the old path in the mdobjs
         share_md = self.fsm.fs[share_mdid]

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2013-01-22 20:56:35 +0000
+++ tests/syncdaemon/test_vm.py	2015-09-17 02:36:40 +0000
@@ -3928,7 +3928,7 @@
         """Create some directories."""
         yield super(MetadataTestCase, self).setUp()
         self.root_dir = self.mktemp(
-            os.path.join('ubuntuonehacker', 'Ubuntu One'))
+            os.path.join('ubuntuonehacker', 'Magicicada'))
         self.data_dir = os.path.join(self.tmpdir, 'data_dir')
         self.vm_data_dir = os.path.join(self.tmpdir, 'data_dir', 'vm')
         self.partials_dir = self.mktemp('partials')

=== modified file 'ubuntuone/platform/credentials/__init__.py'
--- ubuntuone/platform/credentials/__init__.py	2012-06-21 18:58:50 +0000
+++ ubuntuone/platform/credentials/__init__.py	2015-09-17 02:36:40 +0000
@@ -68,7 +68,7 @@
 
 NO_OP = lambda *args, **kwargs: None
 Q_ = lambda string: gettext.dgettext(clientdefs.GETTEXT_PACKAGE, string)
-APP_NAME = u"Ubuntu One"
+APP_NAME = u"Magicicada"
 TC_URL = u"https://one.ubuntu.com/terms/"
 POLICY_URL = u"https://one.ubuntu.com/privacy/"
 
@@ -87,7 +87,7 @@
     u"https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/{email}"
 # the result of platform_data is given by urlencode, encoded with ascii
 PING_URL = BASE_PING_URL + u"?" + platform_data().decode('ascii')
-DESCRIPTION = Q_('Ubuntu One requires an Ubuntu Single Sign On (SSO) account. '
+DESCRIPTION = Q_('Magicicada requires an Ubuntu Single Sign On (SSO) account. '
                  'This process will allow you to create a new account, '
                  'if you do not yet have one.')
 UI_PARAMS = {
@@ -155,10 +155,10 @@
     @log_call(logger.debug, with_result=False)
     @defer.inlineCallbacks
     def find_credentials(self):
-        """Find credentials for Ubuntu One.
+        """Find credentials for Magicicada.
 
         Return a deferred that, when fired, will return the credentials for
-        Ubuntu One for the current logged in user.
+        Magicicada for the current logged in user.
 
         The credentials is a dictionary with both string keys and values. The
         dictionary may be either empty if there are no credentials for the
@@ -200,10 +200,10 @@
     @log_call(logger.debug)
     @defer.inlineCallbacks
     def clear_credentials(self):
-        """Clear credentials for Ubuntu One.
+        """Clear credentials for Magicicada.
 
         Return a deferred that, when fired, will return no result but will
-        indicate that the Ubuntu One credentials for the current user were
+        indicate that the Magicicada credentials for the current user were
         removed from the local keyring.
 
         """
@@ -233,7 +233,7 @@
     @log_call(logger.debug, with_args=False)
     @defer.inlineCallbacks
     def store_credentials(self, token):
-        """Store credentials for Ubuntu One.
+        """Store credentials for Magicicada.
 
         The parameter 'token' should be a dictionary that matches the
         description of the result of 'find_credentials'.
@@ -269,13 +269,13 @@
     @log_call(logger.debug, with_result=False)
     @defer.inlineCallbacks
     def register(self, window_id=0):
-        """Register to Ubuntu One.
+        """Register to Magicicada.
 
         Return a deferred that, when fired, will return the credentials for
-        Ubuntu One for the current logged in user.
+        Magicicada for the current logged in user.
 
         If there are no credentials for the current user, a GTK UI will be
-        opened to invite the user to register to Ubuntu One. This UI provides
+        opened to invite the user to register to Magicicada. This UI provides
         options to either register (main screen) or login (secondary screen).
 
         You can pass an optional 'window_id' parameter that will be used by the
@@ -284,7 +284,7 @@
         The returned credentials will be either a non-empty dictionary like the
         one described in 'find_credentials', or None. The latter indicates that
         there were no credentials for the user in the local keyring and that
-        the user refused to register to Ubuntu One.
+        the user refused to register to Magicicada.
 
         """
         d = defer.Deferred()
@@ -317,13 +317,13 @@
     @log_call(logger.debug, with_result=False)
     @defer.inlineCallbacks
     def login(self, window_id=0):
-        """Login to Ubuntu One.
+        """Login to Magicicada.
 
         Return a deferred that, when fired, will return the credentials for
-        Ubuntu One for the current logged in user.
+        Magicicada for the current logged in user.
 
         If there are no credentials for the current user, a GTK UI will be
-        opened to invite the user to login to Ubuntu One. This UI provides
+        opened to invite the user to login to Magicicada. This UI provides
         options to either login (main screen) or retrieve password (secondary
         screen).
 
@@ -333,7 +333,7 @@
         The returned credentials will be either a non-empty dictionary like the
         one described in 'find_credentials', or None. The latter indicates that
         there were no credentials for the user in the local keyring and that
-        the user refused to login to Ubuntu One.
+        the user refused to login to Magicicada.
 
         """
         d = defer.Deferred()
@@ -366,10 +366,10 @@
     @log_call(logger.debug, with_args=False, with_result=False)
     @defer.inlineCallbacks
     def login_email_password(self, email, password):
-        """Login to Ubuntu One.
+        """Login to Magicicada.
 
         Return a deferred that, when fired, will return the credentials for
-        Ubuntu One for the given email and password.
+        Magicicada for the given email and password.
 
         The returned credentials will be either a non-empty dictionary like the
         one described in 'find_credentials', or None. The latter indicates

=== modified file 'ubuntuone/platform/credentials/dbus_service.py'
--- ubuntuone/platform/credentials/dbus_service.py	2012-06-14 16:54:45 +0000
+++ ubuntuone/platform/credentials/dbus_service.py	2015-09-17 02:36:40 +0000
@@ -28,7 +28,7 @@
 # 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.
-"""Ubuntu One credentials management dbus service."""
+"""Magicicada credentials management dbus service."""
 
 import dbus
 import dbus.service
@@ -51,7 +51,7 @@
 
 
 class CredentialsManagement(dbus.service.Object):
-    """DBus object that manages Ubuntu One credentials."""
+    """DBus object that manages Magicicada credentials."""
 
     def __init__(self, timeout_func=lambda *a: None,
                  shutdown_func=lambda *a: None, *args, **kwargs):
@@ -180,7 +180,7 @@
     @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,
                          async_callbacks=("reply_handler", "error_handler"))
     def find_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
-        """Ask the Ubuntu One credentials."""
+        """Ask the Magicicada credentials."""
         self.ref_count += 1
         self.sso_proxy.find_credentials(APP_NAME,
                                         dbus.Dictionary({}, signature='ss'),
@@ -190,7 +190,7 @@
                          out_signature="a{ss}",
                          async_callbacks=("reply_handler", "error_handler"))
     def find_credentials_sync(self, reply_handler=NO_OP, error_handler=NO_OP):
-        """Ask the Ubuntu One credentials synchronously.
+        """Ask the Magicicada credentials synchronously.
 
         This method SHOULD NOT be used, is here only for compatibilty issues.
 
@@ -216,7 +216,7 @@
     @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,
                          async_callbacks=("reply_handler", "error_handler"))
     def clear_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
-        """Clear the Ubuntu One credentials."""
+        """Clear the Magicicada credentials."""
         self.ref_count += 1
         self.sso_proxy.clear_credentials(APP_NAME,
                                          dbus.Dictionary({}, signature='ss'),
@@ -227,7 +227,7 @@
                          async_callbacks=("reply_handler", "error_handler"))
     def store_credentials(self, credentials,
                           reply_handler=NO_OP, error_handler=NO_OP):
-        """Store the token for Ubuntu One application."""
+        """Store the token for Magicicada application."""
         self.ref_count += 1
         self.sso_proxy.store_credentials(APP_NAME, credentials,
             reply_handler=reply_handler, error_handler=error_handler)
@@ -236,7 +236,7 @@
                          in_signature='a{ss}',
                          async_callbacks=("reply_handler", "error_handler"))
     def register(self, args, reply_handler=NO_OP, error_handler=NO_OP):
-        """Get credentials if found else prompt to register to Ubuntu One."""
+        """Get credentials if found else prompt to register to Magicicada."""
         self.ref_count += 1
         params = dict(UI_PARAMS)
         params.update(args)
@@ -247,7 +247,7 @@
                          in_signature='a{ss}',
                          async_callbacks=("reply_handler", "error_handler"))
     def login(self, args, reply_handler=NO_OP, error_handler=NO_OP):
-        """Get credentials if found else prompt to login to Ubuntu One."""
+        """Get credentials if found else prompt to login to Magicicada."""
         self.ref_count += 1
         params = dict(UI_PARAMS)
         params.update(args)
@@ -259,7 +259,7 @@
                          async_callbacks=("reply_handler", "error_handler"))
     def login_email_password(self, args, reply_handler=NO_OP,
                              error_handler=NO_OP):
-        """Get credentials if found else prompt to login to Ubuntu One."""
+        """Get credentials if found else prompt to login to Magicicada."""
         self.ref_count += 1
         params = dict(UI_PARAMS)
         params.update(args)

=== modified file 'ubuntuone/platform/credentials/ipc_service.py'
--- ubuntuone/platform/credentials/ipc_service.py	2012-06-14 16:54:45 +0000
+++ ubuntuone/platform/credentials/ipc_service.py	2015-09-17 02:36:40 +0000
@@ -26,7 +26,7 @@
 # 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.
-"""Ubuntu One credentials management IPC service."""
+"""Magicicada credentials management IPC service."""
 
 
 from ubuntu_sso.main import get_sso_client
@@ -76,7 +76,7 @@
 
 
 class CredentialsManagement(object):
-    """Object that manages Ubuntu One credentials."""
+    """Object that manages Magicicada credentials."""
 
     _SIGNAL_TO_CALLBACK_MAPPING = {
         'AuthorizationDenied': 'on_authorization_denied_cb',
@@ -98,30 +98,30 @@
         return match
 
     def find_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
-        """Ask the Ubuntu One credentials."""
+        """Ask the Magicicada credentials."""
         d = self.sso_proxy.find_credentials(APP_NAME, {})
         d.addCallbacks(lambda _: reply_handler(), error_handler)
 
     def clear_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
-        """Clear the Ubuntu One credentials."""
+        """Clear the Magicicada credentials."""
         d = self.sso_proxy.clear_credentials(APP_NAME, {})
         d.addCallbacks(lambda _: reply_handler(), error_handler)
 
     def store_credentials(self, credentials,
                           reply_handler=NO_OP, error_handler=NO_OP):
-        """Store the token for Ubuntu One application."""
+        """Store the token for Magicicada application."""
         d = self.sso_proxy.store_credentials(APP_NAME, credentials)
         d.addCallbacks(lambda _: reply_handler(), error_handler)
 
     def register(self, args, reply_handler=NO_OP, error_handler=NO_OP):
-        """Get credentials if found else prompt to register to Ubuntu One."""
+        """Get credentials if found else prompt to register to Magicicada."""
         params = dict(UI_PARAMS)
         params.update(args)
         d = self.sso_proxy.register(APP_NAME, params)
         d.addCallbacks(lambda _: reply_handler(), error_handler)
 
     def login(self, args, reply_handler=NO_OP, error_handler=NO_OP):
-        """Get credentials if found else prompt to login to Ubuntu One."""
+        """Get credentials if found else prompt to login to Magicicada."""
         params = dict(UI_PARAMS)
         params.update(args)
         d = self.sso_proxy.login(APP_NAME, params)
@@ -129,7 +129,7 @@
 
     def login_email_password(self, args,
                              reply_handler=NO_OP, error_handler=NO_OP):
-        """Get credentials if found else login to Ubuntu One."""
+        """Get credentials if found else login to Magicicada."""
         params = dict(UI_PARAMS)
         params.update(args)
         d = self.sso_proxy.login_email_password(APP_NAME, params)

=== modified file 'ubuntuone/platform/launcher/linux.py'
--- ubuntuone/platform/launcher/linux.py	2012-05-02 19:07:59 +0000
+++ ubuntuone/platform/launcher/linux.py	2015-09-17 02:36:40 +0000
@@ -40,7 +40,7 @@
 
 
 class UbuntuOneLauncherUnity(object):
-    """The Ubuntu One launcher icon."""
+    """The Magicicada launcher icon."""
 
     def __init__(self):
         self.entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)

=== modified file 'ubuntuone/platform/launcher/windows.py'
--- ubuntuone/platform/launcher/windows.py	2012-05-02 19:07:59 +0000
+++ ubuntuone/platform/launcher/windows.py	2015-09-17 02:36:40 +0000
@@ -34,7 +34,7 @@
 
 
 class UbuntuOneLauncher(object):
-    """The Ubuntu One launcher icon."""
+    """The Magicicada launcher icon."""
 
     def __init__(self):
         """Initialize this instance."""

=== modified file 'ubuntuone/platform/notification/linux.py'
--- ubuntuone/platform/notification/linux.py	2013-01-28 18:10:43 +0000
+++ ubuntuone/platform/notification/linux.py	2015-09-17 02:36:40 +0000
@@ -39,7 +39,7 @@
 
 from ubuntuone.status.notification import AbstractNotification
 
-APPLICATION_NAME = 'Ubuntu One Client'
+APPLICATION_NAME = 'Magicicada Client'
 ICON_NAME = "ubuntuone"
 
 

=== modified file 'ubuntuone/platform/notification/windows.py'
--- ubuntuone/platform/notification/windows.py	2012-04-30 18:56:56 +0000
+++ ubuntuone/platform/notification/windows.py	2015-09-17 02:36:40 +0000
@@ -32,7 +32,7 @@
 
 from ubuntuone.status.notification import AbstractNotification
 
-APPLICATION_NAME = 'Ubuntu One Client'
+APPLICATION_NAME = 'Magicicada Client'
 
 
 class Notification(AbstractNotification):

=== modified file 'ubuntuone/platform/session/linux.py'
--- ubuntuone/platform/session/linux.py	2012-04-27 19:30:11 +0000
+++ ubuntuone/platform/session/linux.py	2015-09-17 02:36:40 +0000
@@ -36,7 +36,7 @@
 SESSION_MANAGER_IFACE = "org.gnome.SessionManager"
 SESSION_MANAGER_PATH = "/org/gnome/SessionManager"
 
-APP_ID = "Ubuntu One"
+APP_ID = "Magicicada"
 TOPLEVEL_XID = 0
 
 

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2013-11-08 17:59:47 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2015-09-17 02:36:40 +0000
@@ -58,10 +58,10 @@
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
 GET_HELP = Q_("Get Help on the Web")
-GO_TO_WEB = Q_("Go to the Ubuntu One Website")
+GO_TO_WEB = Q_("Go to the Magicicada Website")
 MORE_STORAGE = Q_("Get More Space")
-OPEN_U1 = Q_("Open Ubuntu One")
-OPEN_U1_FOLDER = Q_("Open the Ubuntu One Folder")
+OPEN_U1 = Q_("Open Magicicada")
+OPEN_U1_FOLDER = Q_("Open the Magicicada Folder")
 SHARE_A_FILE = Q_("Share a File")
 TRANSFERS = Q_("Current and Recent Transfers")
 
@@ -184,7 +184,7 @@
             command_line += ' ' + args
 
         try:
-            app = Gio.AppInfo.create_from_commandline(command_line, 'Ubuntu One', flags)
+            app = Gio.AppInfo.create_from_commandline(command_line, 'Magicicada', flags)
 
             if app:
                 app.launch([], self._get_launch_context(timestamp))
@@ -192,7 +192,7 @@
             logger.warning('Failed to open the control panel: %s.' % e)
 
     def open_control_panel(self, menuitem=None, timestamp=0):
-        """Open the Ubuntu One Control Panel."""
+        """Open the Magicicada Control Panel."""
         app = Gio.DesktopAppInfo.new(CLIENT_DESKTOP_ID)
 
         if app:
@@ -204,7 +204,7 @@
             self._open_control_panel_by_command_line(timestamp)
 
     def open_ubuntu_one_folder(self, menuitem=None, timestamp=0):
-        """Open the Ubuntu One folder."""
+        """Open the Magicicada folder."""
         self._open_uri("file://" + self._syncdaemon_service.get_rootdir(), timestamp)
 
     def open_share_file_tab(self, menuitem=None, timestamp=0):
@@ -212,15 +212,15 @@
         self._open_control_panel_by_command_line(timestamp, "--switch-to share_links")
 
     def open_go_to_web(self, menuitem=None, timestamp=0):
-        """Open the Ubuntu One Help Page"""
+        """Open the Magicicada Help Page"""
         self._open_uri(DASHBOARD, timestamp)
 
     def open_web_help(self, menuitem=None, timestamp=0):
-        """Open the Ubuntu One Help Page"""
+        """Open the Magicicada Help Page"""
         self._open_uri(HELP_LINK, timestamp)
 
     def open_get_more_storage(self, menuitem=None, timestamp=0):
-        """Open the Ubuntu One Help Page"""
+        """Open the Magicicada Help Page"""
         self._open_uri(GET_STORAGE_LINK, timestamp)
 
     def _timeout(self, result):

=== modified file 'ubuntuone/proxy/__init__.py'
--- ubuntuone/proxy/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/proxy/__init__.py	2015-09-17 02:36:40 +0000
@@ -24,4 +24,4 @@
 # 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.
-"""Ubuntu One proxy support."""
+"""Magicicada proxy support."""

=== modified file 'ubuntuone/proxy/tunnel_client.py'
--- ubuntuone/proxy/tunnel_client.py	2012-11-28 00:09:34 +0000
+++ ubuntuone/proxy/tunnel_client.py	2015-09-17 02:36:40 +0000
@@ -54,7 +54,7 @@
         method_line = METHOD_LINE % (self.factory.tunnel_host,
                                      self.factory.tunnel_port)
         headers = {
-            "User-Agent": "Ubuntu One tunnel client",
+            "User-Agent": "Magicicada tunnel client",
             TUNNEL_COOKIE_HEADER: self.factory.cookie,
         }
         self.transport.write(method_line +

=== modified file 'ubuntuone/proxy/tunnel_server.py'
--- ubuntuone/proxy/tunnel_server.py	2013-01-17 13:26:48 +0000
+++ ubuntuone/proxy/tunnel_server.py	2015-09-17 02:36:40 +0000
@@ -269,7 +269,7 @@
                 logger.info("Connected with keyring credentials")
 
             response_headers = {
-                "Server": "Ubuntu One proxy tunnel",
+                "Server": "Magicicada proxy tunnel",
             }
             self.write_transport("HTTP/1.0 200 Proxy connection established" +
                                  CRLF + self.format_headers(response_headers) +

=== modified file 'ubuntuone/status/__init__.py'
--- ubuntuone/status/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/status/__init__.py	2015-09-17 02:36:40 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.status - Ubuntu One status communication module
+# ubuntuone.status - Magicicada status communication module
 #
 # Copyright 2011-2012 Canonical Ltd.
 #

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2014-04-04 19:52:16 +0000
+++ ubuntuone/status/aggregator.py	2015-09-17 02:36:40 +0000
@@ -50,8 +50,8 @@
 ONE_DAY = 24 * 60 * 60
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
-UBUNTUONE_TITLE = Q_("Ubuntu One")
-UBUNTUONE_END = Q_("Ubuntu One file services will be "
+UBUNTUONE_TITLE = Q_("Magicicada")
+UBUNTUONE_END = Q_("Magicicada file services will be "
                    "shutting down on June 1st, 2014.\nThanks for your support.")
 NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
 FINAL_COMPLETED = Q_("File synchronization completed.")

=== modified file 'ubuntuone/status/notification.py'
--- ubuntuone/status/notification.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/status/notification.py	2015-09-17 02:36:40 +0000
@@ -32,7 +32,7 @@
 
 from abc import ABCMeta, abstractmethod
 
-APPLICATION_NAME = 'Ubuntu One Client'
+APPLICATION_NAME = 'Magicicada Client'
 
 
 class AbstractNotification(object):

=== modified file 'ubuntuone/syncdaemon/__init__.py'
--- ubuntuone/syncdaemon/__init__.py	2012-10-24 08:54:12 +0000
+++ ubuntuone/syncdaemon/__init__.py	2015-09-17 02:36:40 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.syncdaemon - Ubuntu One sync daemon modules
+# ubuntuone.syncdaemon - Magicicada sync daemon modules
 #
 # Copyright 2009-2012 Canonical Ltd.
 #

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2015-05-18 21:20:05 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2015-09-17 02:36:40 +0000
@@ -929,7 +929,7 @@
         host = urlparse(uri).netloc.split(":")[0]
         ssl_context = get_ssl_context(self.disable_ssl_verify, host)
         connector = yield self.tunnel_runner.get_client()
-        webclient = txweb.WebClient(connector=connector, appname="Ubuntu One",
+        webclient = txweb.WebClient(connector=connector, appname="Magicicada",
                                     oauth_sign_plain=True,
                                     context_factory=ssl_context)
         defer.returnValue(webclient)

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2013-01-22 20:04:42 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2015-09-17 02:36:40 +0000
@@ -412,11 +412,11 @@
         """fix the mdobj path for the new layout, only for shares root"""
         base_path, name = os.path.split(mdobj['path'])
         if base_path.startswith('/') and \
-           base_path.endswith('Ubuntu One/Shared With Me'):
+           base_path.endswith('Magicicada/Shared With Me'):
             realpath = os.path.realpath(mdobj['path'])
             mdobj['path'] = realpath
         if base_path.startswith('/') and \
-            base_path.endswith('Ubuntu One') and name == 'My Files':
+            base_path.endswith('Magicicada') and name == 'My Files':
             mdobj['path'] = base_path
 
     def _migrate_trash_to_tritcask(self):

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2015-05-18 21:20:05 +0000
+++ ubuntuone/syncdaemon/main.py	2015-09-17 02:36:40 +0000
@@ -106,7 +106,7 @@
         if not throttling_enabled:
             throttling_enabled = user_config.get_throttling()
 
-        self.logger.info("Starting Ubuntu One client version %s",
+        self.logger.info("Starting Magicicada client version %s",
                          clientdefs.VERSION)
         self.logger.info("Using %r as root dir", self.root_dir)
         self.logger.info("Using %r as data dir", self.data_dir)

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2013-01-22 20:56:35 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2015-09-17 02:36:40 +0000
@@ -1677,8 +1677,8 @@
     def _upgrade_metadata_3(self, md_version):
         """Upgrade to version 4 (new layout!)
 
-        move "~/Ubuntu One/Shared With" Me to XDG_DATA/ubuntuone/shares
-        move "~/Ubuntu One/My Files" contents to "~/Ubuntu One"
+        move "~/Magicicada/Shared With Me" to XDG_DATA/ubuntuone/shares
+        move "~/Magicicada/My Files" contents to "~/Magicicada"
 
         """
         from ubuntuone.syncdaemon.volume_manager import LegacyShareFileShelf