Merge lp:~diegosarmentero/ubuntuone-client/refactor-messaging into lp:ubuntuone-client

[Diego Sarmentero]

- Refactor platform/messaging (LP: #989122).

[lp:~diegosarmentero/ubuntuone-client/refactor-messaging]

1235. By Diego Sarmentero on 2012-04-30

Adding missing files

[Manuel de la Peña (mandel)]

Same as https://code.launchpad.net/~diegosarmentero/ubuntuone-client/refactor-notification/+merge/104164/comments/224328

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-client/refactor-messaging]

1236. By Diego Sarmentero on 2012-05-01

improve __init__ imports

[Manuel de la Peña (mandel)]

review: Approve

[Eric Casteleijn (thisfred)]

+1

review: Approve

=== added directory 'tests/platform/messaging'
=== added file 'tests/platform/messaging/__init__.py'
--- tests/platform/messaging/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/platform/messaging/__init__.py	2012-05-01 11:40:24 +0000
@@ -0,0 +1,27 @@
+# Copyright 2012 Canonical Ltd.
+#
+# 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Platform/Messaging test code."""
 
=== renamed file 'tests/platform/linux/test_messaging.py' => 'tests/platform/messaging/test_linux.py'
--- tests/platform/linux/test_messaging.py	2012-04-09 20:07:05 +0000
+++ tests/platform/messaging/test_linux.py	2012-05-01 11:40:24 +0000
@@ -40,7 +40,7 @@
 from twisted.trial.unittest import TestCase
 from ubuntuone.devtools.testcases import skipIf
 
-from ubuntuone.platform.linux.messaging import (
+from ubuntuone.platform.messaging.linux import (
     Messaging,
     _server_callback,
     indicate,
 
=== added directory 'ubuntuone/platform/messaging'
=== renamed file 'ubuntuone/platform/messaging.py' => 'ubuntuone/platform/messaging/__init__.py'
--- ubuntuone/platform/messaging.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/messaging/__init__.py	2012-05-01 11:40:24 +0000
@@ -40,12 +40,10 @@
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.windows import messaging
-    source = messaging
+    from ubuntuone.platform.messaging import windows as source
     hide_message = source.hide_message
 else:
-    from ubuntuone.platform.linux import messaging
-    source = messaging
+    from ubuntuone.platform.messaging import linux as source
     DBUS_BUS_NAME = source.DBUS_BUS_NAME
     DBUS_IFACE_GUI = source.DBUS_IFACE_GUI
     TRANSLATION_DOMAIN = source.TRANSLATION_DOMAIN
 
=== renamed file 'ubuntuone/platform/linux/messaging.py' => 'ubuntuone/platform/messaging/linux.py'
=== added file 'ubuntuone/platform/messaging/windows.py'
--- ubuntuone/platform/messaging/windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/messaging/windows.py	2012-05-01 11:40:24 +0000
@@ -0,0 +1,62 @@
+# ubuntuone.syncdaemon.platform.messaging - Messages to the user
+#
+# Author: Eric Casteleijn <[e-mail]>
+#
+# Copyright 2011-2012 Canonical Ltd.
+#
+# 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Module that implements sending messages to the end user."""
+
+# TODO: We may want to enable different messaging systems. When none
+# of them are available, we should fall back to silently discarding
+# messages.
+
+from ubuntuone.status.messaging import AbstractMessaging
+
+
+class Messaging(AbstractMessaging):
+    """Notification of the end user."""
+
+    # pylint: disable=R0913
+    def show_message(self, sender, callback=None, message_time=None,
+                     message_count=None, icon=None):
+        """Show a message in the messaging menu."""
+        # TODO: make this work
+    # pylint: enable=R0913
+
+    def update_count(self, sender, add_count):
+        """Update the count for an existing indicator."""
+        # TODO: make this work
+
+
+def hide_message(indicator):            # pylint: disable=W0613
+    """Remove the message once it has been dealt with."""
+    # TODO: make this work
+
+
+def open_volumes(the_indicator, message_time=None):  # pylint: disable=W0613
+    """Open the control panel to the shares tab."""
+    # TODO: make this work
 
=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2012-05-01 11:40:24 +0000
+++ ubuntuone/platform/windows/__init__.py	2012-05-01 11:40:24 +0000
@@ -40,7 +40,6 @@
 import event_logging
 import launcher
 import logger
-import messaging
 import notification
 
 from ubuntuone.platform.os_helper import (
 
=== removed file 'ubuntuone/platform/windows/messaging.py'
--- ubuntuone/platform/windows/messaging.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/windows/messaging.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# ubuntuone.syncdaemon.platform.messaging - Messages to the user
-#
-# Author: Eric Casteleijn <[e-mail]>
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# 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
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Module that implements sending messages to the end user."""
-
-# TODO: We may want to enable different messaging systems. When none
-# of them are available, we should fall back to silently discarding
-# messages.
-
-from ubuntuone.status.messaging import AbstractMessaging
-
-
-class Messaging(AbstractMessaging):
-    """Notification of the end user."""
-
-    # pylint: disable=R0913
-    def show_message(self, sender, callback=None, message_time=None,
-                     message_count=None, icon=None):
-        """Show a message in the messaging menu."""
-        # TODO: make this work
-    # pylint: enable=R0913
-
-    def update_count(self, sender, add_count):
-        """Update the count for an existing indicator."""
-        # TODO: make this work
-
-
-def hide_message(indicator):            # pylint: disable=W0613
-    """Remove the message once it has been dealt with."""
-    # TODO: make this work
-
-
-def open_volumes(the_indicator, message_time=None):  # pylint: disable=W0613
-    """Open the control panel to the shares tab."""
-    # TODO: make this work