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

[Diego Sarmentero]

- Refactor platform/filesystem_notifications (LP: #989125).

[Manuel de la Peña (mandel)]

review: Approve

[Eric Casteleijn (thisfred)]

+1

review: Approve

=== added directory 'tests/platform/filesystem_notifications'
=== added file 'tests/platform/filesystem_notifications/__init__.py'
--- tests/platform/filesystem_notifications/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/platform/filesystem_notifications/__init__.py	2012-04-30 16:23: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/File System Notifications test code."""

=== renamed file 'tests/platform/test_filesystem_notifications.py' => 'tests/platform/filesystem_notifications/test_filesystem_notifications.py'
=== renamed file 'tests/platform/linux/test_filesystem_notifications.py' => 'tests/platform/filesystem_notifications/test_linux.py'
--- tests/platform/linux/test_filesystem_notifications.py	2012-04-09 20:07:05 +0000
+++ tests/platform/filesystem_notifications/test_linux.py	2012-04-30 16:23:24 +0000
@@ -43,7 +43,9 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.syncdaemon import volume_manager
 from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.platform.linux import filesystem_notifications
+from ubuntuone.platform.filesystem_notifications import (
+    linux as filesystem_notifications,
+)
 
 # We normally access to private attribs in tests
 # pylint: disable=W0212

=== renamed file 'tests/platform/windows/test_filesystem_notifications.py' => 'tests/platform/filesystem_notifications/test_windows.py'
--- tests/platform/windows/test_filesystem_notifications.py	2012-04-27 20:38:13 +0000
+++ tests/platform/filesystem_notifications/test_windows.py	2012-04-30 16:23:24 +0000
@@ -50,8 +50,10 @@
     IN_DELETE,
     IN_OPEN,
 )
-from ubuntuone.platform.windows import filesystem_notifications
-from ubuntuone.platform.windows.filesystem_notifications import (
+from ubuntuone.platform.filesystem_notifications import (
+    windows as filesystem_notifications,
+)
+from ubuntuone.platform.filesystem_notifications.windows import (
     FilesystemMonitor,
     NotifyProcessor,
     Watch,

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2012-04-30 16:23:24 +0000
+++ ubuntuone/platform/__init__.py	2012-04-30 16:23:24 +0000
@@ -44,6 +44,7 @@
     source = linux
 
 from ubuntuone.platform import ipc
+from ubuntuone.platform import filesystem_notifications
 
 # This imports needs to be here in order to be included in this namespace
 from ubuntuone.platform import credentials
@@ -107,8 +108,8 @@
 get_filesystem_logger = source.get_filesystem_logger
 
 # From File System Notifications
-FilesystemMonitor = source.FilesystemMonitor
-_GeneralINotifyProcessor = source._GeneralINotifyProcessor
+FilesystemMonitor = filesystem_notifications.FilesystemMonitor
+_GeneralINotifyProcessor = filesystem_notifications._GeneralINotifyProcessor
 
 # IPC
 ExternalInterface = ipc.ExternalInterface

=== added directory 'ubuntuone/platform/filesystem_notifications'
=== added file 'ubuntuone/platform/filesystem_notifications/__init__.py'
--- ubuntuone/platform/filesystem_notifications/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/filesystem_notifications/__init__.py	2012-04-30 16:23:24 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 *-*
+#
+# 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.
+"""File System Notification module."""
+
+import sys
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.filesystem_notifications import windows
+    FilesystemMonitor = windows.FilesystemMonitor
+    _GeneralINotifyProcessor = windows.NotifyProcessor
+else:
+    from ubuntuone.platform.filesystem_notifications import linux
+    FilesystemMonitor = linux.FilesystemMonitor
+    _GeneralINotifyProcessor = linux._GeneralINotifyProcessor

=== renamed file 'ubuntuone/platform/linux/filesystem_notifications.py' => 'ubuntuone/platform/filesystem_notifications/linux.py'
--- ubuntuone/platform/linux/filesystem_notifications.py	2012-04-27 20:38:13 +0000
+++ ubuntuone/platform/filesystem_notifications/linux.py	2012-04-30 16:23:24 +0000
@@ -1,8 +1,6 @@
+# -*- coding: utf-8 *-*
 # ubuntuone.syncdaemon.event_queue - Event queuing
 #
-# Authors: Facundo Batista <[e-mail]>
-#          Manuel de la Pena <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it

=== renamed file 'ubuntuone/platform/windows/filesystem_notifications.py' => 'ubuntuone/platform/filesystem_notifications/windows.py'
--- ubuntuone/platform/windows/filesystem_notifications.py	2012-04-27 20:38:13 +0000
+++ ubuntuone/platform/filesystem_notifications/windows.py	2012-04-30 16:23:24 +0000
@@ -1,7 +1,4 @@
-#
-# Authors: Manuel de la Pena <[e-mail]>
-#          Natalia B. Bidart <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
+# -*- coding: utf-8 *-*
 #
 # Copyright 2011-2012 Canonical Ltd.
 #

=== modified file 'ubuntuone/platform/linux/__init__.py'
--- ubuntuone/platform/linux/__init__.py	2012-04-30 16:23:24 +0000
+++ ubuntuone/platform/linux/__init__.py	2012-04-30 16:23:24 +0000
@@ -70,8 +70,4 @@
     setup_filesystem_logging,
     get_filesystem_logger,
 )
-from ubuntuone.platform.linux.filesystem_notifications import (
-    FilesystemMonitor,
-    _GeneralINotifyProcessor,
-)
 from ubuntuone.platform.linux import notification

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2012-04-30 16:23:24 +0000
+++ ubuntuone/platform/windows/__init__.py	2012-04-30 16:23:24 +0000
@@ -38,7 +38,6 @@
 
 import constants
 import event_logging
-import filesystem_notifications
 import launcher
 import logger
 import messaging
@@ -80,8 +79,4 @@
     setup_filesystem_logging,
     get_filesystem_logger,
 )
-from ubuntuone.platform.windows.filesystem_notifications import (
-    FilesystemMonitor,
-    NotifyProcessor as _GeneralINotifyProcessor,
-)
 from ubuntuone.platform.windows import notification