Merge lp:~mikemc/ubuntuone-client/fix-1029636 into lp:ubuntuone-client

[Mike McCracken]

- Remove unnecessary symbol imports to avoid loading default reactor when not needed (LP: #1029636)

- Remove unnecessary symbol imports to avoid loading default reactor when not needed (LP: #1029636)

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

Great, we won't longer have problems with the wrong reactor being installed via the platform package.

review: Approve

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2012-07-17 10:51:43 +0000
+++ bin/ubuntuone-syncdaemon	2012-07-27 17:13:21 +0000
@@ -48,7 +48,6 @@
 
 from ubuntuone.platform import (
     can_write,
-    get_filemonitor_class,
     set_dir_readwrite,
     is_already_running,
     is_root,
@@ -57,6 +56,10 @@
     recursive_move,
     set_application_name,
 )
+from ubuntuone.platform.filesystem_notifications.monitor import (
+    get_filemonitor_class,
+)
+
 from ubuntuone.syncdaemon import logger, config
 from ubuntuone.syncdaemon.config import (
     get_config_files,

=== modified file 'tests/syncdaemon/test_eventqueue.py'
--- tests/syncdaemon/test_eventqueue.py	2012-07-17 13:53:12 +0000
+++ tests/syncdaemon/test_eventqueue.py	2012-07-27 17:13:21 +0000
@@ -37,7 +37,7 @@
 from twisted.trial.unittest import TestCase
 
 from contrib.testing.testcase import BaseTwistedTestCase, FakeVolumeManager
-from ubuntuone.platform import FilesystemMonitor
+from ubuntuone.platform.filesystem_notifications.monitor import FilesystemMonitor
 from ubuntuone.syncdaemon import (
     event_queue,
     filesystem_manager,

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2012-07-17 13:53:12 +0000
+++ ubuntuone/platform/__init__.py	2012-07-27 17:13:21 +0000
@@ -101,12 +101,6 @@
 stat_path = os_helper.stat_path
 walk = os_helper.walk
 
-# From Monitor
-from ubuntuone.platform.filesystem_notifications import monitor
-
-get_filemonitor_class = monitor.get_filemonitor_class
-FilesystemMonitor = monitor.FilesystemMonitor
-
 # From Logger
 setup_filesystem_logging = logger.setup_filesystem_logging
 get_filesystem_logger = logger.get_filesystem_logger

=== modified file 'ubuntuone/platform/filesystem_notifications/__init__.py'
--- ubuntuone/platform/filesystem_notifications/__init__.py	2012-07-17 10:51:43 +0000
+++ ubuntuone/platform/filesystem_notifications/__init__.py	2012-07-27 17:13:21 +0000
@@ -29,10 +29,7 @@
 """File System Notification module."""
 
 from ubuntuone.platform.filesystem_notifications import (
-    monitor,
     notify_processor,
 )
 
 _GeneralINotifyProcessor = notify_processor.NotifyProcessor
-FilesystemMonitor = monitor.FilesystemMonitor
-get_filemonitor_class = monitor.get_filemonitor_class

=== modified file 'ubuntuone/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2012-07-12 16:04:44 +0000
+++ ubuntuone/syncdaemon/event_queue.py	2012-07-27 17:13:21 +0000
@@ -38,7 +38,7 @@
 from twisted.internet import defer
 
 from ubuntuone.platform.os_helper import access
-from ubuntuone.platform.filesystem_notifications import FilesystemMonitor
+from ubuntuone.platform.filesystem_notifications.monitor import FilesystemMonitor
 
 # these are our internal events, what is inserted into the whole system
 EVENTS = {