Merge lp:~nataliabidart/magicicada-client/magicicadaclient-namespace into lp:magicicada-client

[Natalia Bidart]

- Rename python package to magicicadaclient.

[Facundo Batista (facundo)]

Awesome!! Thanks

review: Approve

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2013-01-28 17:43:24 +0000
+++ bin/u1sdtool	2018-05-19 20:49:48 +0000
@@ -1,6 +1,7 @@
 #! /usr/bin/python
 #
 # Copyright 2009-2013 Canonical Ltd.
+# Copyright 2017-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 General Public License version 3, as published
@@ -51,7 +52,8 @@
 warnings.filterwarnings('ignore', message='.*Config(Option|Section).*',
                         category=DeprecationWarning)
 
-from ubuntuone.platform.tools import (
+from magicicadaclient.clientdefs import VERSION
+from magicicadaclient.platform.tools import (
     SyncDaemonTool,
     is_already_running,
     show_dirty_nodes,
@@ -69,7 +71,6 @@
     show_waiting_content,
     show_waiting_metadata,
 )
-from ubuntuone.clientdefs import VERSION
 
 
 @defer.inlineCallbacks

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2015-09-29 21:05:26 +0000
+++ bin/ubuntuone-launch	2018-05-19 20:49:48 +0000
@@ -1,10 +1,9 @@
 #!/usr/bin/python
-
+#
 # Magicicada storage synchronization daemon startup helper
 #
-# Author: John Lenton <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
+# Copyright 2017-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 General Public License version 3, as published
@@ -30,8 +29,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.
-"""
-Storage synchronization daemon (syncdaemon) startup helper.
+"""Storage synchronization daemon (syncdaemon) startup helper.
 
 This script decides whether to start and connect syncdaemon.
 
@@ -68,8 +66,8 @@
 from gi.repository import GLib
 from twisted.internet import defer
 
-from ubuntuone.syncdaemon.config import get_user_config
-from ubuntuone.platform.tools import SyncDaemonTool, is_already_running
+from magicicadaclient.syncdaemon.config import get_user_config
+from magicicadaclient.platform.tools import SyncDaemonTool, is_already_running
 
 
 @defer.inlineCallbacks

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2017-02-10 01:15:07 +0000
+++ bin/ubuntuone-syncdaemon	2018-05-19 20:49:48 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # Copyright 2009-2015 Canonical Ltd.
-# Copyright 2017 Chicharreros (https://launchpad.net/~chicharreros)
+# Copyright 2017-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 General Public License version 3, as published
@@ -41,9 +41,11 @@
 import atexit
 import os
 import signal
-import sys
-
-from ubuntuone.platform import (
+
+from twisted.internet import reactor, defer
+from dirspec.basedir import xdg_cache_home, xdg_data_home
+
+from magicicadaclient.platform import (
     can_write,
     set_dir_readwrite,
     is_already_running,
@@ -53,22 +55,12 @@
     recursive_move,
     set_application_name,
 )
-from ubuntuone.platform.filesystem_notifications.monitor import (
+from magicicadaclient.platform.filesystem_notifications.monitor import (
     get_filemonitor_class,
 )
-
-from ubuntuone.syncdaemon import logger, config
-from ubuntuone.syncdaemon.config import (
-    get_config_files,
-)
-
-from ubuntuone.syncdaemon.main import Main
-
-from twisted.internet import reactor, defer
-from dirspec.basedir import (
-    xdg_cache_home,
-    xdg_data_home,
-)
+from magicicadaclient.syncdaemon import logger, config
+from magicicadaclient.syncdaemon.main import Main
+
 
 
 class DeathException(Exception):
@@ -96,7 +88,7 @@
     while len(args) > 0 and not args[0].startswith('-'):
         configs.append(args.pop(0))
     if len(configs) == 0:
-        configs.extend(get_config_files())
+        configs.extend(config.get_config_files())
     (parser, options, argv) = config.configglue(file(configs[0]), *configs[1:],
                                                 args=args, usage=usage)
     d = async_main(parser, options, argv)

=== modified file 'contrib/__init__.py'
--- contrib/__init__.py	2012-04-09 20:07:05 +0000
+++ contrib/__init__.py	2018-05-19 20:49:48 +0000
@@ -1,7 +1,5 @@
 # contrib - Extra required code to build/install the client
 #
-# Author: Rodney Dawes <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -28,4 +26,5 @@
 # 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.
+
 """Extra things we need to build, test, or install the client."""

=== modified file 'contrib/dbus-docs'
--- contrib/dbus-docs	2013-01-28 17:43:24 +0000
+++ contrib/dbus-docs	2018-05-19 20:49:48 +0000
@@ -37,18 +37,12 @@
 import shutil
 
 from xml.etree import ElementTree
+from twisted.internet import reactor, defer
 
 sys.path.insert(0, os.path.abspath("."))
 
 from contrib.dbus_util import DBusRunner
-from contrib.testing.testcase import (
-    FakeMain, 
-    DBusGMainLoop, 
-    DBusInterface, 
-    FakeNetworkManager,
-)
-
-from ubuntuone.platform.dbus_interface import (
+from magicicadaclient.platform.dbus_interface import (
     DBUS_IFACE_SYNC_NAME,
     DBUS_IFACE_STATUS_NAME,
     DBUS_IFACE_EVENTS_NAME,
@@ -58,8 +52,13 @@
     DBUS_IFACE_FOLDERS_NAME,
     DBUS_IFACE_PUBLIC_FILES_NAME,
 )
-from ubuntuone.platform.tools import DBusClient
-from twisted.internet import reactor, defer
+from magicicadaclient.platform.tools import DBusClient
+from magicicadaclient.testing.testcase import (
+    FakeMain,
+    DBusGMainLoop,
+    DBusInterface,
+    FakeNetworkManager,
+)
 
 
 iface_path = ((DBUS_IFACE_SYNC_NAME, '/'), (DBUS_IFACE_CONFIG_NAME, '/config'),
@@ -206,4 +205,3 @@
             for dir in dirs:
                 os.chmod(os.path.join(dirpath, dir), 0777)
         shutil.rmtree(tmp_dir)
-

=== modified file 'contrib/dbus_util.py'
--- contrib/dbus_util.py	2012-04-09 20:07:05 +0000
+++ contrib/dbus_util.py	2018-05-19 20:49:48 +0000
@@ -37,10 +37,12 @@
 
 SRCDIR = os.environ.get('SRCDIR', os.getcwd())
 
+
 class DBusLaunchError(Exception):
     """Error while launching dbus-daemon"""
     pass
 
+
 class NotFoundError(Exception):
     """Not found error"""
     pass
@@ -85,4 +87,3 @@
         del os.environ["DBUS_SESSION_BUS_ADDRESS"]
         os.kill(self.dbus_pid, signal.SIGKILL)
         self.running = False
-

=== modified file 'contrib/draw-fsm'
--- contrib/draw-fsm	2016-05-27 23:45:26 +0000
+++ contrib/draw-fsm	2018-05-19 20:49:48 +0000
@@ -34,11 +34,11 @@
 import tempfile
 import time
 import sys
+import xdot
 
 from gi.repository import Gtk as gtk
 
-import xdot
-from ubuntuone.syncdaemon.fsm import fsm
+from magicicadaclient.syncdaemon.fsm import fsm
 
 
 def dict2label(d):
@@ -114,5 +114,6 @@
     window.connect('destroy', gtk.main_quit)
     gtk.main()
 
+
 if __name__ == "__main__":
     main(sys.argv[1], True)

=== modified file 'contrib/dump_metadata.py'
--- contrib/dump_metadata.py	2012-06-21 18:58:50 +0000
+++ contrib/dump_metadata.py	2018-05-19 20:49:48 +0000
@@ -25,8 +25,8 @@
 # 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.
-"""
-Dumps all the metadata.
+
+"""Dump all the metadata.
 
 Usage:
 
@@ -39,15 +39,13 @@
 import os
 import sys
 
-from ubuntuone.syncdaemon import (
+from dirspec.basedir import xdg_cache_home, xdg_data_home
+
+from magicicadaclient.syncdaemon import (
     filesystem_manager,
     tritcask,
     volume_manager,
 )
-from dirspec.basedir import (
-    xdg_cache_home,
-    xdg_data_home,
-)
 
 
 class FakeVM(object):
@@ -68,9 +66,12 @@
             print "      found:", repr(version_found)
             exit(-1)
 
-        self.shares = volume_manager.VMTritcaskShelf(volume_manager.SHARE_ROW_TYPE, db)
-        self.shared = volume_manager.VMTritcaskShelf(volume_manager.SHARED_ROW_TYPE, db)
-        self.udfs = volume_manager.VMTritcaskShelf(volume_manager.UDF_ROW_TYPE, db)
+        self.shares = volume_manager.VMTritcaskShelf(
+            volume_manager.SHARE_ROW_TYPE, db)
+        self.shared = volume_manager.VMTritcaskShelf(
+            volume_manager.SHARED_ROW_TYPE, db)
+        self.udfs = volume_manager.VMTritcaskShelf(
+            volume_manager.UDF_ROW_TYPE, db)
 
     def get_volume(self, vol_id):
         """Gets the volume."""
@@ -107,12 +108,14 @@
 
         for mdobj in mdobjs:
             filedir = "DIR " if mdobj.is_dir else "FILE"
-            print "  mdid=%r  node_id=%r crc32=%s local_hash=%s server_hash=%s %s  %r" % (
-                mdobj.mdid, mdobj.node_id,
-                getattr(mdobj, 'crc32', '**No crc32**'),
-                getattr(mdobj, 'local_hash', '**No local_hash**'),
-                getattr(mdobj, 'server_hash', '**No server_hash**'),
-                filedir, mdobj.path)
+            print (
+                "  mdid=%r  node_id=%r crc32=%s local_hash=%s server_hash=%s "
+                "%s  %r" % (
+                    mdobj.mdid, mdobj.node_id,
+                    getattr(mdobj, 'crc32', '**No crc32**'),
+                    getattr(mdobj, 'local_hash', '**No local_hash**'),
+                    getattr(mdobj, 'server_hash', '**No server_hash**'),
+                    filedir, mdobj.path))
 
     print "\nShowing Root: %r (id=%r)" % (root.path, root.id)
     show_data(root.id)
@@ -132,7 +135,8 @@
                                                         fsm.trash.iteritems():
         something = True
         print ("  mdid=%r  volume_id=%r  node_id=%r  parent_id=%r  path=%r "
-               "is_dir=%r" % (mdid, share_id, node_id, parent_id, path, is_dir))
+               "is_dir=%r" % (
+                    mdid, share_id, node_id, parent_id, path, is_dir))
     if not something:
         print "  (empty)"
 

=== renamed directory 'ubuntuone' => 'magicicadaclient'
=== modified file 'magicicadaclient/keyring.py'
--- ubuntuone/keyring.py	2016-05-31 21:43:25 +0000
+++ magicicadaclient/keyring.py	2018-05-19 20:49:48 +0000
@@ -44,9 +44,9 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
-from ubuntuone.clientdefs import NAME
-from ubuntuone.utils import compat
-from ubuntuone.utils.txsecrets import SecretService
+from magicicadaclient.clientdefs import NAME
+from magicicadaclient.utils import compat
+from magicicadaclient.utils.txsecrets import SecretService
 
 
 logger = logging.getLogger(__name__)

=== modified file 'magicicadaclient/networkstate/__init__.py'
--- ubuntuone/networkstate/__init__.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/networkstate/__init__.py	2018-05-19 20:49:48 +0000
@@ -42,13 +42,13 @@
 
 
 if sys.platform == 'win32':
-    from ubuntuone.networkstate import windows
+    from magicicadaclient.networkstate import windows
     networksource = windows
 elif sys.platform == 'darwin':
-    from ubuntuone.networkstate import darwin
+    from magicicadaclient.networkstate import darwin
     networksource = darwin
 else:
-    from ubuntuone.networkstate import linux
+    from magicicadaclient.networkstate import linux
     networksource = linux
 
 NetworkManagerState = networksource.NetworkManagerState

=== modified file 'magicicadaclient/networkstate/darwin.py'
--- ubuntuone/networkstate/darwin.py	2016-05-31 21:43:25 +0000
+++ magicicadaclient/networkstate/darwin.py	2018-05-19 20:49:48 +0000
@@ -39,8 +39,8 @@
 
 from twisted.internet import defer
 
-from ubuntuone.networkstate import NetworkFailException
-from ubuntuone.networkstate.networkstates import (ONLINE, OFFLINE, UNKNOWN)
+from magicicadaclient.networkstate import NetworkFailException
+from magicicadaclient.networkstate.networkstates import (ONLINE, OFFLINE, UNKNOWN)
 
 
 from ctypes.util import find_library

=== modified file 'magicicadaclient/networkstate/linux.py'
--- ubuntuone/networkstate/linux.py	2016-05-31 21:43:25 +0000
+++ magicicadaclient/networkstate/linux.py	2018-05-19 20:49:48 +0000
@@ -35,8 +35,8 @@
 
 from twisted.internet import defer
 
-from ubuntuone.networkstate import NetworkFailException
-from ubuntuone.networkstate.networkstates import (
+from magicicadaclient.networkstate import NetworkFailException
+from magicicadaclient.networkstate.networkstates import (
     ONLINE, OFFLINE,
     NM_STATE_CONNECTING_LIST,
     NM_STATE_CONNECTED_LIST,

=== modified file 'magicicadaclient/networkstate/tests/test_darwin.py'
--- ubuntuone/networkstate/tests/test_darwin.py	2016-06-03 19:52:03 +0000
+++ magicicadaclient/networkstate/tests/test_darwin.py	2018-05-19 20:49:48 +0000
@@ -32,19 +32,19 @@
 
 from twisted.internet.defer import inlineCallbacks
 
-from ubuntuone.networkstate import (
+from magicicadaclient.networkstate import (
     darwin,
     NetworkFailException,
 )
-from ubuntuone.networkstate.darwin import (
+from magicicadaclient.networkstate.darwin import (
     NetworkManagerState,
     flags_say_reachable,
     is_machine_connected,
 )
-from ubuntuone.networkstate.networkstates import (
+from magicicadaclient.networkstate.networkstates import (
     ONLINE, OFFLINE, UNKNOWN,
 )
-from ubuntuone.tests import TestCase
+from magicicadaclient.tests import TestCase
 
 
 REACHABLE_FLAG = 1 << 1

=== modified file 'magicicadaclient/networkstate/tests/test_linux.py'
--- ubuntuone/networkstate/tests/test_linux.py	2016-06-03 19:52:03 +0000
+++ magicicadaclient/networkstate/tests/test_linux.py	2018-05-19 20:49:48 +0000
@@ -35,17 +35,17 @@
 from twisted.internet.defer import inlineCallbacks
 from mocker import ARGS, KWARGS, ANY, MockerTestCase
 
-from ubuntuone.networkstate import (
+from magicicadaclient.networkstate import (
     linux,
     NetworkFailException,
     NetworkManagerState,
 )
-from ubuntuone.networkstate.linux import (
+from magicicadaclient.networkstate.linux import (
     is_machine_connected,
     NM_DBUS_INTERFACE,
     NM_DBUS_OBJECTPATH,
 )
-from ubuntuone.networkstate.networkstates import (
+from magicicadaclient.networkstate.networkstates import (
     ONLINE, OFFLINE, UNKNOWN,
     NM_STATE_ASLEEP,
     NM_STATE_ASLEEP_OLD,
@@ -59,7 +59,7 @@
     NM_STATE_DISCONNECTED_OLD,
     NM_STATE_UNKNOWN,
 )
-from ubuntuone.tests import TestCase
+from magicicadaclient.tests import TestCase
 
 
 class TestException(Exception):

=== modified file 'magicicadaclient/networkstate/tests/test_windows.py'
--- ubuntuone/networkstate/tests/test_windows.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/networkstate/tests/test_windows.py	2018-05-19 20:49:48 +0000
@@ -34,14 +34,14 @@
 from mocker import MockerTestCase
 from twisted.internet.defer import inlineCallbacks
 
-from ubuntuone.networkstate import NetworkFailException
-from ubuntuone.networkstate.windows import (
+from magicicadaclient.networkstate import NetworkFailException
+from magicicadaclient.networkstate.windows import (
     is_machine_connected,
     NetworkManager,
     NetworkManagerState,
     ONLINE,
     OFFLINE)
-from ubuntuone.tests import TestCase
+from magicicadaclient.tests import TestCase
 
 
 class TestNetworkManager(MockerTestCase):

=== modified file 'magicicadaclient/networkstate/windows.py'
--- ubuntuone/networkstate/windows.py	2016-05-31 21:43:25 +0000
+++ magicicadaclient/networkstate/windows.py	2018-05-19 20:49:48 +0000
@@ -42,8 +42,8 @@
 from win32com.server.policy import DesignatedWrapPolicy
 from win32com.client import Dispatch
 
-from ubuntuone.networkstate import NetworkFailException
-from ubuntuone.networkstate.networkstates import ONLINE, OFFLINE
+from magicicadaclient.networkstate import NetworkFailException
+from magicicadaclient.networkstate.networkstates import ONLINE, OFFLINE
 
 
 logger = logging.getLogger(__name__)

=== modified file 'magicicadaclient/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/__init__.py	2018-05-19 20:49:48 +0000
@@ -33,9 +33,9 @@
 
 from dirspec.utils import user_home
 
-from ubuntuone.platform import ipc
-from ubuntuone.platform import logger
-from ubuntuone.platform import os_helper
+from magicicadaclient.platform import ipc
+from magicicadaclient.platform import logger
+from magicicadaclient.platform import os_helper
 
 
 # define a platform string separate from sys.platform to be sent to

=== modified file 'magicicadaclient/platform/filesystem_notifications/__init__.py'
--- ubuntuone/platform/filesystem_notifications/__init__.py	2012-07-31 08:26:30 +0000
+++ magicicadaclient/platform/filesystem_notifications/__init__.py	2018-05-19 20:49:48 +0000
@@ -28,7 +28,7 @@
 # files in the program, then also delete it here.
 """File System Notification module."""
 
-from ubuntuone.platform.filesystem_notifications import (
+from magicicadaclient.platform.filesystem_notifications import (
     notify_processor,
 )
 

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/__init__.py'
--- ubuntuone/platform/filesystem_notifications/monitor/__init__.py	2015-09-19 23:15:50 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/__init__.py	2018-05-19 20:49:48 +0000
@@ -43,7 +43,7 @@
 
 
 if sys.platform == 'win32':
-    from ubuntuone.platform.filesystem_notifications.monitor import (
+    from magicicadaclient.platform.filesystem_notifications.monitor import (
         common,
         windows,
     )
@@ -54,8 +54,8 @@
     ACTIONS = windows.ACTIONS
 
 elif sys.platform == 'darwin':
-    from ubuntuone.platform.filesystem_notifications.monitor import darwin
-    from ubuntuone.platform.filesystem_notifications.monitor import (
+    from magicicadaclient.platform.filesystem_notifications.monitor import darwin
+    from magicicadaclient.platform.filesystem_notifications.monitor import (
         common,
     )
 
@@ -65,7 +65,7 @@
     }
     ACTIONS = darwin.fsevents_client.ACTIONS
 else:
-    from ubuntuone.platform.filesystem_notifications.monitor import (
+    from magicicadaclient.platform.filesystem_notifications.monitor import (
         linux,
     )
 

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/common.py'
--- ubuntuone/platform/filesystem_notifications/monitor/common.py	2016-05-31 21:43:25 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/common.py	2018-05-19 20:49:48 +0000
@@ -34,8 +34,8 @@
 
 from twisted.internet import defer
 
-from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications import notify_processor
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     Event,
     WatchManagerError,
     IN_CREATE,
@@ -45,9 +45,9 @@
     IN_MOVED_TO,
 )
 
-from ubuntuone import logger
+from magicicadaclient import logger
 
-from ubuntuone.platform.os_helper import (
+from magicicadaclient.platform.os_helper import (
     is_valid_syncdaemon_path,
     is_valid_os_path,
     os_path,
@@ -55,12 +55,12 @@
 
 
 if sys.platform == 'darwin':
-    from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
+    from magicicadaclient.platform.filesystem_notifications.monitor.darwin import (
         fsevents_client,
     )
     source = fsevents_client
 elif sys.platform == 'win32':
-    from ubuntuone.platform.filesystem_notifications.monitor import windows
+    from magicicadaclient.platform.filesystem_notifications.monitor import windows
     source = windows
 else:
     raise ImportError('Not supported platform')

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/darwin/__init__.py'
--- ubuntuone/platform/filesystem_notifications/monitor/darwin/__init__.py	2012-07-16 15:52:58 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/darwin/__init__.py	2018-05-19 20:49:48 +0000
@@ -28,7 +28,7 @@
 # files in the program, then also delete it here.
 """Filesystem Notifications module for MAC OS."""
 
-from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
+from magicicadaclient.platform.filesystem_notifications.monitor.darwin import (
     fsevents_daemon,
 )
 

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/darwin/fsevents_client.py'
--- ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_client.py	2015-09-19 23:15:50 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/darwin/fsevents_client.py	2018-05-19 20:49:48 +0000
@@ -33,7 +33,7 @@
 import fsevents
 from twisted.internet import defer, reactor
 
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     IN_DELETE,
     IN_CREATE,
     IN_MODIFY,

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py'
--- ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py	2018-05-19 20:49:48 +0000
@@ -35,12 +35,12 @@
 
 from twisted.internet import defer, endpoints, reactor
 
-from ubuntuone import logger
-from ubuntuone import fseventsd
-from ubuntuone.platform.filesystem_notifications.notify_processor import (
+from magicicadaclient import logger
+from magicicadaclient import fseventsd
+from magicicadaclient.platform.filesystem_notifications.notify_processor import (
     NotifyProcessor,
 )
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     Event,
     IN_OPEN,
     IN_CLOSE_NOWRITE,
@@ -52,7 +52,7 @@
     IN_MOVED_TO,
     IN_MODIFY,
 )
-from ubuntuone.utils.tcpactivation import (
+from magicicadaclient.utils.tcpactivation import (
     ActivationConfig,
     ActivationInstance,
     AlreadyStartedError,

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/linux.py'
--- ubuntuone/platform/filesystem_notifications/monitor/linux.py	2016-09-17 14:29:53 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/linux.py	2018-05-19 20:49:48 +0000
@@ -35,8 +35,8 @@
 import pyinotify
 from twisted.internet import abstract, reactor,  defer
 
-from ubuntuone.platform.os_helper import access
-from ubuntuone.platform.filesystem_notifications import notify_processor
+from magicicadaclient.platform.os_helper import access
+from magicicadaclient.platform.filesystem_notifications import notify_processor
 
 
 # translates quickly the event and it's is_dir state to our standard events

=== modified file 'magicicadaclient/platform/filesystem_notifications/monitor/windows.py'
--- ubuntuone/platform/filesystem_notifications/monitor/windows.py	2015-09-19 23:15:50 +0000
+++ magicicadaclient/platform/filesystem_notifications/monitor/windows.py	2018-05-19 20:49:48 +0000
@@ -63,11 +63,11 @@
     WaitForMultipleObjects,
     WAIT_OBJECT_0)
 
-from ubuntuone.platform.os_helper.windows import (
+from magicicadaclient.platform.os_helper.windows import (
     get_syncdaemon_valid_path,
 )
 
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     IN_CREATE,
     IN_DELETE,
     IN_MODIFY,

=== modified file 'magicicadaclient/platform/filesystem_notifications/notify_processor/__init__.py'
--- ubuntuone/platform/filesystem_notifications/notify_processor/__init__.py	2012-07-13 11:26:31 +0000
+++ magicicadaclient/platform/filesystem_notifications/notify_processor/__init__.py	2018-05-19 20:49:48 +0000
@@ -31,13 +31,13 @@
 import sys
 
 if sys.platform in ('win32', 'darwin'):
-    from ubuntuone.platform.filesystem_notifications.notify_processor import (
+    from magicicadaclient.platform.filesystem_notifications.notify_processor import (
         common,
     )
     # workaround due to pyflakes :(
     source = common
 else:
-    from ubuntuone.platform.filesystem_notifications.notify_processor import (
+    from magicicadaclient.platform.filesystem_notifications.notify_processor import (
         linux,
     )
     # workaround due to pyflakes :(

=== modified file 'magicicadaclient/platform/filesystem_notifications/notify_processor/common.py'
--- ubuntuone/platform/filesystem_notifications/notify_processor/common.py	2015-09-19 23:15:50 +0000
+++ magicicadaclient/platform/filesystem_notifications/notify_processor/common.py	2018-05-19 20:49:48 +0000
@@ -31,10 +31,10 @@
 import os
 import sys
 
-from ubuntuone.syncdaemon.filesystem_notifications import (
+from magicicadaclient.syncdaemon.filesystem_notifications import (
     GeneralINotifyProcessor,
 )
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     Event,
     ProcessEvent,
     IN_OPEN,
@@ -48,7 +48,7 @@
     IN_MOVED_TO,
 )
 
-from ubuntuone.platform.os_helper import (
+from magicicadaclient.platform.os_helper import (
     is_valid_syncdaemon_path,
 )
 

=== modified file 'magicicadaclient/platform/filesystem_notifications/notify_processor/linux.py'
--- ubuntuone/platform/filesystem_notifications/notify_processor/linux.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/filesystem_notifications/notify_processor/linux.py	2018-05-19 20:49:48 +0000
@@ -33,7 +33,7 @@
 import pyinotify
 from twisted.internet import reactor, error
 
-from ubuntuone.syncdaemon.filesystem_notifications import (
+from magicicadaclient.syncdaemon.filesystem_notifications import (
     GeneralINotifyProcessor,
 )
 

=== modified file 'magicicadaclient/platform/ipc/__init__.py'
--- ubuntuone/platform/ipc/__init__.py	2012-07-09 22:31:16 +0000
+++ magicicadaclient/platform/ipc/__init__.py	2018-05-19 20:49:48 +0000
@@ -32,10 +32,10 @@
 
 
 if sys.platform in ('win32', 'darwin'):
-    from ubuntuone.platform.ipc import perspective_broker as source
+    from magicicadaclient.platform.ipc import perspective_broker as source
     ExternalInterface = source.IPCInterface
 else:
-    from ubuntuone.platform.ipc import linux as source
+    from magicicadaclient.platform.ipc import linux as source
     ExternalInterface = source.DBusInterface
 
 

=== modified file 'magicicadaclient/platform/ipc/ipc_client.py'
--- ubuntuone/platform/ipc/ipc_client.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/platform/ipc/ipc_client.py	2018-05-19 20:49:48 +0000
@@ -35,7 +35,7 @@
 from twisted.internet import defer
 from twisted.spread.pb import Referenceable, PBClientFactory
 
-from ubuntuone.platform.ipc.perspective_broker import (
+from magicicadaclient.platform.ipc.perspective_broker import (
     RemoteMeta,
     ipc_client_connect,
 )

=== modified file 'magicicadaclient/platform/ipc/linux.py'
--- ubuntuone/platform/ipc/linux.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/platform/ipc/linux.py	2018-05-19 20:49:48 +0000
@@ -38,7 +38,7 @@
 from twisted.internet import defer
 from xml.etree import ElementTree
 
-from ubuntuone.platform import launcher
+from magicicadaclient.platform import launcher
 
 # Disable the "Invalid Name" check here, as we have lots of DBus style names
 

=== modified file 'magicicadaclient/platform/ipc/perspective_broker.py'
--- ubuntuone/platform/ipc/perspective_broker.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/platform/ipc/perspective_broker.py	2018-05-19 20:49:48 +0000
@@ -45,8 +45,8 @@
     Root,
 )
 
-from ubuntuone.syncdaemon.utils import get_sd_bin_cmd
-from ubuntuone.utils.tcpactivation import (
+from magicicadaclient.syncdaemon.utils import get_sd_bin_cmd
+from magicicadaclient.utils.tcpactivation import (
     ActivationClient,
     ActivationConfig,
     ActivationInstance,
@@ -55,10 +55,10 @@
 
 # we do not do from package import as source becauser pyflakes will complain
 if sys.platform == 'win32':
-    from ubuntuone.platform.ipc import windows
+    from magicicadaclient.platform.ipc import windows
     source = windows
 else:
-    from ubuntuone.platform.ipc import unix
+    from magicicadaclient.platform.ipc import unix
     source = unix
 
 DescriptionFactory = source.DescriptionFactory

=== modified file 'magicicadaclient/platform/launcher/__init__.py'
--- ubuntuone/platform/launcher/__init__.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/platform/launcher/__init__.py	2018-05-19 20:49:48 +0000
@@ -32,10 +32,10 @@
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.launcher import windows
+    from magicicadaclient.platform.launcher import windows
     source = windows
 else:
-    from ubuntuone.platform.launcher import linux
+    from magicicadaclient.platform.launcher import linux
     source = linux
 
 CONTORLPANEL_DOTDESKTOP = source.CONTROLPANEL_DOTDESKTOP

=== modified file 'magicicadaclient/platform/launcher/linux.py'
--- ubuntuone/platform/launcher/linux.py	2016-07-30 19:37:05 +0000
+++ magicicadaclient/platform/launcher/linux.py	2018-05-19 20:49:48 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.platform.launcher.linux
+# magicicadaclient.platform.launcher.linux
 #
 # Author: Alejandro J. Cura <[e-mail]>
 #

=== modified file 'magicicadaclient/platform/launcher/windows.py'
--- ubuntuone/platform/launcher/windows.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/platform/launcher/windows.py	2018-05-19 20:49:48 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.platform.launcher.windows
+# magicicadaclient.platform.launcher.windows
 #
 # Author: Alejandro J. Cura <[e-mail]>
 #

=== modified file 'magicicadaclient/platform/logger/__init__.py'
--- ubuntuone/platform/logger/__init__.py	2012-06-21 18:58:50 +0000
+++ magicicadaclient/platform/logger/__init__.py	2018-05-19 20:49:48 +0000
@@ -34,13 +34,13 @@
 from dirspec.basedir import xdg_cache_home
 
 if sys.platform == "win32":
-    from ubuntuone.platform.logger import windows
+    from magicicadaclient.platform.logger import windows
     source = windows
 elif sys.platform == "darwin":
-    from ubuntuone.platform.logger import darwin
+    from magicicadaclient.platform.logger import darwin
     source = darwin
 else:
-    from ubuntuone.platform.logger import linux
+    from magicicadaclient.platform.logger import linux
     source = linux
 
 

=== modified file 'magicicadaclient/platform/os_helper/__init__.py'
--- ubuntuone/platform/os_helper/__init__.py	2013-02-10 22:54:07 +0000
+++ magicicadaclient/platform/os_helper/__init__.py	2018-05-19 20:49:48 +0000
@@ -32,13 +32,13 @@
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.os_helper import windows
+    from magicicadaclient.platform.os_helper import windows
     source = windows
 elif sys.platform == "darwin":
-    from ubuntuone.platform.os_helper import darwin
+    from magicicadaclient.platform.os_helper import darwin
     source = darwin
 else:
-    from ubuntuone.platform.os_helper import linux
+    from magicicadaclient.platform.os_helper import linux
     source = linux
 
 set_no_rights = source.set_no_rights

=== modified file 'magicicadaclient/platform/os_helper/darwin.py'
--- ubuntuone/platform/os_helper/darwin.py	2013-02-10 22:54:07 +0000
+++ magicicadaclient/platform/os_helper/darwin.py	2018-05-19 20:49:48 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.platform.os_helper - darwin platform imports
+# magicicadaclient.platform.os_helper - darwin platform imports
 #
 # Copyright 2012 Canonical Ltd.
 #
@@ -39,7 +39,7 @@
 import shutil
 import unicodedata
 
-from ubuntuone.platform.os_helper import unix
+from magicicadaclient.platform.os_helper import unix
 
 platform = "darwin"
 

=== modified file 'magicicadaclient/platform/os_helper/linux.py'
--- ubuntuone/platform/os_helper/linux.py	2018-03-18 11:59:08 +0000
+++ magicicadaclient/platform/os_helper/linux.py	2018-05-19 20:49:48 +0000
@@ -43,7 +43,7 @@
     has_gi = False
 from send2trash import send2trash
 
-from ubuntuone.platform.os_helper import unix
+from magicicadaclient.platform.os_helper import unix
 
 platform = "linux2"
 

=== modified file 'magicicadaclient/platform/session/__init__.py'
--- ubuntuone/platform/session/__init__.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/platform/session/__init__.py	2018-05-19 20:49:48 +0000
@@ -39,13 +39,13 @@
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.session import windows
+    from magicicadaclient.platform.session import windows
     source = windows
 elif sys.platform == "darwin":
-    from ubuntuone.platform.session import darwin
+    from magicicadaclient.platform.session import darwin
     source = darwin
 else:
-    from ubuntuone.platform.session import linux
+    from magicicadaclient.platform.session import linux
     source = linux
     SESSION_MANAGER_BUSNAME = source.SESSION_MANAGER_BUSNAME
     SESSION_MANAGER_IFACE = source.SESSION_MANAGER_IFACE

=== modified file 'magicicadaclient/platform/session/linux.py'
--- ubuntuone/platform/session/linux.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/platform/session/linux.py	2018-05-19 20:49:48 +0000
@@ -32,7 +32,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.clientdefs import NAME
+from magicicadaclient.clientdefs import NAME
 
 SESSION_MANAGER_BUSNAME = "org.gnome.SessionManager"
 SESSION_MANAGER_IFACE = "org.gnome.SessionManager"

=== modified file 'magicicadaclient/platform/tests/__init__.py'
--- ubuntuone/platform/tests/__init__.py	2016-05-29 19:15:01 +0000
+++ magicicadaclient/platform/tests/__init__.py	2018-05-19 20:49:48 +0000
@@ -28,10 +28,10 @@
 import sys
 
 if sys.platform.startswith('linux'):
-    from ubuntuone.platform.tests.ipc import test_linux
+    from magicicadaclient.platform.tests.ipc import test_linux
     ipc_source = test_linux
 else:
-    from ubuntuone.platform.tests.ipc import test_perspective_broker
+    from magicicadaclient.platform.tests.ipc import test_perspective_broker
     ipc_source = test_perspective_broker
 
 IPCTestCase = ipc_source.IPCTestCase

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/__init__.py'
--- ubuntuone/platform/tests/filesystem_notifications/__init__.py	2016-09-17 14:29:53 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/__init__.py	2018-05-19 20:49:48 +0000
@@ -30,10 +30,10 @@
 
 from twisted.internet import defer, reactor
 
-from contrib.testing import testcase
+from magicicadaclient.testing import testcase
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.syncdaemon import event_queue, filesystem_manager
-from ubuntuone.syncdaemon.tritcask import Tritcask
+from magicicadaclient.syncdaemon import event_queue, filesystem_manager
+from magicicadaclient.syncdaemon.tritcask import Tritcask
 
 
 class BaseFSMonitorTestCase(testcase.BaseTwistedTestCase):

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/common.py'
--- ubuntuone/platform/tests/filesystem_notifications/common.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/common.py	2018-05-19 20:49:48 +0000
@@ -38,9 +38,9 @@
 import itertools
 
 from twisted.internet import defer
-from contrib.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     EventsCodes,
     ProcessEvent,
     IN_CLOSE_WRITE,
@@ -48,14 +48,14 @@
     IN_DELETE,
     IN_OPEN,
 )
-from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications.monitor.common import (
+from magicicadaclient.platform.filesystem_notifications import notify_processor
+from magicicadaclient.platform.filesystem_notifications.monitor.common import (
     FilesystemMonitor,
     Watch,
     WatchManager,
 )
-from ubuntuone.platform.filesystem_notifications.monitor import ACTIONS
-from ubuntuone.platform.os_helper import get_os_valid_path
+from magicicadaclient.platform.filesystem_notifications.monitor import ACTIONS
+from magicicadaclient.platform.os_helper import get_os_valid_path
 
 OP_FLAGS = EventsCodes.FLAG_COLLECTIONS['OP_FLAGS']
 IS_DIR = EventsCodes.FLAG_COLLECTIONS['SPECIAL_FLAGS']['IN_ISDIR']

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/test_darwin.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_darwin.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/test_darwin.py	2018-05-19 20:49:48 +0000
@@ -38,28 +38,28 @@
 
 import fsevents
 
-from contrib.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
 
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform.filesystem_notifications.monitor import (
+from magicicadaclient.platform.filesystem_notifications.monitor import (
     common,
 )
-from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
+from magicicadaclient.platform.filesystem_notifications.monitor.darwin import (
     fsevents_client as filesystem_notifications,
 )
-from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications.monitor.common import (
+from magicicadaclient.platform.filesystem_notifications import notify_processor
+from magicicadaclient.platform.filesystem_notifications.monitor.common import (
     Watch,
     WatchManager,
 )
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     ProcessEvent,
     IN_CLOSE_WRITE,
     IN_CREATE,
     IN_DELETE,
     IN_OPEN,
 )
-from ubuntuone.platform.tests.filesystem_notifications import (
+from magicicadaclient.platform.tests.filesystem_notifications import (
     BaseFSMonitorTestCase,
     common as common_tests,
 )

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/test_filesystem_notifications.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_filesystem_notifications.py	2016-06-03 19:52:03 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/test_filesystem_notifications.py	2018-05-19 20:49:48 +0000
@@ -35,20 +35,20 @@
 from twisted.trial import unittest
 from ubuntuone.devtools.handlers import MementoHandler
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeVolumeManager,
     skip_if_win32_missing_fs_event,
     skip_if_darwin_missing_fs_event,
 )
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     remove_file,
     remove_dir,
     rename,
 )
-from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.syncdaemon import (
+from magicicadaclient.platform.filesystem_notifications import notify_processor
+from magicicadaclient.syncdaemon.tritcask import Tritcask
+from magicicadaclient.syncdaemon import (
     event_queue,
     filesystem_manager,
     filesystem_notifications,

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/test_fsevents_daemon.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_fsevents_daemon.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/test_fsevents_daemon.py	2018-05-19 20:49:48 +0000
@@ -32,18 +32,18 @@
 
 from twisted.internet import defer, protocol
 
-from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone import fseventsd
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
+from magicicadaclient import fseventsd
 try:
     from ubuntuone.devtools.testcases import skipIf
     from ubuntuone.devtools.testcases.txsocketserver import TidyUnixServer
 except ImportError:
     from ubuntuone.devtools.testcase import skipIf
     TidyUnixServer = None
-from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
+from magicicadaclient.platform.filesystem_notifications.monitor.darwin import (
     fsevents_daemon,
 )
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     IN_CREATE,
     IN_DELETE,
     IN_MODIFY,

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/test_linux.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_linux.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/test_linux.py	2018-05-19 20:49:48 +0000
@@ -35,13 +35,13 @@
 from twisted.internet import defer, reactor
 from twisted.trial.unittest import TestCase as PlainTestCase
 
-from contrib.testing import testcase
-from ubuntuone.syncdaemon import volume_manager
-from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications.monitor import (
+from magicicadaclient.testing import testcase
+from magicicadaclient.syncdaemon import volume_manager
+from magicicadaclient.platform.filesystem_notifications import notify_processor
+from magicicadaclient.platform.filesystem_notifications.monitor import (
     linux as filesystem_notifications,
 )
-from ubuntuone.platform.tests.filesystem_notifications import (
+from magicicadaclient.platform.tests.filesystem_notifications import (
     BaseFSMonitorTestCase,
 )
 

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/test_pyinotify_agnostic.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_pyinotify_agnostic.py	2012-06-14 18:22:16 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/test_pyinotify_agnostic.py	2018-05-19 20:49:48 +0000
@@ -35,7 +35,7 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
+from magicicadaclient.platform.filesystem_notifications.pyinotify_agnostic import (
     RawOutputFormat)
 
 

=== modified file 'magicicadaclient/platform/tests/filesystem_notifications/test_windows.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_windows.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/filesystem_notifications/test_windows.py	2018-05-19 20:49:48 +0000
@@ -35,18 +35,18 @@
 from twisted.internet import defer
 from win32file import FILE_NOTIFY_INFORMATION
 
-from contrib.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
 
-from ubuntuone.platform.filesystem_notifications.monitor import (
+from magicicadaclient.platform.filesystem_notifications.monitor import (
     common,
     windows as filesystem_notifications,
 )
-from ubuntuone.platform.filesystem_notifications.monitor.common import (
+from magicicadaclient.platform.filesystem_notifications.monitor.common import (
     FilesystemMonitor,
     Watch,
     WatchManager,
 )
-from ubuntuone.platform.filesystem_notifications.monitor.windows import (
+from magicicadaclient.platform.filesystem_notifications.monitor.windows import (
     FILE_NOTIFY_CHANGE_FILE_NAME,
     FILE_NOTIFY_CHANGE_DIR_NAME,
     FILE_NOTIFY_CHANGE_ATTRIBUTES,
@@ -55,7 +55,7 @@
     FILE_NOTIFY_CHANGE_SECURITY,
     FILE_NOTIFY_CHANGE_LAST_ACCESS,
 )
-from ubuntuone.platform.tests.filesystem_notifications import (
+from magicicadaclient.platform.tests.filesystem_notifications import (
     common as common_tests,
 )
 

=== modified file 'magicicadaclient/platform/tests/ipc/test_external_interface.py'
--- ubuntuone/platform/tests/ipc/test_external_interface.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/platform/tests/ipc/test_external_interface.py	2018-05-19 20:49:48 +0000
@@ -31,7 +31,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.platform.tests import (
+from magicicadaclient.platform.tests import (
     ConfigTestCase,
     EventsTestCase,
     FileSystemTestCase,

=== modified file 'magicicadaclient/platform/tests/ipc/test_linux.py'
--- ubuntuone/platform/tests/ipc/test_linux.py	2016-07-30 21:58:48 +0000
+++ magicicadaclient/platform/tests/ipc/test_linux.py	2018-05-19 20:49:48 +0000
@@ -38,13 +38,13 @@
 except ImportError:
     from ubuntuone.devtools.testcase import DBusTestCase
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     FakeMainTestCase,
     FakedService,
     FakedObject,
 )
-from ubuntuone.platform.ipc import linux as dbus_interface
-from ubuntuone.platform.ipc.linux import (
+from magicicadaclient.platform.ipc import linux as dbus_interface
+from magicicadaclient.platform.ipc.linux import (
     DBusExposedObject,
     DBUS_IFACE_STATUS_NAME,
     DBUS_IFACE_EVENTS_NAME,
@@ -56,7 +56,7 @@
     DBUS_IFACE_PUBLIC_FILES_NAME,
     DBUS_IFACE_LAUNCHER_NAME,
 )
-from ubuntuone.platform.tools.linux import DBusClient
+from magicicadaclient.platform.tools.linux import DBusClient
 
 
 class FakeNetworkManager(DBusExposedObject):

=== modified file 'magicicadaclient/platform/tests/ipc/test_perspective_broker.py'
--- ubuntuone/platform/tests/ipc/test_perspective_broker.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/platform/tests/ipc/test_perspective_broker.py	2018-05-19 20:49:48 +0000
@@ -41,7 +41,7 @@
 )
 from twisted.trial.unittest import TestCase
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     FakedService,
     FakeMainTestCase,
 )
@@ -49,8 +49,8 @@
     from ubuntuone.devtools.testcases import skipIf, skipIfOS
 except ImportError:
     from ubuntuone.devtools.testcase import skipIf, skipIfOS
-from ubuntuone.platform.ipc import perspective_broker as ipc
-from ubuntuone.platform.ipc.perspective_broker import (
+from magicicadaclient.platform.ipc import perspective_broker as ipc
+from magicicadaclient.platform.ipc.perspective_broker import (
     Config,
     Events,
     Folders,
@@ -62,8 +62,8 @@
     Status,
     SyncDaemon,
 )
-from ubuntuone.platform.ipc import ipc_client
-from ubuntuone.platform.ipc.ipc_client import (
+from magicicadaclient.platform.ipc import ipc_client
+from magicicadaclient.platform.ipc.ipc_client import (
     signal,
     ConfigClient,
     EventsClient,
@@ -75,11 +75,11 @@
     SyncDaemonClient,
     SharesClient,
 )
-from ubuntuone.syncdaemon import interaction_interfaces
+from magicicadaclient.syncdaemon import interaction_interfaces
 try:
-    from ubuntuone.networkstate.networkstates import ONLINE
+    from magicicadaclient.networkstate.networkstates import ONLINE
 except ImportError:
-    from ubuntuone.networkstate import ONLINE
+    from magicicadaclient.networkstate import ONLINE
 
 
 class NoTestCase(object):

=== modified file 'magicicadaclient/platform/tests/ipc/test_unix.py'
--- ubuntuone/platform/tests/ipc/test_unix.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/ipc/test_unix.py	2018-05-19 20:49:48 +0000
@@ -30,7 +30,7 @@
 
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.ipc import unix
+from magicicadaclient.platform.ipc import unix
 
 
 class DescriptionFactoryTestCase(TestCase):

=== modified file 'magicicadaclient/platform/tests/ipc/test_windows.py'
--- ubuntuone/platform/tests/ipc/test_windows.py	2016-07-30 21:58:48 +0000
+++ magicicadaclient/platform/tests/ipc/test_windows.py	2018-05-19 20:49:48 +0000
@@ -30,7 +30,7 @@
 
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.ipc import windows
+from magicicadaclient.platform.ipc import windows
 
 
 class IPCPortTestCase(TestCase):

=== modified file 'magicicadaclient/platform/tests/launcher/test_linux.py'
--- ubuntuone/platform/tests/launcher/test_linux.py	2016-05-29 16:05:27 +0000
+++ magicicadaclient/platform/tests/launcher/test_linux.py	2018-05-19 20:49:48 +0000
@@ -1,8 +1,5 @@
-# tests.platform.linux.test_launcher
-#
-# Author: Alejandro J. Cura <[e-mail]>
-#
 # Copyright 2011-2012 Canonical Ltd.
+# Copyright 2017-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 General Public License version 3, as published
@@ -33,7 +30,7 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform import launcher
+from magicicadaclient.platform import launcher
 
 
 class FakeLauncherEntryProps(object):
@@ -66,15 +63,15 @@
 class LauncherTestCase(TestCase):
     """Test the Launcher interface."""
 
-    from ubuntuone.platform.launcher.linux import use_libunity
+    from magicicadaclient.platform.launcher.linux import use_libunity
     skip = None if use_libunity else "libunity not installed."
 
     @defer.inlineCallbacks
     def setUp(self):
         """Initialize this test instance."""
         yield super(LauncherTestCase, self).setUp()
-        import ubuntuone.platform.launcher.linux
-        self.patch(ubuntuone.platform.launcher.linux.Unity,
+        import magicicadaclient.platform.launcher.linux
+        self.patch(magicicadaclient.platform.launcher.linux.Unity,
                    "LauncherEntry", FakeLauncherEntry)
         self.launcher = launcher.Launcher()
 

=== modified file 'magicicadaclient/platform/tests/linux/test_vm.py'
--- ubuntuone/platform/tests/linux/test_vm.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/platform/tests/linux/test_vm.py	2018-05-19 20:49:48 +0000
@@ -35,12 +35,12 @@
 from magicicadaprotocol import request
 from twisted.internet import defer
 
-from contrib.testing.testcase import FakeMain
-from ubuntuone.syncdaemon.tests.test_vm import (
+from magicicadaclient.testing.testcase import FakeMain
+from magicicadaclient.syncdaemon.tests.test_vm import (
     MetadataTestCase,
     BaseVolumeManagerTests,
 )
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
     get_udf_path,

=== modified file 'magicicadaclient/platform/tests/os_helper/test_darwin.py'
--- ubuntuone/platform/tests/os_helper/test_darwin.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/os_helper/test_darwin.py	2018-05-19 20:49:48 +0000
@@ -35,13 +35,13 @@
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     move_to_trash,
     open_file,
     stat_path,
 )
-from ubuntuone.platform.os_helper import darwin
-from ubuntuone.platform.tests.os_helper import test_os_helper
+from magicicadaclient.platform.os_helper import darwin
+from magicicadaclient.platform.tests.os_helper import test_os_helper
 
 DARWIN_TEST_FILE_NAME = u'naïve_test_file'
 

=== modified file 'magicicadaclient/platform/tests/os_helper/test_linux.py'
--- ubuntuone/platform/tests/os_helper/test_linux.py	2018-03-18 11:59:08 +0000
+++ magicicadaclient/platform/tests/os_helper/test_linux.py	2018-05-19 20:49:48 +0000
@@ -32,9 +32,9 @@
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
-from ubuntuone.platform.tests.os_helper import test_os_helper
-from ubuntuone.platform.os_helper import linux
-from ubuntuone.platform import (
+from magicicadaclient.platform.tests.os_helper import test_os_helper
+from magicicadaclient.platform.os_helper import linux
+from magicicadaclient.platform import (
     move_to_trash,
     open_file,
     stat_path,

=== modified file 'magicicadaclient/platform/tests/os_helper/test_os_helper.py'
--- ubuntuone/platform/tests/os_helper/test_os_helper.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/platform/tests/os_helper/test_os_helper.py	2018-05-19 20:49:48 +0000
@@ -36,11 +36,11 @@
 
 from twisted.internet import defer
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     skip_if_win32_and_uses_readonly,
 )
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     access,
     allow_writes,
     can_write,

=== modified file 'magicicadaclient/platform/tests/os_helper/test_windows.py'
--- ubuntuone/platform/tests/os_helper/test_windows.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/os_helper/test_windows.py	2018-05-19 20:49:48 +0000
@@ -36,7 +36,7 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from contrib.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
 
 from ntsecuritycon import (
     FILE_ALL_ACCESS,
@@ -50,8 +50,8 @@
     SetFileAttributesW
 )
 
-from ubuntuone.platform.os_helper import windows as os_helper
-from ubuntuone.platform.os_helper.windows import (
+from magicicadaclient.platform.os_helper import windows as os_helper
+from magicicadaclient.platform.os_helper.windows import (
     _set_file_attributes,
     _unicode_to_bytes,
     EVERYONE_SID,
@@ -69,7 +69,7 @@
     set_no_rights,
     WINDOWS_ILLEGAL_CHARS_MAP,
 )
-from ubuntuone.platform.tests.os_helper.test_os_helper import (
+from magicicadaclient.platform.tests.os_helper.test_os_helper import (
     OSWrapperTests,
     WalkTests,
 )

=== modified file 'magicicadaclient/platform/tests/session/test_common.py'
--- ubuntuone/platform/tests/session/test_common.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/session/test_common.py	2018-05-19 20:49:48 +0000
@@ -31,7 +31,7 @@
 from twisted.trial.unittest import TestCase
 
 from ubuntuone.devtools.testcases import skipIfOS
-from ubuntuone.platform.session import Inhibitor, INHIBIT_LOGOUT_SUSPEND
+from magicicadaclient.platform.session import Inhibitor, INHIBIT_LOGOUT_SUSPEND
 
 
 @skipIfOS('linux2', 'Ignored becuase it requires a DBusTestCases.')

=== modified file 'magicicadaclient/platform/tests/session/test_linux.py'
--- ubuntuone/platform/tests/session/test_linux.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/session/test_linux.py	2018-05-19 20:49:48 +0000
@@ -39,7 +39,7 @@
     from ubuntuone.devtools.testcases.dbus import DBusTestCase
 except ImportError:
     from ubuntuone.devtools.testcase import DBusTestCase
-from ubuntuone.platform import session
+from magicicadaclient.platform import session
 
 INHIBIT_ALL = (session.INHIBIT_LOGGING_OUT |
                session.INHIBIT_USER_SWITCHING |

=== modified file 'magicicadaclient/platform/tests/test_logger.py'
--- ubuntuone/platform/tests/test_logger.py	2012-06-21 18:58:50 +0000
+++ magicicadaclient/platform/tests/test_logger.py	2018-05-19 20:49:48 +0000
@@ -33,7 +33,7 @@
 from dirspec.basedir import xdg_cache_home
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.logger import ubuntuone_log_dir
+from magicicadaclient.platform.logger import ubuntuone_log_dir
 
 
 class TestBaseDirectory(TestCase):
@@ -41,7 +41,6 @@
 
     def test_ubuntuone_log_dir(self):
         """The ubuntuone_log_dir is correct."""
-        expected = os.path.join(xdg_cache_home,
-                                'ubuntuone', 'log')
+        expected = os.path.join(xdg_cache_home, 'ubuntuone', 'log')
         self.assertEqual(expected, ubuntuone_log_dir)
         self.assertTrue(os.path.exists(expected))

=== modified file 'magicicadaclient/platform/tests/test_platform.py'
--- ubuntuone/platform/tests/test_platform.py	2012-04-09 20:07:05 +0000
+++ magicicadaclient/platform/tests/test_platform.py	2018-05-19 20:49:48 +0000
@@ -36,5 +36,5 @@
     def test_import(self):
         """Make sure we can import the platform module."""
 
-        import ubuntuone.platform as uplt
+        import magicicadaclient.platform as uplt
         self.assertTrue(sys.platform.startswith(uplt.platform))

=== modified file 'magicicadaclient/platform/tests/test_tools.py'
--- ubuntuone/platform/tests/test_tools.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/platform/tests/test_tools.py	2018-05-19 20:49:48 +0000
@@ -37,17 +37,17 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipTest, skipIfNotOS
 
-from contrib.testing.testcase import FakeCommand
+from magicicadaclient.testing.testcase import FakeCommand
 
-from ubuntuone.syncdaemon import (
+from magicicadaclient.syncdaemon import (
     action_queue,
     event_queue,
     interaction_interfaces,
     states,
     volume_manager,
 )
-from ubuntuone.platform import tools
-from ubuntuone.platform.tests import IPCTestCase
+from magicicadaclient.platform import tools
+from magicicadaclient.platform.tests import IPCTestCase
 
 
 SOME_ERROR = 'CRASH BOOM BANG'

=== modified file 'magicicadaclient/platform/tests/test_u1sdtool.py'
--- ubuntuone/platform/tests/test_u1sdtool.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tests/test_u1sdtool.py	2018-05-19 20:49:48 +0000
@@ -35,18 +35,18 @@
 
 from twisted.internet import defer
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     FakeCommand,
     FakeDownload,
     FakeUpload,
 )
-from ubuntuone.syncdaemon.vm_helper import get_udf_path
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient.syncdaemon.vm_helper import get_udf_path
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     Share,
     UDF,
 )
-from ubuntuone.platform.tools import (
+from magicicadaclient.platform.tools import (
     show_dirty_nodes,
     show_downloads,
     show_folders,
@@ -60,7 +60,7 @@
     show_waiting_content,
     show_waiting_metadata,
 )
-from ubuntuone.platform.tests.test_tools import TestToolsBase
+from magicicadaclient.platform.tests.test_tools import TestToolsBase
 
 
 class U1SDToolTests(TestToolsBase):

=== modified file 'magicicadaclient/platform/tests/tools/test_tools.py'
--- ubuntuone/platform/tests/tools/test_tools.py	2016-07-30 21:58:48 +0000
+++ magicicadaclient/platform/tests/tools/test_tools.py	2018-05-19 20:49:48 +0000
@@ -35,7 +35,7 @@
 from twisted.spread import pb
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.tools import perspective_broker
+from magicicadaclient.platform.tools import perspective_broker
 
 
 # ugly trick to stop pylint for complaining about

=== modified file 'magicicadaclient/platform/tests/windows/run_sdtool.py'
--- ubuntuone/platform/tests/windows/run_sdtool.py	2016-09-17 01:06:23 +0000
+++ magicicadaclient/platform/tests/windows/run_sdtool.py	2018-05-19 20:49:48 +0000
@@ -32,7 +32,7 @@
 
 # we use the standard reactor on windows
 from twisted.internet import reactor, defer
-from ubuntuone.platform.windows import tools
+from magicicadaclient.platform.windows import tools
 
 
 @defer.inlineCallbacks

=== modified file 'magicicadaclient/platform/tools/__init__.py'
--- ubuntuone/platform/tools/__init__.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/platform/tools/__init__.py	2018-05-19 20:49:48 +0000
@@ -34,13 +34,13 @@
 import warnings
 
 from twisted.internet import defer
-from ubuntuone.logger import log_call
+from magicicadaclient.logger import log_call
 
 if sys.platform in ('win32', 'darwin'):
-    from ubuntuone.platform.tools import perspective_broker
+    from magicicadaclient.platform.tools import perspective_broker
     source = perspective_broker
 else:
-    from ubuntuone.platform.tools import linux
+    from magicicadaclient.platform.tools import linux
     source = linux
 
 

=== modified file 'magicicadaclient/platform/tools/linux.py'
--- ubuntuone/platform/tools/linux.py	2012-08-06 13:33:18 +0000
+++ magicicadaclient/platform/tools/linux.py	2018-05-19 20:49:48 +0000
@@ -34,7 +34,7 @@
 from dbus.exceptions import DBusException
 from twisted.internet import defer
 
-from ubuntuone.platform.ipc.linux import (
+from magicicadaclient.platform.ipc.linux import (
     is_already_running,
     DBUS_IFACE_NAME,
     DBUS_IFACE_STATUS_NAME,

=== modified file 'magicicadaclient/platform/tools/perspective_broker.py'
--- ubuntuone/platform/tools/perspective_broker.py	2016-06-01 18:28:19 +0000
+++ magicicadaclient/platform/tools/perspective_broker.py	2018-05-19 20:49:48 +0000
@@ -35,9 +35,9 @@
 from twisted.internet import defer
 from twisted.spread.pb import (DeadReferenceError, RemoteError)
 
-from ubuntuone.platform.ipc.perspective_broker import is_already_running
-from ubuntuone.platform.ipc.ipc_client import UbuntuOneClient
-from ubuntuone.syncdaemon.utils import get_sd_bin_cmd
+from magicicadaclient.platform.ipc.perspective_broker import is_already_running
+from magicicadaclient.platform.ipc.ipc_client import UbuntuOneClient
+from magicicadaclient.syncdaemon.utils import get_sd_bin_cmd
 
 
 # make pyflakes happy since we can't disable the warning
@@ -120,7 +120,7 @@
 
     def __init__(self, bus=None):
         self.log = logging.getLogger(
-            'ubuntuone.platform.tools.perspective_broker')
+            'magicicadaclient.platform.tools.perspective_broker')
         self.client = UbuntuOneClient()
         self.connected = None
         self.connected_signals = defaultdict(set)

=== modified file 'magicicadaclient/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/action_queue.py	2018-05-19 20:49:48 +0000
@@ -57,11 +57,11 @@
 from twisted.python.failure import Failure, DefaultException
 from zope.interface import implements
 
-from ubuntuone import clientdefs
-from ubuntuone.platform import platform, remove_file
-from ubuntuone.syncdaemon.interfaces import IActionQueue, IMarker
-from ubuntuone.syncdaemon.logger import mklog, TRACE
-from ubuntuone.syncdaemon import config, offload_queue
+from magicicadaclient import clientdefs
+from magicicadaclient.platform import platform, remove_file
+from magicicadaclient.syncdaemon.interfaces import IActionQueue, IMarker
+from magicicadaclient.syncdaemon.logger import mklog, TRACE
+from magicicadaclient.syncdaemon import config, offload_queue
 
 logger = logging.getLogger("ubuntuone.SyncDaemon.ActionQueue")
 

=== modified file 'magicicadaclient/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2018-03-14 21:55:27 +0000
+++ magicicadaclient/syncdaemon/config.py	2018-05-19 20:49:48 +0000
@@ -45,7 +45,7 @@
 )
 from dirspec.utils import unicode_path
 
-from ubuntuone.platform import expand_user
+from magicicadaclient.platform import expand_user
 
 # the try/except is to work with older versions of configglue (that
 # had everything that is now configglue.inischema.* as configglue.*).
@@ -347,7 +347,7 @@
         # because the configglue superclasses do not use them.
         # Instead, all paths used in this module should be "native",
         # that is: utf-8 str on linux, or (unicode or mbcs str) on windows
-        from ubuntuone.platform import native_rename
+        from magicicadaclient.platform import native_rename
 
         # cleanup empty sections
         for section in [MAIN, THROTTLING]:

=== modified file 'magicicadaclient/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2017-01-07 14:01:39 +0000
+++ magicicadaclient/syncdaemon/event_queue.py	2018-05-19 20:49:48 +0000
@@ -33,8 +33,8 @@
 
 from twisted.internet import defer
 
-from ubuntuone.platform.os_helper import access
-from ubuntuone.platform.filesystem_notifications.monitor import (
+from magicicadaclient.platform.os_helper import access
+from magicicadaclient.platform.filesystem_notifications.monitor import (
     FilesystemMonitor,
 )
 

=== modified file 'magicicadaclient/syncdaemon/file_shelf.py'
--- ubuntuone/syncdaemon/file_shelf.py	2015-09-19 23:15:50 +0000
+++ magicicadaclient/syncdaemon/file_shelf.py	2018-05-19 20:49:48 +0000
@@ -41,7 +41,7 @@
 from collections import deque
 from UserDict import DictMixin
 
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     make_dir,
     open_file,
     path_exists,

=== modified file 'magicicadaclient/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2016-06-01 21:38:23 +0000
+++ magicicadaclient/syncdaemon/filesystem_manager.py	2018-05-19 20:49:48 +0000
@@ -43,13 +43,13 @@
 import stat
 import uuid
 
-from ubuntuone.clientdefs import NAME
-from ubuntuone.syncdaemon import file_shelf, config
-from ubuntuone.syncdaemon.volume_manager import VolumeDoesNotExist
-from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.tritcask import TritcaskShelf
-from ubuntuone.platform import (
+from magicicadaclient.clientdefs import NAME
+from magicicadaclient.syncdaemon import file_shelf, config
+from magicicadaclient.syncdaemon.volume_manager import VolumeDoesNotExist
+from magicicadaclient.syncdaemon.interfaces import IMarker
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.tritcask import TritcaskShelf
+from magicicadaclient.platform import (
     listdir,
     make_dir,
     normpath,
@@ -67,7 +67,7 @@
     stat_path,
     walk,
 )
-from ubuntuone.platform import open_file as os_open
+from magicicadaclient.platform import open_file as os_open
 
 METADATA_VERSION = "6"
 

=== modified file 'magicicadaclient/syncdaemon/filesystem_notifications.py'
--- ubuntuone/syncdaemon/filesystem_notifications.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/syncdaemon/filesystem_notifications.py	2018-05-19 20:49:48 +0000
@@ -32,9 +32,9 @@
 import os
 import re
 
-from ubuntuone.platform import access, path_exists
-from ubuntuone.syncdaemon.mute_filter import MuteFilter
-from ubuntuone import logger
+from magicicadaclient.platform import access, path_exists
+from magicicadaclient.syncdaemon.mute_filter import MuteFilter
+from magicicadaclient import logger
 # our logging level
 TRACE = logger.TRACE
 

=== modified file 'magicicadaclient/syncdaemon/fsm/fsm.py'
--- ubuntuone/syncdaemon/fsm/fsm.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/syncdaemon/fsm/fsm.py	2018-05-19 20:49:48 +0000
@@ -35,7 +35,7 @@
 
 import itertools
 
-from ubuntuone.syncdaemon import logger
+from magicicadaclient.syncdaemon import logger
 
 
 def hash_dict(d):
@@ -195,7 +195,7 @@
                 # fsm_parser depends on python-uno for reading ods documents
                 # this shouldnt be called with an .ods file on production
                 # environments
-                from ubuntuone.syncdaemon.fsm import fsm_parser
+                from magicicadaclient.syncdaemon.fsm import fsm_parser
                 spec = fsm_parser.parse(input_data)
             elif input_data.endswith(".py"):
                 result = {}

=== modified file 'magicicadaclient/syncdaemon/hash_queue.py'
--- ubuntuone/syncdaemon/hash_queue.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/hash_queue.py	2018-05-19 20:49:48 +0000
@@ -41,11 +41,11 @@
 from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import reactor
 
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     open_file,
     stat_path,
 )
-from ubuntuone.platform.constants import HASHQUEUE_DELAY
+from magicicadaclient.platform.constants import HASHQUEUE_DELAY
 
 
 NO_TIMESTAMP = None

=== modified file 'magicicadaclient/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2018-04-24 23:02:59 +0000
+++ magicicadaclient/syncdaemon/interaction_interfaces.py	2018-05-19 20:49:48 +0000
@@ -48,15 +48,15 @@
 from magicicadaprotocol import request
 from twisted.internet import defer
 
-from ubuntuone.networkstate import NetworkManagerState
-from ubuntuone.networkstate.networkstates import ONLINE
+from magicicadaclient.networkstate import NetworkManagerState
+from magicicadaclient.networkstate.networkstates import ONLINE
 
-from ubuntuone.logger import log_call
-from ubuntuone.platform import ExternalInterface
-from ubuntuone.syncdaemon import config
-from ubuntuone.syncdaemon.action_queue import Download, Upload
-from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.syncdaemon.volume_manager import Share, UDF, VolumeDoesNotExist
+from magicicadaclient.logger import log_call
+from magicicadaclient.platform import ExternalInterface
+from magicicadaclient.syncdaemon import config
+from magicicadaclient.syncdaemon.action_queue import Download, Upload
+from magicicadaclient.syncdaemon.interfaces import IMarker
+from magicicadaclient.syncdaemon.volume_manager import Share, UDF, VolumeDoesNotExist
 
 
 logger = logging.getLogger("ubuntuone.SyncDaemon.InteractionInterfaces")

=== modified file 'magicicadaclient/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/syncdaemon/local_rescan.py	2018-05-19 20:49:48 +0000
@@ -35,16 +35,16 @@
 import os
 import stat
 
-from ubuntuone.syncdaemon import volume_manager
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient.syncdaemon import volume_manager
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
 )
-from ubuntuone.syncdaemon.filesystem_manager import get_stat
+from magicicadaclient.syncdaemon.filesystem_manager import get_stat
 from twisted.internet import defer, reactor
 
-from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.platform import (
+from magicicadaclient.syncdaemon.interfaces import IMarker
+from magicicadaclient.platform import (
     access,
     is_link,
     listdir,

=== modified file 'magicicadaclient/syncdaemon/logger.py'
--- ubuntuone/syncdaemon/logger.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/syncdaemon/logger.py	2018-05-19 20:49:48 +0000
@@ -34,7 +34,7 @@
 import os
 import zlib
 
-from ubuntuone.logger import (
+from magicicadaclient.logger import (
     _DEBUG_LOG_LEVEL,
     basic_formatter,
     CustomRotatingFileHandler,
@@ -42,10 +42,10 @@
     Logger,
     MultiFilter,
 )
-from ubuntuone.platform.logger import ubuntuone_log_dir
+from magicicadaclient.platform.logger import ubuntuone_log_dir
 # api compatibility imports
-from ubuntuone import logger
-from ubuntuone.platform import get_filesystem_logger, setup_filesystem_logging
+from magicicadaclient import logger
+from magicicadaclient.platform import get_filesystem_logger, setup_filesystem_logging
 DebugCapture = logger.DebugCapture
 NOTE = logger.NOTE
 TRACE = logger.TRACE

=== modified file 'magicicadaclient/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2017-02-10 01:15:07 +0000
+++ magicicadaclient/syncdaemon/main.py	2018-05-19 20:49:48 +0000
@@ -36,7 +36,7 @@
 from dirspec.utils import user_home
 from twisted.internet import defer, reactor, task
 
-from ubuntuone.syncdaemon import (
+from magicicadaclient.syncdaemon import (
     action_queue,
     config,
     event_queue,
@@ -48,9 +48,9 @@
     tritcask,
     volume_manager,
 )
-from ubuntuone import syncdaemon, clientdefs
-from ubuntuone.syncdaemon.interaction_interfaces import SyncdaemonService
-from ubuntuone.syncdaemon.states import StateManager, QueueManager
+from magicicadaclient import syncdaemon, clientdefs
+from magicicadaclient.syncdaemon.interaction_interfaces import SyncdaemonService
+from magicicadaclient.syncdaemon.states import StateManager, QueueManager
 
 
 class WaitingHelpingHandler(object):

=== modified file 'magicicadaclient/syncdaemon/marker.py'
--- ubuntuone/syncdaemon/marker.py	2012-04-09 20:07:05 +0000
+++ magicicadaclient/syncdaemon/marker.py	2018-05-19 20:49:48 +0000
@@ -32,7 +32,7 @@
 
 from zope.interface import implements
 
-from ubuntuone.syncdaemon.interfaces import IMarker
+from magicicadaclient.syncdaemon.interfaces import IMarker
 
 
 class MDMarker(str):

=== modified file 'magicicadaclient/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/sync.py	2018-05-19 20:49:48 +0000
@@ -38,16 +38,16 @@
 
 from magicicadaprotocol import delta
 
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.fsm.fsm import StateMachineRunner, StateMachine
-from ubuntuone.syncdaemon import u1fsfsm
-from ubuntuone.syncdaemon.logger import DebugCapture
-from ubuntuone.syncdaemon.filesystem_manager import (
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.fsm.fsm import StateMachineRunner, StateMachine
+from magicicadaclient.syncdaemon import u1fsfsm
+from magicicadaclient.syncdaemon.logger import DebugCapture
+from magicicadaclient.syncdaemon.filesystem_manager import (
     DirectoryNotRemovable,
     InconsistencyError,
 )
-from ubuntuone.syncdaemon.volume_manager import VolumeDoesNotExist
-from ubuntuone.platform import (
+from magicicadaclient.syncdaemon.volume_manager import VolumeDoesNotExist
+from magicicadaclient.platform import (
     stat_path,
 )
 

=== modified file 'magicicadaclient/syncdaemon/tests/fsm/test_fsm.py'
--- ubuntuone/syncdaemon/tests/fsm/test_fsm.py	2016-07-30 22:03:39 +0000
+++ magicicadaclient/syncdaemon/tests/fsm/test_fsm.py	2018-05-19 20:49:48 +0000
@@ -33,7 +33,7 @@
 import os
 import unittest
 
-from ubuntuone.syncdaemon.fsm import fsm
+from magicicadaclient.syncdaemon.fsm import fsm
 
 try:
     import uno

=== modified file 'magicicadaclient/syncdaemon/tests/fsm/test_fsm_run.py'
--- ubuntuone/syncdaemon/tests/fsm/test_fsm_run.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/syncdaemon/tests/fsm/test_fsm_run.py	2018-05-19 20:49:48 +0000
@@ -33,7 +33,7 @@
 import unittest
 import os
 
-from ubuntuone.syncdaemon.fsm import fsm
+from magicicadaclient.syncdaemon.fsm import fsm
 
 
 def p(name):

=== modified file 'magicicadaclient/syncdaemon/tests/test_action_queue.py'
--- ubuntuone/syncdaemon/tests/test_action_queue.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/tests/test_action_queue.py	2018-05-19 20:49:48 +0000
@@ -60,7 +60,7 @@
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from zope.interface.verify import verifyObject, verifyClass
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     DummyClass,
     FakeActionQueue,
@@ -70,11 +70,11 @@
 )
 from ubuntuone.devtools import handlers
 from ubuntuone.devtools.testcases import skipTest
-from ubuntuone import logger, clientdefs
-from ubuntuone.platform import open_file, platform, path_exists
-from ubuntuone.syncdaemon import interfaces, config
-from ubuntuone.syncdaemon import action_queue
-from ubuntuone.syncdaemon.action_queue import (
+from magicicadaclient import logger, clientdefs
+from magicicadaclient.platform import open_file, platform, path_exists
+from magicicadaclient.syncdaemon import interfaces, config
+from magicicadaclient.syncdaemon import action_queue
+from magicicadaclient.syncdaemon.action_queue import (
     ActionQueue, ActionQueueCommand, ChangePublicAccess, CreateUDF,
     DeleteVolume, Download, ListVolumes, ActionQueueProtocol, ListShares,
     RequestQueue, UploadProgressWrapper, Upload,
@@ -84,10 +84,10 @@
     InterruptibleDeferred, DeferredInterrupted, ConditionsLocker,
     NamedTemporaryFile, PingManager,
 )
-from ubuntuone.syncdaemon.event_queue import EventQueue, EVENTS
-from ubuntuone.syncdaemon import offload_queue
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.volume_manager import ACCESS_LEVEL_RO
+from magicicadaclient.syncdaemon.event_queue import EventQueue, EVENTS
+from magicicadaclient.syncdaemon import offload_queue
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.volume_manager import ACCESS_LEVEL_RO
 
 PATH = os.path.join(u'~', u'Documents', u'pdfs', u'moño', u'')
 NAME = u'UDF-me'

=== modified file 'magicicadaclient/syncdaemon/tests/test_config.py'
--- ubuntuone/syncdaemon/tests/test_config.py	2018-03-14 21:55:27 +0000
+++ magicicadaclient/syncdaemon/tests/test_config.py	2018-05-19 20:49:48 +0000
@@ -42,10 +42,10 @@
     xdg_cache_home,
 )
 
-from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone import platform
-from ubuntuone.platform import open_file, path_exists
-from ubuntuone.syncdaemon import config
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
+from magicicadaclient import platform
+from magicicadaclient.platform import open_file, path_exists
+from magicicadaclient.syncdaemon import config
 
 
 class TestConfigBasic(BaseTwistedTestCase):

=== modified file 'magicicadaclient/syncdaemon/tests/test_eq_inotify.py'
--- ubuntuone/syncdaemon/tests/test_eq_inotify.py	2016-09-17 14:29:53 +0000
+++ magicicadaclient/syncdaemon/tests/test_eq_inotify.py	2018-05-19 20:49:48 +0000
@@ -40,15 +40,15 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS, skipIfNotOS
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeMain,
     Listener,
     skip_if_darwin_missing_fs_event,
     skip_if_win32_missing_fs_event,
 )
-from ubuntuone.syncdaemon.tests.test_eventqueue import BaseEQTestCase
-from ubuntuone.platform import (
+from magicicadaclient.syncdaemon.tests.test_eventqueue import BaseEQTestCase
+from magicicadaclient.platform import (
     make_link,
     make_dir,
     open_file,
@@ -60,7 +60,7 @@
     set_file_readwrite,
     set_dir_readwrite,
 )
-from ubuntuone.syncdaemon import event_queue, volume_manager
+from magicicadaclient.syncdaemon import event_queue, volume_manager
 
 # our logging level
 TRACE = logging.getLevelName('TRACE')

=== modified file 'magicicadaclient/syncdaemon/tests/test_eventqueue.py'
--- ubuntuone/syncdaemon/tests/test_eventqueue.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/syncdaemon/tests/test_eventqueue.py	2018-05-19 20:49:48 +0000
@@ -36,15 +36,15 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeMonitor,
     FakeVolumeManager,
 )
-from ubuntuone.platform.filesystem_notifications.monitor import (
+from magicicadaclient.platform.filesystem_notifications.monitor import (
     FilesystemMonitor,
 )
-from ubuntuone.syncdaemon import (
+from magicicadaclient.syncdaemon import (
     event_queue,
     filesystem_manager,
     tritcask,

=== modified file 'magicicadaclient/syncdaemon/tests/test_eventsnanny.py'
--- ubuntuone/syncdaemon/tests/test_eventsnanny.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/syncdaemon/tests/test_eventsnanny.py	2018-05-19 20:49:48 +0000
@@ -37,12 +37,12 @@
 
 from twisted.internet import defer, reactor
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeVolumeManager,
     skip_if_win32_missing_fs_event,
 )
-from ubuntuone.syncdaemon import (filesystem_manager, event_queue,
+from magicicadaclient.syncdaemon import (filesystem_manager, event_queue,
                                   events_nanny, hash_queue, tritcask)
 
 

=== modified file 'magicicadaclient/syncdaemon/tests/test_fileshelf.py'
--- ubuntuone/syncdaemon/tests/test_fileshelf.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/syncdaemon/tests/test_fileshelf.py	2018-05-19 20:49:48 +0000
@@ -39,12 +39,12 @@
 from twisted.internet import defer
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone.platform import (
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.platform import (
     open_file,
     path_exists,
 )
-from ubuntuone.syncdaemon.file_shelf import (
+from magicicadaclient.syncdaemon.file_shelf import (
     FileShelf,
     CachedFileShelf,
     LRUCache,

=== modified file 'magicicadaclient/syncdaemon/tests/test_fsm.py'
--- ubuntuone/syncdaemon/tests/test_fsm.py	2016-06-03 19:52:03 +0000
+++ magicicadaclient/syncdaemon/tests/test_fsm.py	2018-05-19 20:49:48 +0000
@@ -37,7 +37,7 @@
 from mocker import MockerTestCase, ANY
 from twisted.internet import defer
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeVolumeManager,
     FakeMain,
@@ -48,7 +48,7 @@
 )
 
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     listdir,
     make_dir,
     make_link,
@@ -60,7 +60,7 @@
     set_dir_readwrite,
     stat_path,
 )
-from ubuntuone.syncdaemon.filesystem_manager import (
+from magicicadaclient.syncdaemon.filesystem_manager import (
     DirectoryNotRemovable,
     EnableShareWrite,
     FileSystemManager,
@@ -70,13 +70,13 @@
     TrashTritcaskShelf,
     TRASH_ROW_TYPE,
 )
-from ubuntuone.syncdaemon import filesystem_manager, config, logger
-from ubuntuone.syncdaemon.file_shelf import FileShelf
-from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.syncdaemon.event_queue import EventQueue
-from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient.syncdaemon import filesystem_manager, config, logger
+from magicicadaclient.syncdaemon.file_shelf import FileShelf
+from magicicadaclient.syncdaemon.tritcask import Tritcask
+from magicicadaclient.syncdaemon.event_queue import EventQueue
+from magicicadaclient.syncdaemon.interfaces import IMarker
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
     allow_writes,
@@ -4086,9 +4086,9 @@
     def setUp(self):
         """Set up."""
         yield super(OsIntegrationTests, self).setUp()
-        self.open_file = self.mocker.replace('ubuntuone.platform.open_file')
-        self.normpath = self.mocker.replace('ubuntuone.platform.normpath')
-        self.listdir = self.mocker.replace('ubuntuone.platform.listdir')
+        self.open_file = self.mocker.replace('magicicadaclient.platform.open_file')
+        self.normpath = self.mocker.replace('magicicadaclient.platform.normpath')
+        self.listdir = self.mocker.replace('magicicadaclient.platform.listdir')
 
     def test_get_partial_for_writing(self):
         """Test that the get partial does use the correct os_helper method."""

=== modified file 'magicicadaclient/syncdaemon/tests/test_hashqueue.py'
--- ubuntuone/syncdaemon/tests/test_hashqueue.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/tests/test_hashqueue.py	2018-05-19 20:49:48 +0000
@@ -44,10 +44,10 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipTest
 
-from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone.platform import open_file, stat_path
-from ubuntuone.syncdaemon import hash_queue
-from ubuntuone.syncdaemon.hash_queue import HASHQUEUE_DELAY
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.platform import open_file, stat_path
+from magicicadaclient.syncdaemon import hash_queue
+from magicicadaclient.syncdaemon.hash_queue import HASHQUEUE_DELAY
 
 FAKE_TIMESTAMP = 1
 

=== modified file 'magicicadaclient/syncdaemon/tests/test_interaction_interfaces.py'
--- ubuntuone/syncdaemon/tests/test_interaction_interfaces.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/tests/test_interaction_interfaces.py	2018-05-19 20:49:48 +0000
@@ -36,7 +36,7 @@
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     FAKED_CREDENTIALS,
     FakeCommand,
     FakeDownload,
@@ -45,17 +45,17 @@
     FakeMainTestCase,
     skipIfOS,
 )
-from ubuntuone.networkstate.networkstates import ONLINE
-from ubuntuone.platform import make_dir, make_link
-from ubuntuone.platform.tests.ipc.test_perspective_broker import (
+from magicicadaclient.networkstate.networkstates import ONLINE
+from magicicadaclient.platform import make_dir, make_link
+from magicicadaclient.platform.tests.ipc.test_perspective_broker import (
     FakeNetworkManagerState,
 )
-from ubuntuone.syncdaemon import (
+from magicicadaclient.syncdaemon import (
     config,
     interaction_interfaces,
     states,
 )
-from ubuntuone.syncdaemon.interaction_interfaces import (
+from magicicadaclient.syncdaemon.interaction_interfaces import (
     bool_str,
     get_share_dict,
     get_udf_dict,
@@ -72,8 +72,8 @@
     SyncdaemonShares,
     SyncdaemonStatus,
 )
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
     get_udf_path,

=== modified file 'magicicadaclient/syncdaemon/tests/test_localrescan.py'
--- ubuntuone/syncdaemon/tests/test_localrescan.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/tests/test_localrescan.py	2018-05-19 20:49:48 +0000
@@ -40,12 +40,12 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeVolumeManager,
     skip_if_win32_and_uses_readonly,
 )
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     make_dir,
     make_link,
     open_file,
@@ -59,12 +59,12 @@
     set_no_rights,
     stat_path,
 )
-from ubuntuone.syncdaemon import (
+from magicicadaclient.syncdaemon import (
     event_queue, filesystem_manager, local_rescan, volume_manager
 )
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.tritcask import Tritcask
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
 )

=== modified file 'magicicadaclient/syncdaemon/tests/test_logger.py'
--- ubuntuone/syncdaemon/tests/test_logger.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/syncdaemon/tests/test_logger.py	2018-05-19 20:49:48 +0000
@@ -40,7 +40,7 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
-from ubuntuone.syncdaemon.logger import (
+from magicicadaclient.syncdaemon.logger import (
     DebugCapture,
     NOTE,
     TRACE,

=== modified file 'magicicadaclient/syncdaemon/tests/test_main.py'
--- ubuntuone/syncdaemon/tests/test_main.py	2017-02-10 01:15:07 +0000
+++ magicicadaclient/syncdaemon/tests/test_main.py	2018-05-19 20:49:48 +0000
@@ -34,21 +34,21 @@
 
 from twisted.internet import defer, reactor
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform import expand_user
+from magicicadaclient.platform import expand_user
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase, FAKED_CREDENTIALS, FakeMonitor
 )
-from ubuntuone.clientdefs import VERSION
-from ubuntuone.logger import NOTE
-from ubuntuone.platform import (
+from magicicadaclient.clientdefs import VERSION
+from magicicadaclient.logger import NOTE
+from magicicadaclient.platform import (
     is_link,
     make_dir,
     make_link,
     path_exists,
     remove_dir,
 )
-from ubuntuone.syncdaemon import main as main_mod
+from magicicadaclient.syncdaemon import main as main_mod
 
 
 class FakeListener(object):

=== modified file 'magicicadaclient/syncdaemon/tests/test_mutefilter.py'
--- ubuntuone/syncdaemon/tests/test_mutefilter.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/syncdaemon/tests/test_mutefilter.py	2018-05-19 20:49:48 +0000
@@ -32,7 +32,7 @@
 
 import unittest
 
-from ubuntuone.syncdaemon.mute_filter import MuteFilter
+from magicicadaclient.syncdaemon.mute_filter import MuteFilter
 
 
 class MuteFilterTests(unittest.TestCase):

=== modified file 'magicicadaclient/syncdaemon/tests/test_offloadqueue.py'
--- ubuntuone/syncdaemon/tests/test_offloadqueue.py	2013-01-16 19:10:28 +0000
+++ magicicadaclient/syncdaemon/tests/test_offloadqueue.py	2018-05-19 20:49:48 +0000
@@ -37,9 +37,9 @@
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.syncdaemon.offload_queue import OffloadQueue, STRUCT_SIZE
-from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.offload_queue import OffloadQueue, STRUCT_SIZE
+from magicicadaclient.syncdaemon.interfaces import IMarker
+from magicicadaclient.syncdaemon.marker import MDMarker
 
 
 class OffloadQueueTestCase(TwistedTestCase):

=== modified file 'magicicadaclient/syncdaemon/tests/test_pathlockingtree.py'
--- ubuntuone/syncdaemon/tests/test_pathlockingtree.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/syncdaemon/tests/test_pathlockingtree.py	2018-05-19 20:49:48 +0000
@@ -36,7 +36,7 @@
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.syncdaemon.action_queue import PathLockingTree
+from magicicadaclient.syncdaemon.action_queue import PathLockingTree
 
 
 class InternalDeferredTests(TwistedTestCase):

=== modified file 'magicicadaclient/syncdaemon/tests/test_states.py'
--- ubuntuone/syncdaemon/tests/test_states.py	2018-03-08 18:32:01 +0000
+++ magicicadaclient/syncdaemon/tests/test_states.py	2018-05-19 20:49:48 +0000
@@ -33,9 +33,9 @@
 from twisted.internet import defer, reactor
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
-from contrib.testing.testcase import FakeLogger
-from ubuntuone.syncdaemon import states
-from ubuntuone.syncdaemon.states import (
+from magicicadaclient.testing.testcase import FakeLogger
+from magicicadaclient.syncdaemon import states
+from magicicadaclient.syncdaemon.states import (
     ConnectionManager,
     Node,
     QueueManager,

=== modified file 'magicicadaclient/syncdaemon/tests/test_sync.py'
--- ubuntuone/syncdaemon/tests/test_sync.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/tests/test_sync.py	2018-05-19 20:49:48 +0000
@@ -46,25 +46,25 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     FakeMain,
     FakeVolumeManager,
     BaseTwistedTestCase,
     Listener,
 )
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     make_dir,
     open_file,
     remove_file,
     stat_path,
 )
-from ubuntuone.syncdaemon.filesystem_manager import FileSystemManager
-from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.syncdaemon.fsm import fsm as fsm_module
-from ubuntuone.syncdaemon.sync import FSKey, Sync, SyncStateMachineRunner
-from ubuntuone.syncdaemon.volume_manager import Share
-from ubuntuone.syncdaemon.event_queue import EventQueue, EVENTS
-from ubuntuone.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.filesystem_manager import FileSystemManager
+from magicicadaclient.syncdaemon.tritcask import Tritcask
+from magicicadaclient.syncdaemon.fsm import fsm as fsm_module
+from magicicadaclient.syncdaemon.sync import FSKey, Sync, SyncStateMachineRunner
+from magicicadaclient.syncdaemon.volume_manager import Share
+from magicicadaclient.syncdaemon.event_queue import EventQueue, EVENTS
+from magicicadaclient.syncdaemon.marker import MDMarker
 
 
 class TestSyncClassAPI(unittest.TestCase):

=== modified file 'magicicadaclient/syncdaemon/tests/test_tritcask.py'
--- ubuntuone/syncdaemon/tests/test_tritcask.py	2016-07-30 21:58:48 +0000
+++ magicicadaclient/syncdaemon/tests/test_tritcask.py	2018-05-19 20:49:48 +0000
@@ -42,10 +42,10 @@
 from operator import attrgetter
 from twisted.internet import defer
 
-from contrib.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.syncdaemon import tritcask
-from ubuntuone.syncdaemon.tritcask import (
+from magicicadaclient.syncdaemon import tritcask
+from magicicadaclient.syncdaemon.tritcask import (
     TOMBSTONE,
     LIVE,
     HINT,

=== modified file 'magicicadaclient/syncdaemon/tests/test_u1fsfsm.py'
--- ubuntuone/syncdaemon/tests/test_u1fsfsm.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/syncdaemon/tests/test_u1fsfsm.py	2018-05-19 20:49:48 +0000
@@ -34,7 +34,7 @@
 import os
 
 
-from ubuntuone.syncdaemon.fsm import fsm
+from magicicadaclient.syncdaemon.fsm import fsm
 
 
 def p(name):

=== modified file 'magicicadaclient/syncdaemon/tests/test_utils.py'
--- ubuntuone/syncdaemon/tests/test_utils.py	2012-07-13 16:06:27 +0000
+++ magicicadaclient/syncdaemon/tests/test_utils.py	2018-05-19 20:49:48 +0000
@@ -32,7 +32,7 @@
 
 from twisted.trial.unittest import TestCase
 
-import ubuntuone.syncdaemon.utils
+from magicicadaclient.syncdaemon import utils
 
 
 class UtilsTestCase(TestCase):
@@ -41,18 +41,18 @@
     def test_get_sd_bin_cmd_src_nonlinux(self):
         """Test that we use the buildout python running from source."""
         self.patch(sys, 'platform', 'darwin')
-        self.patch(ubuntuone.syncdaemon.utils, 'get_program_path',
-                   lambda _, *args, **kwargs: 'test-path')
-        args = ubuntuone.syncdaemon.utils.get_sd_bin_cmd()
+        self.patch(
+            utils, 'get_program_path', lambda _, *args, **kwargs: 'test-path')
+        args = utils.get_sd_bin_cmd()
         self.assertEqual(len(args), 2)
         self.assertEqual(args[0], 'python')
 
     def test_get_sd_bin_cmd_src_linux(self):
         """Test that we DO NOT use the buildout python running from source."""
         self.patch(sys, 'platform', 'linux2')
-        self.patch(ubuntuone.syncdaemon.utils, 'get_program_path',
-                   lambda _, *args, **kwargs: 'test-path')
-        args = ubuntuone.syncdaemon.utils.get_sd_bin_cmd()
+        self.patch(
+            utils, 'get_program_path', lambda _, *args, **kwargs: 'test-path')
+        args = utils.get_sd_bin_cmd()
         self.assertEqual(len(args), 1)
         self.assertEqual(args[0], 'test-path')
 
@@ -61,9 +61,9 @@
         sys.frozen = True
         self.addCleanup(delattr, sys, 'frozen')
         self.patch(sys, 'platform', 'darwin')
-        self.patch(ubuntuone.syncdaemon.utils, 'get_program_path',
-                   lambda _, *args, **kwargs: 'test-path')
-        args = ubuntuone.syncdaemon.utils.get_sd_bin_cmd()
+        self.patch(
+            utils, 'get_program_path', lambda _, *args, **kwargs: 'test-path')
+        args = utils.get_sd_bin_cmd()
         self.assertEqual(len(args), 1)
         self.assertEqual(args[0], 'test-path')
 
@@ -72,8 +72,8 @@
         sys.frozen = True
         self.addCleanup(delattr, sys, 'frozen')
         self.patch(sys, 'platform', 'linux2')
-        self.patch(ubuntuone.syncdaemon.utils, 'get_program_path',
-                   lambda _, *args, **kwargs: 'test-path')
-        args = ubuntuone.syncdaemon.utils.get_sd_bin_cmd()
+        self.patch(
+            utils, 'get_program_path', lambda _, *args, **kwargs: 'test-path')
+        args = utils.get_sd_bin_cmd()
         self.assertEqual(len(args), 1)
         self.assertEqual(args[0], 'test-path')

=== modified file 'magicicadaclient/syncdaemon/tests/test_vm.py'
--- ubuntuone/syncdaemon/tests/test_vm.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/tests/test_vm.py	2018-05-19 20:49:48 +0000
@@ -48,13 +48,13 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import (
+from magicicadaclient.testing.testcase import (
     BaseTwistedTestCase,
     FakeMain,
 )
-from ubuntuone import platform
-from ubuntuone.syncdaemon import config, event_queue, tritcask, volume_manager
-from ubuntuone.syncdaemon.volume_manager import (
+from magicicadaclient import platform
+from magicicadaclient.syncdaemon import config, event_queue, tritcask, volume_manager
+from magicicadaclient.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
     get_udf_path,
@@ -72,7 +72,7 @@
     VMTritcaskShelf,
     VolumeDoesNotExist,
 )
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     make_link,
     make_dir,
     open_file,
@@ -1922,7 +1922,7 @@
     def test_add_udf_with_content(self):
         """Test for VolumeManager.add_udf with content on disk."""
         # create a sync instance
-        from ubuntuone.syncdaemon import sync
+        from magicicadaclient.syncdaemon import sync
         sync = sync.Sync(self.main)
         suggested_path = u"~/suggested_path"
         udf = self._create_udf(suggested_path=suggested_path,
@@ -4131,7 +4131,7 @@
         files = ['not_yet.partial', ]
         mocker = Mocker()
         # ensure that we do use the platform method and not the renamed one
-        os_helper_rename = mocker.replace('ubuntuone.platform.rename')
+        os_helper_rename = mocker.replace('magicicadaclient.platform.rename')
 
         def is_string(x):
             return isinstance(x, str)
@@ -4148,7 +4148,7 @@
         mocker = Mocker()
         # ensure that we do use the platform method and not the renamed one
         self.md_upgrader._upgrade_metadata_6 = mocker.mock()
-        os_helper_rename = mocker.replace('ubuntuone.platform.rename')
+        os_helper_rename = mocker.replace('magicicadaclient.platform.rename')
 
         def is_string(x):
             return isinstance(x, str)

=== modified file 'magicicadaclient/syncdaemon/tests/test_vm_helper.py'
--- ubuntuone/syncdaemon/tests/test_vm_helper.py	2016-06-03 19:52:03 +0000
+++ magicicadaclient/syncdaemon/tests/test_vm_helper.py	2018-05-19 20:49:48 +0000
@@ -35,11 +35,11 @@
 import os
 import uuid
 
-from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone.platform import expand_user, os_helper
-from ubuntuone.syncdaemon import vm_helper
-from ubuntuone.syncdaemon.tests.test_vm import BaseVolumeManagerTests
-from ubuntuone.syncdaemon.vm_helper import (
+from magicicadaclient.testing.testcase import BaseTwistedTestCase
+from magicicadaclient.platform import expand_user, os_helper
+from magicicadaclient.syncdaemon import vm_helper
+from magicicadaclient.syncdaemon.tests.test_vm import BaseVolumeManagerTests
+from magicicadaclient.syncdaemon.vm_helper import (
     create_shares_link,
     get_share_dir_name,
     get_udf_path,

=== modified file 'magicicadaclient/syncdaemon/tritcask.py'
--- ubuntuone/syncdaemon/tritcask.py	2015-09-19 23:15:50 +0000
+++ magicicadaclient/syncdaemon/tritcask.py	2018-05-19 20:49:48 +0000
@@ -49,7 +49,7 @@
 from collections import namedtuple
 from UserDict import DictMixin
 
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     is_dir,
     listdir,
     make_dir,

=== modified file 'magicicadaclient/syncdaemon/vm_helper.py'
--- ubuntuone/syncdaemon/vm_helper.py	2012-04-09 20:07:05 +0000
+++ magicicadaclient/syncdaemon/vm_helper.py	2018-05-19 20:49:48 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.platform.linux.vm_helper- vm helpers for linux.
+# magicicadaclient.platform.linux.vm_helper- vm helpers for linux.
 #
 # Authors: Guillermo Gonzalez <[e-mail]>
 #          Natalia B. Bidart <[e-mail]>
@@ -33,8 +33,8 @@
 
 import os
 
-from ubuntuone.platform import expand_user
-from ubuntuone.platform import (
+from magicicadaclient.platform import expand_user
+from magicicadaclient.platform import (
     is_link,
     make_link,
     path_exists,

=== modified file 'magicicadaclient/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2018-04-14 23:34:20 +0000
+++ magicicadaclient/syncdaemon/volume_manager.py	2018-05-19 20:49:48 +0000
@@ -49,19 +49,19 @@
     RootVolume,
 )
 from twisted.internet import defer
-from ubuntuone.platform import expand_user
+from magicicadaclient.platform import expand_user
 
-from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.syncdaemon import file_shelf, config
-from ubuntuone.syncdaemon.tritcask import TritcaskShelf
-from ubuntuone.syncdaemon.vm_helper import (
+from magicicadaclient.syncdaemon.marker import MDMarker
+from magicicadaclient.syncdaemon.interfaces import IMarker
+from magicicadaclient.syncdaemon import file_shelf, config
+from magicicadaclient.syncdaemon.tritcask import TritcaskShelf
+from magicicadaclient.syncdaemon.vm_helper import (
     create_shares_link,
     get_share_dir_name,
     get_udf_path,
     get_udf_suggested_path,
 )
-from ubuntuone.platform import (
+from magicicadaclient.platform import (
     allow_writes,
     get_path_list,
     is_link,
@@ -1589,7 +1589,7 @@
 
     def _upgrade_metadata_None(self, md_version):
         """Upgrade the shelf layout, for *very* old clients."""
-        from ubuntuone.syncdaemon.volume_manager import LegacyShareFileShelf
+        from magicicadaclient.syncdaemon.volume_manager import LegacyShareFileShelf
         self.log.debug('Upgrading the share shelf layout')
         # the shelf already exists, and don't have a .version file
         # first backup the old data
@@ -1630,7 +1630,7 @@
         Upgrade all pickled Share to the new package/module layout.
 
         """
-        from ubuntuone.syncdaemon.volume_manager import LegacyShareFileShelf
+        from magicicadaclient.syncdaemon.volume_manager import LegacyShareFileShelf
         self.log.debug('upgrading share shelfs from metadata 1')
         shares = LegacyShareFileShelf(self._shares_md_dir)
         for key, share in shares.iteritems():
@@ -1700,7 +1700,7 @@
         move "~/<root>/My Files" contents to "~/<root>"
 
         """
-        from ubuntuone.syncdaemon.volume_manager import LegacyShareFileShelf
+        from magicicadaclient.syncdaemon.volume_manager import LegacyShareFileShelf
         self.log.debug('upgrading from metadata 3 (new layout)')
         old_share_dir = os.path.join(self._root_dir, 'Shared With Me')
         old_root_dir = os.path.join(self._root_dir, 'My Files')
@@ -1783,7 +1783,7 @@
 
     def _upgrade_metadata_5(self, md_version):
         """Upgrade to version 6 (plain dict storage)."""
-        from ubuntuone.syncdaemon.volume_manager import (
+        from magicicadaclient.syncdaemon.volume_manager import (
             VMFileShelf, LegacyShareFileShelf, UDF)
         self.log.debug('upgrading from metadata 5')
         bkp_dir = os.path.join(os.path.dirname(self._data_dir), '5.bkp')
@@ -1820,7 +1820,7 @@
 
     def _upgrade_share_to_volume(self, share, shared=False):
         """Upgrade from _Share to new Volume hierarchy."""
-        from ubuntuone.syncdaemon.volume_manager import (
+        from magicicadaclient.syncdaemon.volume_manager import (
             VMFileShelf, Root, Share, Shared)
 
         def upgrade_share_dict(share):
@@ -1857,7 +1857,7 @@
 
     def _upgrade_metadata_6(self, md_version):
         """Upgrade to version 7, tritcask!."""
-        from ubuntuone.syncdaemon.volume_manager import (
+        from magicicadaclient.syncdaemon.volume_manager import (
             VMFileShelf, VMTritcaskShelf,
             SHARE_ROW_TYPE, SHARED_ROW_TYPE, UDF_ROW_TYPE,
         )

=== renamed directory 'contrib/testing' => 'magicicadaclient/testing'
=== modified file 'magicicadaclient/testing/testcase.py'
--- contrib/testing/testcase.py	2018-04-23 02:21:03 +0000
+++ magicicadaclient/testing/testcase.py	2018-05-19 20:49:48 +0000
@@ -47,7 +47,7 @@
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 
-from ubuntuone.syncdaemon import (
+from magicicadaclient.syncdaemon import (
     config,
     action_queue,
     event_queue,
@@ -59,9 +59,9 @@
     local_rescan,
     tritcask,
 )
-from ubuntuone.syncdaemon import logger
-from ubuntuone import platform
-from ubuntuone.platform import (
+from magicicadaclient.syncdaemon import logger
+from magicicadaclient import platform
+from magicicadaclient.platform import (
     can_write,
     make_dir,
     path_exists,

=== modified file 'magicicadaclient/tests/test_keyring.py'
--- ubuntuone/tests/test_keyring.py	2016-05-29 19:15:01 +0000
+++ magicicadaclient/tests/test_keyring.py	2018-05-19 20:49:48 +0000
@@ -36,7 +36,7 @@
 from twisted.internet.defer import inlineCallbacks
 from twisted.trial.unittest import TestCase
 
-from ubuntuone import keyring
+from magicicadaclient import keyring
 
 
 class MockItem(object):

=== modified file 'magicicadaclient/utils/ipc.py'
--- ubuntuone/utils/ipc.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/utils/ipc.py	2018-05-19 20:49:48 +0000
@@ -45,7 +45,7 @@
     Root,
 )
 
-from ubuntuone.utils.tcpactivation import (
+from magicicadaclient.utils.tcpactivation import (
     ActivationClient,
     ActivationConfig,
     ActivationInstance,

=== modified file 'magicicadaclient/utils/tests/test_common.py'
--- ubuntuone/utils/tests/test_common.py	2017-01-07 18:51:07 +0000
+++ magicicadaclient/utils/tests/test_common.py	2018-05-19 20:49:48 +0000
@@ -41,8 +41,8 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
 
-from ubuntuone import utils
-from ubuntuone.tests import TestCase
+from magicicadaclient import utils
+from magicicadaclient.tests import TestCase
 
 CONSTANTS_MODULE = 'ubuntuone.clientdefs'
 NOT_DEFINED = object()

=== modified file 'magicicadaclient/utils/tests/test_ipc.py'
--- ubuntuone/utils/tests/test_ipc.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/utils/tests/test_ipc.py	2018-05-19 20:49:48 +0000
@@ -46,8 +46,8 @@
     TCPPbServerTestCase,
 )
 
-from ubuntuone.tests import TestCase
-from ubuntuone.utils import ipc
+from magicicadaclient.tests import TestCase
+from magicicadaclient.utils import ipc
 
 
 TEST_SERVICE = 'foo-service'

=== modified file 'magicicadaclient/utils/tests/test_locale.py'
--- ubuntuone/utils/tests/test_locale.py	2016-05-29 00:50:05 +0000
+++ magicicadaclient/utils/tests/test_locale.py	2018-05-19 20:49:48 +0000
@@ -32,7 +32,7 @@
 
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.utils import locale
+from magicicadaclient.utils import locale
 
 NO_VALUE = object()
 

=== modified file 'magicicadaclient/utils/tests/test_tcpactivation.py'
--- ubuntuone/utils/tests/test_tcpactivation.py	2018-03-08 19:39:13 +0000
+++ magicicadaclient/utils/tests/test_tcpactivation.py	2018-05-19 20:49:48 +0000
@@ -41,8 +41,8 @@
     TidyTCPServer,
 )
 
-from ubuntuone.utils import tcpactivation
-from ubuntuone.utils.tcpactivation import (
+from magicicadaclient.utils import tcpactivation
+from magicicadaclient.utils.tcpactivation import (
     ActivationClient,
     ActivationConfig,
     ActivationDetector,

=== modified file 'magicicadaclient/utils/tests/test_translation.py'
--- ubuntuone/utils/tests/test_translation.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/utils/tests/test_translation.py	2018-05-19 20:49:48 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2012 Canonical Ltd.
-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
+# 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 General Public License version 3, as published
@@ -36,7 +36,7 @@
 from twisted.internet import defer
 from ubuntuone.devtools.testcases import TestCase, skipIfNotOS
 
-from ubuntuone.utils import translation
+from magicicadaclient.utils import translation
 
 TEST_DOMAIN = 'test-domain'
 TEST_LANG_DEFAULTS_EN_FIRST = ['en', 'pt-PT']
@@ -73,8 +73,8 @@
 
     def test_import(self):
         """Test whether import translation defines _ as a builtin."""
-        import ubuntuone.utils.translation
-        assert ubuntuone.utils.translation
+        import magicicadaclient.utils.translation
+        assert magicicadaclient.utils.translation
         self.assertFalse('_' in __builtins__)
 
     @skipIfNotOS('darwin', 'Test requires pyobjc-Cocoa')

=== modified file 'magicicadaclient/utils/tests/test_txsecrets.py'
--- ubuntuone/utils/tests/test_txsecrets.py	2016-06-04 21:14:35 +0000
+++ magicicadaclient/utils/tests/test_txsecrets.py	2018-05-19 20:49:48 +0000
@@ -38,7 +38,7 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 from ubuntuone.devtools.testcases.dbus import DBusTestCase
 
-from ubuntuone.utils import txsecrets
+from magicicadaclient.utils import txsecrets
 
 KEY_TYPE_ATTR = {"key-type": "Foo credentials"}
 ERROR_CREATE_BUT_LOCKED = "Cannot create an item in a locked collection"

=== modified file 'run-tests'
--- run-tests	2018-03-18 11:59:08 +0000
+++ run-tests	2018-05-19 20:49:48 +0000
@@ -34,17 +34,17 @@
     MODULE="$@"
 else
     # run all tests, useful for tarmac and reviews
-    MODULE="ubuntuone"
+    MODULE="magicicadaclient"
 fi
 
 SYSNAME=`uname -s`
 if [ "$SYSNAME" == "Darwin" ]; then
     IGNORE_FILES="test_linux.py,test_windows.py"
-    IGNORE_PATHS="ubuntuone/platform/tests/linux"
+    IGNORE_PATHS="magicicadaclient/platform/tests/linux"
 else
     # Linux
     IGNORE_FILES="test_darwin.py,test_fsevents_daemon.py,test_windows.py"
-    IGNORE_PATHS="ubuntuone/platform/tests/windows"
+    IGNORE_PATHS="magicicadaclient/platform/tests/windows"
 fi
 
 echo "*** Running test suite for ""$MODULE"" ***"

=== removed file 'ubuntuone-client.pth'
--- ubuntuone-client.pth	2013-06-10 19:27:21 +0000
+++ ubuntuone-client.pth	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ubuntuone-client