Merge lp:~diegosarmentero/ubuntuone-client/refactor-os-helper into lp:ubuntuone-client

[Diego Sarmentero]

- Refactor os_helper (LP: #989128).

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

Superb, the port is moving! Everything looks ok and ran the tests both on linux P and Windows 7.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~diegosarmentero/ubuntuone-client/refactor-session has not yet been merged into lp:ubuntuone-client.

=== modified file 'Makefile.am'
--- Makefile.am	2012-04-09 20:09:55 +0000
+++ Makefile.am	2012-04-27 21:01:23 +0000
@@ -54,14 +54,14 @@
 test: logging.conf $(clientdefs_DATA) Makefile
 	echo "$(PYTHONPATH)"
 	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy tests; \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows tests/proxy; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i test_windows.py tests; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i test_windows.py tests/proxy; \
 	fi
 	rm -rf _trial_temp
 
 test-coverage: logging.conf $(clientdefs_DATA) Makefile
 	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows tests; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows -i test_windows.py tests; \
 	fi
 	rm -rf _trial_temp
 

=== added directory 'tests/platform/os_helper'
=== added file 'tests/platform/os_helper/__init__.py'
--- tests/platform/os_helper/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/platform/os_helper/__init__.py	2012-04-27 21:01:23 +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/Os Helper test code."""

=== renamed file 'tests/platform/linux/test_os_helper.py' => 'tests/platform/os_helper/test_linux.py'
--- tests/platform/linux/test_os_helper.py	2012-04-09 20:07:05 +0000
+++ tests/platform/os_helper/test_linux.py	2012-04-27 21:01:23 +0000
@@ -44,7 +44,7 @@
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
-from tests.platform import test_os_helper
+from tests.platform.os_helper import test_os_helper
 from ubuntuone.platform import (
     move_to_trash,
     open_file,
@@ -118,7 +118,6 @@
         self.assertTrue(self.handler.check_warning("Problems moving to trash!",
                                                    "Removing anyway", "foo"))
 
-
     def test_movetotrash_file_systemnotcapable(self):
         """The system is not capable of moving into trash."""
         FakeGIOFile._bad_trash_call = GIO_NOT_SUPPORTED

=== renamed file 'tests/platform/test_os_helper.py' => 'tests/platform/os_helper/test_os_helper.py'
=== renamed file 'tests/platform/windows/test_os_helper.py' => 'tests/platform/os_helper/test_windows.py'
--- tests/platform/windows/test_os_helper.py	2012-04-09 20:07:05 +0000
+++ tests/platform/os_helper/test_windows.py	2012-04-27 21:01:23 +0000
@@ -51,8 +51,8 @@
     SetFileAttributesW
 )
 
-from ubuntuone.platform.windows import os_helper
-from ubuntuone.platform.windows.os_helper import (
+from ubuntuone.platform.os_helper import windows as os_helper
+from ubuntuone.platform.os_helper.windows import (
     _set_file_attributes,
     _unicode_to_bytes,
     EVERYONE_SID,
@@ -70,7 +70,7 @@
     set_no_rights,
     WINDOWS_ILLEGAL_CHARS_MAP,
 )
-from tests.platform.test_os_helper import OSWrapperTests, WalkTests
+from tests.platform.os_helper.test_os_helper import OSWrapperTests, WalkTests
 
 
 # ugly trick to stop pylint for complaining about

=== modified file 'tests/platform/windows/test_filesystem_notifications.py'
--- tests/platform/windows/test_filesystem_notifications.py	2012-04-09 20:07:05 +0000
+++ tests/platform/windows/test_filesystem_notifications.py	2012-04-27 21:01:23 +0000
@@ -42,7 +42,7 @@
 
 from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform.windows import os_helper
+from ubuntuone.platform.os_helper import windows as os_helper
 from ubuntuone.platform.windows.pyinotify import (
     ProcessEvent,
     IN_CLOSE_WRITE,
@@ -144,8 +144,9 @@
             # If we use extend we wont have the same logging because it will
             # group all events in a single lists which is not what the COM API
             # does.
-            str_events = [(WINDOWS_ACTIONS_NAMES[action], path) for action, path in
-                          events]
+            str_events = [
+                (WINDOWS_ACTIONS_NAMES[action], path) for action, path in
+                 events]
             self.raw_events.append(str_events)
             return events
 

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/__init__.py	2012-04-27 21:01:23 +0000
@@ -43,7 +43,7 @@
     from ubuntuone.platform import linux
     source = linux
 
-# This imports needs to be here in order to belongs to this namespace
+# This imports needs to be here in order to be included in this namespace
 from ubuntuone.platform import credentials
 from ubuntuone.platform import tools
 

=== modified file 'ubuntuone/platform/linux/__init__.py'
--- ubuntuone/platform/linux/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/linux/__init__.py	2012-04-27 21:01:23 +0000
@@ -35,7 +35,7 @@
 platform = "linux"
 
 
-from ubuntuone.platform.linux.os_helper import (
+from ubuntuone.platform.os_helper import (
     access,
     allow_writes,
     can_write,

=== modified file 'ubuntuone/platform/linux/filesystem_notifications.py'
--- ubuntuone/platform/linux/filesystem_notifications.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/linux/filesystem_notifications.py	2012-04-27 21:01:23 +0000
@@ -36,7 +36,7 @@
 
 import pyinotify
 from twisted.internet import abstract, reactor, error, defer
-from ubuntuone.platform.linux.os_helper import access
+from ubuntuone.platform.os_helper import access
 
 
 # translates quickly the event and it's is_dir state to our standard events

=== added directory 'ubuntuone/platform/os_helper'
=== renamed file 'ubuntuone/platform/os_helper.py' => 'ubuntuone/platform/os_helper/__init__.py'
--- ubuntuone/platform/os_helper.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/os_helper/__init__.py	2012-04-27 21:01:23 +0000
@@ -32,11 +32,11 @@
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.windows import os_helper
-    source = os_helper
+    from ubuntuone.platform.os_helper import windows
+    source = windows
 else:
-    from ubuntuone.platform.linux import os_helper
-    source = os_helper
+    from ubuntuone.platform.os_helper import linux
+    source = linux
 
 set_no_rights = source.set_no_rights
 set_file_readonly = source.set_file_readonly

=== renamed file 'ubuntuone/platform/linux/os_helper.py' => 'ubuntuone/platform/os_helper/linux.py'
=== renamed file 'ubuntuone/platform/windows/os_helper.py' => 'ubuntuone/platform/os_helper/windows.py'
=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2012-04-27 21:01:23 +0000
+++ ubuntuone/platform/windows/__init__.py	2012-04-27 21:01:23 +0000
@@ -43,9 +43,8 @@
 import logger
 import messaging
 import notification
-import os_helper
 
-from ubuntuone.platform.windows.os_helper import (
+from ubuntuone.platform.os_helper import (
     access,
     allow_writes,
     can_write,

=== modified file 'ubuntuone/platform/windows/filesystem_notifications.py'
--- ubuntuone/platform/windows/filesystem_notifications.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/windows/filesystem_notifications.py	2012-04-27 21:01:23 +0000
@@ -78,7 +78,7 @@
     IN_MOVED_FROM,
     IN_MOVED_TO,
     IN_MODIFY)
-from ubuntuone.platform.windows.os_helper import (
+from ubuntuone.platform.os_helper.windows import (
     is_valid_syncdaemon_path,
     is_valid_windows_path,
     get_syncdaemon_valid_path,