Merge lp:~mandel/ubuntuone-client/reactor-new-line into lp:ubuntuone-client

[Manuel de la Peña]

- Do not import filesystem_notifications in platform so that the reactor is not installed (LP: #1018779).
- Use \N{LINE SEPARATOR} on windows to replace \n so that the files are correctly written in the file system (LP: #1017916).

- Do not import filesystem_notifications in platform so that the reactor is not installed (LP: #1018779).
- Use \N{LINE SEPARATOR} on windows to replace \n so that the files are correctly written in the file system (LP: #1017916).

[Facundo Batista (facundo)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'tests/platform/filesystem_notifications/test_filesystem_notifications.py'
--- tests/platform/filesystem_notifications/test_filesystem_notifications.py	2012-04-30 15:19:03 +0000
+++ tests/platform/filesystem_notifications/test_filesystem_notifications.py	2012-06-28 10:39:38 +0000
@@ -44,6 +44,8 @@
     remove_file,
     remove_dir,
     rename,
+)
+from ubuntuone.platform.filesystem_notifications import (
     _GeneralINotifyProcessor,
 )
 from ubuntuone.syncdaemon.tritcask import Tritcask

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2012-06-21 18:58:50 +0000
+++ ubuntuone/platform/__init__.py	2012-06-28 10:39:38 +0000
@@ -42,7 +42,6 @@
     platform = "linux"
 
 from ubuntuone.platform import ipc
-from ubuntuone.platform import filesystem_notifications
 from ubuntuone.platform import logger
 from ubuntuone.platform import os_helper
 
@@ -106,10 +105,6 @@
 setup_filesystem_logging = logger.setup_filesystem_logging
 get_filesystem_logger = logger.get_filesystem_logger
 
-# From File System Notifications
-FilesystemMonitor = filesystem_notifications.FilesystemMonitor
-_GeneralINotifyProcessor = filesystem_notifications._GeneralINotifyProcessor
-
 # IPC
 ExternalInterface = ipc.ExternalInterface
 is_already_running = ipc.is_already_running

=== modified file 'ubuntuone/platform/os_helper/windows.py'
--- ubuntuone/platform/os_helper/windows.py	2012-05-11 17:19:44 +0000
+++ ubuntuone/platform/os_helper/windows.py	2012-06-28 10:39:38 +0000
@@ -108,6 +108,7 @@
     u'|': BASE_CODE % u'\N{DIVIDES}',
     u'?': BASE_CODE % u'\N{INTERROBANG}',
     u'*': BASE_CODE % u'\N{SEXTILE}',
+    u'\n': BASE_CODE % u'\N{LINE SEPARATOR}'
 }
 # inverse map
 LINUX_ILLEGAL_CHARS_MAP = {}

=== modified file 'ubuntuone/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/syncdaemon/event_queue.py	2012-06-28 10:39:38 +0000
@@ -37,7 +37,8 @@
 
 from twisted.internet import defer
 
-from ubuntuone.platform import access, FilesystemMonitor
+from ubuntuone.platform.os_helper import access
+from ubuntuone.platform.filesystem_notifications import FilesystemMonitor
 
 # these are our internal events, what is inserted into the whole system
 EVENTS = {