Merge lp:~mandel/ubuntuone-client/correct-namespace into lp:ubuntuone-client

[Manuel de la Peña]

- Use the correct name space (LP: 1026209).

- Use the correct name space (LP: 1026209).

[Roberto Alsina (ralsina)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks good!

Please make sure that lp:~mandel/ubuntuone-fsevents-daemon/correct-namespace gets merged before this one.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/ubuntuone-client/correct-namespace into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.69
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
...

=== modified file 'tests/platform/filesystem_notifications/test_fsevents_daemon.py'
--- tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-07-19 14:13:06 +0000
+++ tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-07-23 12:28:18 +0000
@@ -26,14 +26,14 @@
 # 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.
-"""Tests for the fsevents daemon integration."""
+"""Tests for the fseventsd daemon integration."""
 
 import os
 
 from twisted.internet import defer, protocol
 
 from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone.darwin import fsevents
+from ubuntuone import fseventsd
 from ubuntuone.devtools.testcases.txsocketserver import TidyUnixServer
 from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
     fsevents_daemon,
@@ -272,7 +272,7 @@
         head, _ = os.path.split(destination_path)
         self.factory.watched_paths.append(head)
         event = FakeDaemonEvent()
-        event.event_type = fsevents.FSE_RENAME
+        event.event_type = fseventsd.FSE_RENAME
         event.event_paths.extend([source_path, destination_path])
         converted_events = self.factory.convert_in_pyinotify_event(event)
         self.assertEqual(1, len(converted_events))
@@ -289,7 +289,7 @@
         head, _ = os.path.split(source_path)
         self.factory.watched_paths.append(head)
         event = FakeDaemonEvent()
-        event.event_type = fsevents.FSE_RENAME
+        event.event_type = fseventsd.FSE_RENAME
         event.event_paths.extend([source_path, destination_path])
         converted_events = self.factory.convert_in_pyinotify_event(event)
         self.assertEqual(1, len(converted_events))
@@ -306,7 +306,7 @@
         head, _ = os.path.split(source_path)
         self.factory.watched_paths.append(head)
         event = FakeDaemonEvent()
-        event.event_type = fsevents.FSE_RENAME
+        event.event_type = fseventsd.FSE_RENAME
         event.event_paths.extend([source_path, destination_path])
         converted_events = self.factory.convert_in_pyinotify_event(event)
         self.assertEqual(2, len(converted_events))
@@ -337,7 +337,7 @@
         """Test processing the drop of the events."""
         func_called = []
         event = FakeDaemonEvent()
-        event.event_type = fsevents.FSE_EVENTS_DROPPED
+        event.event_type = fseventsd.FSE_EVENTS_DROPPED
 
         def fake_events_dropped():
             """A fake events dropped implementation."""
@@ -354,7 +354,7 @@
         self.factory.ignored_paths.append(head)
         event = FakeDaemonEvent()
         event.event_paths.append(event_path)
-        event.event_type = fsevents.FSE_CREATE_FILE
+        event.event_type = fseventsd.FSE_CREATE_FILE
         self.factory.process_event(event)
         self.assertEqual(0, len(self.processor.processed_events))
 
@@ -365,7 +365,7 @@
         self.factory.watched_paths.append(head)
         event = FakeDaemonEvent()
         event.event_paths.append(event_path)
-        event.event_type = fsevents.FSE_CREATE_FILE
+        event.event_type = fseventsd.FSE_CREATE_FILE
         self.factory.process_event(event)
         self.assertEqual(1, len(self.processor.processed_events))
         self.assertEqual(event_path,

=== modified file 'ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py'
--- ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py	2012-07-19 14:13:06 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py	2012-07-23 12:28:18 +0000
@@ -25,7 +25,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.
-"""Filesystem notifications based on the fsevents daemon.."""
+"""Filesystem notifications based on the fseventsd daemon.."""
 
 import logging
 import os
@@ -42,7 +42,7 @@
 )
 
 from ubuntuone import logger
-from ubuntuone.darwin import fsevents
+from ubuntuone import fseventsd
 from ubuntuone.platform.filesystem_notifications.notify_processor import (
     NotifyProcessor,
 )
@@ -61,24 +61,24 @@
 
 TRACE = logger.TRACE
 
-# map the fsevents actions to those from pyinotify
+# map the fseventsd actions to those from pyinotify
 DARWIN_ACTIONS = {
-    fsevents.FSE_CREATE_FILE: IN_CREATE,
-    fsevents.FSE_DELETE: IN_DELETE,
-    fsevents.FSE_STAT_CHANGED: IN_MODIFY,
-    fsevents.FSE_CONTENT_MODIFIED: IN_MODIFY,
-    fsevents.FSE_CREATE_DIR: IN_CREATE,
+    fseventsd.FSE_CREATE_FILE: IN_CREATE,
+    fseventsd.FSE_DELETE: IN_DELETE,
+    fseventsd.FSE_STAT_CHANGED: IN_MODIFY,
+    fseventsd.FSE_CONTENT_MODIFIED: IN_MODIFY,
+    fseventsd.FSE_CREATE_DIR: IN_CREATE,
 }
 
 # list of those events from which we do not care
 DARWIN_IGNORED_ACTIONS = (
-    fsevents.FSE_UNKNOWN,
-    fsevents.FSE_INVALID,
-    fsevents.FSE_EXCHANGE,
-    fsevents.FSE_FINDER_INFO_CHANGED,
-    fsevents.FSE_CHOWN,
-    fsevents.FSE_XATTR_MODIFIED,
-    fsevents.FSE_XATTR_REMOVED,
+    fseventsd.FSE_UNKNOWN,
+    fseventsd.FSE_INVALID,
+    fseventsd.FSE_EXCHANGE,
+    fseventsd.FSE_FINDER_INFO_CHANGED,
+    fseventsd.FSE_CHOWN,
+    fseventsd.FSE_XATTR_MODIFIED,
+    fseventsd.FSE_XATTR_REMOVED,
 )
 
 # translates quickly the event and it's is_dir state to our standard events
@@ -95,7 +95,7 @@
     IN_MOVED_TO: 'FS_FILE_CREATE',
     IN_MOVED_TO | IN_ISDIR: 'FS_DIR_CREATE'}
 
-# TODO: This should be in fsevents to be imported!
+# TODO: This should be in fseventsd to be imported!
 # Path to the socket used by the daemon
 DAEMON_SOCKET = '/var/run/ubuntuone_fsevents_daemon'
 
@@ -134,14 +134,14 @@
     return unicodedata.normalize('NFC', path).encode('utf-8')
 
 
-class PyInotifyEventsFactory(fsevents.FsEventsFactory):
+class PyInotifyEventsFactory(fseventsd.FsEventsFactory):
     """Factory that process events and converts them in pyinotify ones."""
 
     def __init__(self, processor,
             ignored_events=DARWIN_IGNORED_ACTIONS):
         """Create a new instance."""
         # old style class
-        fsevents.FsEventsFactory.__init__(self)
+        fseventsd.FsEventsFactory.__init__(self)
         self._processor = processor
         self._ignored_events = ignored_events
         self.watched_paths = []
@@ -215,7 +215,7 @@
         """Get an event from the daemon and convert it in a pyinotify one."""
         # the rename is a special type of event because it has to be either
         # converted is a pair of events or in a single one (CREATE or DELETE)
-        if event.event_type == fsevents.FSE_RENAME:
+        if event.event_type == fseventsd.FSE_RENAME:
             is_create = self.is_create(event)
             if is_create or self.is_delete(event):
                 mask = IN_CREATE if is_create else IN_DELETE
@@ -278,7 +278,7 @@
         if event.event_type in self._ignored_events:
             # Do nothing because sd does not care about such info
             return
-        if event.event_type == fsevents.FSE_EVENTS_DROPPED:
+        if event.event_type == fseventsd.FSE_EVENTS_DROPPED:
             # this should not be very common but we have to deal with it
             return self.events_dropper()
         events = self.convert_in_pyinotify_event(event)