Merge lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.3 into lp:ubuntuone-control-panel/stable-3-0

[Natalia Bidart]

[ Roberto Alsina <email address hidden>
  - Use uncompressed resources and the same qss loading code in both platforms
  to avoid future inconsistencies (LP: #917322).

[ Diego Sarmentero <email address hidden> ]
  - Folder list no longer shows garbage for user homes non-ascii
    (LP: #851356).

[ Natalia B. Bidart <email address hidden> ]
  - Fix lint issues (LP: #920640).

[ Manuel de la Pena <email address hidden> ]
  - Adds the possibility to skip the lint checks on windows when passing the
  /skip-lint parameter to run-tests.bat (LP: #918248).

[lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.3]

247. By Natalia Bidart on 2012-01-31

Attaching bug numbers.

[Roberto Alsina (ralsina)]

Looks good!

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-12-27 18:48:44 +0000
+++ run-tests.bat	2012-01-31 21:52:23 +0000
@@ -1,37 +1,42 @@
-:: Author: Natalia B. Bidart <[e-mail]>
-::
-:: Copyright 2011 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/>.
-
-:: call setup.py build so that the qt uic is called
-
-@ECHO off
-
-SET MODULE="ubuntuone"
-SET PYTHONEXEPATH="C:\Python27"
-SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
+:: Copyright 2011-12 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/>.
+
+:: call setup.py build so that the qt uic is called
+
+@ECHO off
+
+SET MODULE="ubuntuone"
+SET PYTHONEXEPATH="C:\Python27"
+SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
 SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
 
-"%PYTHONEXEPATH%\python.exe" setup.py build
-ECHO Running tests
-:: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %MODULE%
-:: Clean the build from the setupt.py
-ECHO Cleaning the generated code before running the style checks...
-"%PYTHONEXEPATH%\python.exe" setup.py clean
-ECHO Performing style checks...
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
-"%PYTHONEXEPATH%\Scripts\pep8.exe" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
-:: Delete the temp folders
-RMDIR /s /q _trial_temp
+SET SKIPLINT=0
+:: lets check if we pass the /skip-lint param, if we did we remember and use shift
+if "%1" == "/skip-lint" SET SKIPLINT=1
+
+"%PYTHONEXEPATH%\python.exe" setup.py build
+ECHO Running tests
+:: execute the tests with a number of ignored linux only modules
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %MODULE%
+:: Clean the build from the setupt.py
+ECHO Cleaning the generated code
+"%PYTHONEXEPATH%\python.exe" setup.py clean
+
+IF %SKIPLINT% == 1 GOTO :CLEAN
+ECHO Performing style checks...
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
+"%PYTHONEXEPATH%\Scripts\pep8.exe" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
+:CLEAN
+:: Delete the temp folders
+RMDIR /s /q _trial_temp
 
=== modified file 'setup.py'
--- setup.py	2012-01-03 18:06:05 +0000
+++ setup.py	2012-01-31 21:52:23 +0000
@@ -116,7 +116,8 @@
         path = os.getenv('PATH')
         os.putenv('PATH', path + os.path.pathsep + os.path.join(
                   os.path.dirname(PyQt4.__file__), 'bin'))
-        if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0:
+        if os.system('pyrcc4 -no-compress "%s" -o "%s"' %
+            (qrc_file, py_file)) > 0:
             self.warn('Unable to generate python module {py_file}'
                       ' for resource file {qrc_file}'.format(
                       py_file=py_file, qrc_file=qrc_file))
 
=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-09-16 16:38:43 +0000
+++ ubuntuone/controlpanel/backend.py	2012-01-31 21:52:23 +0000
@@ -139,6 +139,10 @@
 
         logger.info('ControlBackend: instance started.')
 
+    def get_home_dir(self):
+        """Return a defer with the home_dir from ubuntu one client."""
+        return self.sd_client.get_home_dir()
+
     def _process_file_sync_status(self, status):
         """Process raw file sync status into custom format.
 
@@ -289,11 +293,15 @@
 
         returnValue(local_device)
 
+    @inlineCallbacks
     def _process_path(self, path):
         """Trim 'path' so the '~' is removed."""
-        home = os.path.expanduser('~')
-        result = path.replace(os.path.join(home, ''), '')
-        return result
+        home_dir = yield self.get_home_dir()
+        if not home_dir.endswith(os.path.sep):
+            home_dir += os.path.sep
+        if path.startswith(home_dir):
+            path = path[len(home_dir):]
+        returnValue(path)
 
     @inlineCallbacks
     def get_credentials(self):
@@ -578,9 +586,10 @@
         folders = yield self.sd_client.get_folders()
         shares = yield self.sd_client.get_shares()
 
+        display_name = yield self._process_path(root_dir)
         root_volume = {u'volume_id': u'', u'path': root_dir,
                        u'subscribed': True, u'type': self.ROOT_TYPE,
-                       u'display_name': self._process_path(root_dir)}
+                       u'display_name': display_name}
         self._volumes[u''] = root_volume
 
         # group shares by the offering user
@@ -618,7 +627,8 @@
                 logger.warning('volumes_info: udf %r already in the volumes '
                                'list (%r).', vid, self._volumes[vid])
             folder[u'subscribed'] = bool(folder[u'subscribed'])
-            folder[u'display_name'] = self._process_path(folder[u'path'])
+            display_name = yield self._process_path(folder[u'path'])
+            folder[u'display_name'] = display_name
             self._volumes[vid] = folder
 
         folders.sort(key=operator.itemgetter('path'))
@@ -678,7 +688,7 @@
     @inlineCallbacks
     def validate_path_for_folder(self, folder_path):
         """Validate 'folder_path' for folder creation."""
-        user_home = os.path.expanduser('~')
+        user_home = yield self.get_home_dir()
         folder_path = append_path_sep(folder_path)
 
         # handle folder_path not within '~' or links
 
=== modified file 'ubuntuone/controlpanel/dbus_service.py'
--- ubuntuone/controlpanel/dbus_service.py	2011-09-14 19:08:52 +0000
+++ ubuntuone/controlpanel/dbus_service.py	2012-01-31 21:52:23 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
-# Authors: Natalia B. Bidart <[e-mail]>
 #
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-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
@@ -23,14 +20,12 @@
 import sys
 
 import dbus.service
-# pylint: disable=E0611
-# pylint: disable=W0404
+# pylint: disable=E0611,W0404
 if 'gobject' in sys.modules:
     import gobject as GObject
 else:
     from gi.repository import GObject
-# pylint: enable=W0404
-# pylint: enable=E0611
+# pylint: enable=E0611,W0404
 
 from dbus.mainloop.glib import DBusGMainLoop
 from dbus.service import method, signal
@@ -156,6 +151,8 @@
 class ControlPanelBackend(dbus.service.Object):
     """Export the Control Panel backend thru DBus."""
 
+    # pylint: disable=C0103,E1002
+
     def __init__(self, backend, *args, **kwargs):
         """Create this instance of the backend."""
         super(ControlPanelBackend, self).__init__(*args, **kwargs)
@@ -164,8 +161,6 @@
         logger.debug('ControlPanelBackend: created with %r, %r.',
                      args, kwargs)
 
-    # pylint: disable=C0103
-
     @log_call(logger.error)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
     def UnauthorizedError(self, error):
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2011-09-19 18:13:28 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2012-01-31 21:52:23 +0000
@@ -840,6 +840,8 @@
         else:
             self.on_success()
 
+        # Class 'style' has no 'bg' member
+        # pylint: disable=E1101
         odd_row_color = self.message.style.bg[gtk.STATE_NORMAL]
         for i, device_info in enumerate(info):
             device = Device(confirm_remove_dialog=self.confirm_remove_dialog)
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py	2012-01-31 21:52:23 +0000
@@ -24,6 +24,10 @@
 from ubuntuone.controlpanel.gui.gtk import widgets
 
 
+# Class 'style' has no 'fg' member
+# pylint: disable=E1101
+
+
 class LoadingTestCase(TestCase):
     """Test suite for the Loading widget (a spinner plus a label)."""
 
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/widgets.py'
--- ubuntuone/controlpanel/gui/gtk/widgets.py	2011-04-11 17:30:04 +0000
+++ ubuntuone/controlpanel/gui/gtk/widgets.py	2012-01-31 21:52:23 +0000
@@ -130,6 +130,9 @@
     # Invalid name, Missing docstring, do not list fix-mes
     # pylint: disable=C0103,C0111,W0511
 
+    # Class 'style' has no 'attach', 'set_background', 'paint_flat_box' member
+    # pylint: disable=E1101
+
     __gsignals__ = {
         "damage_event": "override",
     }
 
=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2011-12-26 19:45:13 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2012-01-31 21:52:23 +0000
@@ -20,8 +20,6 @@
 
 from __future__ import division
 
-import os
-
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
@@ -56,8 +54,9 @@
     def on_clicked(self):
         """The 'Sync another folder' button was clicked."""
         # The options argument is because of LP: #835013
+        home_dir = yield self.backend.get_home_dir()
         folder = QtGui.QFileDialog.getExistingDirectory(
-            parent=self, directory=os.path.expanduser('~'),
+            parent=self, directory=home_dir,
             options=QtGui.QFileDialog.DontUseNativeDialog)
         folder = unicode(QtCore.QDir.toNativeSeparators(folder))
         logger.debug('on_add_folder_button_clicked: user requested folder '
@@ -68,9 +67,8 @@
 
         is_valid = yield self.backend.validate_path_for_folder(folder)
         if not is_valid:
-            user_home = os.path.expanduser('~')
             text = FOLDER_INVALID_PATH % {'folder_path': folder,
-                                          'home_folder': user_home}
+                                          'home_folder': home_dir}
             QtGui.QMessageBox.warning(self, '', text, CLOSE)
             return
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-01-04 11:43:14 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-01-31 21:52:23 +0000
@@ -18,6 +18,8 @@
 
 import sys
 
+from PyQt4 import QtCore
+
 # Module used to include the resources into this file
 # Unused import images_rc, pylint: disable=W0611
 from ubuntuone.controlpanel.gui.qt.ui import images_rc
@@ -42,6 +44,8 @@
     # The main loop MUST be initialized before importing the reactor
     app = UniqueApplication(sys.argv, "ubuntuone-control-panel")
     source.main(app)
+    qss = QtCore.QResource(":/ubuntuone.qss")
+    app.setStyleSheet(qss.data())
 
     # Reimport 'qt4reactor', 'reactor', 'start', pylint: disable=W0404, F0401
     import qt4reactor
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
--- ubuntuone/controlpanel/gui/qt/main/linux.py	2011-11-11 19:27:07 +0000
+++ ubuntuone/controlpanel/gui/qt/main/linux.py	2012-01-31 21:52:23 +0000
@@ -17,14 +17,9 @@
 """Main method to be used on linux."""
 
 from dbus.mainloop.qt import DBusQtMainLoop
-from PyQt4 import QtCore
 
 
 def main(app):
     """Apply style sheet."""
     # The DBus main loop MUST be initialized before importing the reactor
     DBusQtMainLoop(set_as_default=True)
-
-    # Apply Style Sheet -- The linux version may be different
-    qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(qss.data())
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2011-11-11 19:40:10 +0000
+++ ubuntuone/controlpanel/gui/qt/main/windows.py	2012-01-31 21:52:23 +0000
@@ -16,7 +16,7 @@
 
 """Main method to be used on windows."""
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
 
 
 def main(app):
@@ -24,9 +24,3 @@
     # Apply font to the entire application
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
-
-    # Apply Style Sheet -- The windows version may be different
-    qss_file = QtCore.QFile(":/ubuntuone.qss")
-    qss_file.open(QtCore.QFile.ReadOnly)
-    stylesheet = QtCore.QLatin1String(qss_file.readAll())
-    app.setStyleSheet(stylesheet)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-01-31 21:52:23 +0000
@@ -127,6 +127,10 @@
         self._called['get_credentials'] = ((), {})
         return TOKEN
 
+    def get_home_dir(self):
+        """Fake home return."""
+        return USER_HOME
+
 
 class CrashyBackendException(Exception):
     """A faked backend crash."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-12-26 19:45:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-01-31 21:52:23 +0000
@@ -80,10 +80,11 @@
         """When adding a new folder, the proper file chooser is raised."""
         yield self.ui.click()
 
+        home_dir = yield self.ui.backend.get_home_dir()
         self.assertEqual(FakedFileDialog.args, ())
         self.assertEqual(FakedFileDialog.kwargs, {
             'options': gui.QtGui.QFileDialog.DontUseNativeDialog,
-            'directory': os.path.expanduser('~'),
+            'directory': home_dir,
             'parent': self.ui,
         })
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-01-02 14:29:16 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-01-31 21:52:23 +0000
@@ -20,9 +20,9 @@
 import sys
 
 if sys.platform == "win32":
-    import windows as platform
+    from ubuntuone.controlpanel.gui.qt.uniqueapp import windows as platform
 else:
-    import linux as platform
+    from ubuntuone.controlpanel.gui.qt.uniqueapp import linux as platform
 
 #pylint: disable=C0103
 UniqueApplication = platform.UniqueApplication
 
=== modified file 'ubuntuone/controlpanel/sd_client/__init__.py'
--- ubuntuone/controlpanel/sd_client/__init__.py	2011-08-24 19:56:19 +0000
+++ ubuntuone/controlpanel/sd_client/__init__.py	2012-01-31 21:52:23 +0000
@@ -108,6 +108,10 @@
         """Disable udf_autosubscribe in the syncdaemon."""
         return self.proxy.enable_udf_autosubscribe(False)
 
+    def get_home_dir(self):
+        """Retrieve the root information from syncdaemon."""
+        return self.proxy.get_home_dir()
+
     def get_root_dir(self):
         """Retrieve the root information from syncdaemon."""
         return self.proxy.get_root_dir()
 
=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-01-31 21:52:23 +0000
@@ -248,6 +248,10 @@
         """Stop the file_sync service."""
         self.actions.append('stop')
 
+    def get_home_dir(self):
+        """Grab the home dir."""
+        return USER_HOME
+
     def get_root_dir(self):
         """Grab the root dir."""
         return ROOT_PATH
@@ -784,10 +788,11 @@
         self.be.wc.results[QUOTA_API] = SAMPLE_QUOTA_JSON
 
         # root dir info
+        display_name = yield self.be._process_path(ROOT_PATH)
         self.root_volume = {
             u'volume_id': u'', u'path': ROOT_PATH, u'subscribed': True,
             u'type': self.be.ROOT_TYPE,
-            u'display_name': self.be._process_path(ROOT_PATH),
+            u'display_name': display_name,
         }
 
     @inlineCallbacks
@@ -831,7 +836,8 @@
             folder = folder.copy()
             folder[u'type'] = self.be.FOLDER_TYPE
             folder[u'subscribed'] = bool(folder[u'subscribed'])
-            folder[u'display_name'] = self.be._process_path(folder[u'path'])
+            display_name = yield self.be._process_path(folder[u'path'])
+            folder[u'display_name'] = display_name
             folders.append(folder)
 
         # sort folders by path
@@ -863,6 +869,26 @@
         self.assertEqual(result, expected)
 
     @inlineCallbacks
+    def test_volumes_info_process_path(self):
+        """The volumes_info method exercises its callback."""
+        root_path = USER_HOME + os.path.sep + 'My Ubuntu' + USER_HOME
+        self.patch(self.be.sd_client, 'get_root_dir', lambda: root_path)
+        for item in SAMPLE_FOLDERS:
+            path = item[u'path']
+            path = path[len(USER_HOME) + 1:]
+            item[u'path'] = os.path.join(root_path, path)
+        self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
+
+        yield self.be.volumes_info()
+        for item in SAMPLE_FOLDERS:
+            key = item[u'volume_id']
+            folder = self.be._volumes[key]
+            display_name = folder['display_name']
+            prefix = 'My Ubuntu' + USER_HOME
+            self.assertTrue(display_name.startswith(prefix))
+
+    @inlineCallbacks
     def test_volumes_info_without_storage_info(self):
         """The volumes_info method exercises its callback."""
         self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
 
=== modified file 'ubuntuone/controlpanel/tests/test_sd_client.py'
--- ubuntuone/controlpanel/tests/test_sd_client.py	2011-11-21 13:32:44 +0000
+++ ubuntuone/controlpanel/tests/test_sd_client.py	2012-01-31 21:52:23 +0000
@@ -34,6 +34,9 @@
 from ubuntuone.controlpanel import sd_client
 from ubuntuone.controlpanel.tests import TestCase
 
+# Instance of 'SyncDaemonTool' has no 'foo' member
+# pylint: disable=E1101
+
 
 SAMPLE_LIMITS = {'upload': 999, 'download': 838}
 
@@ -66,9 +69,10 @@
     called = {}
     shares = {}
     folders = {}
-    root_dir = os.path.expanduser('~/Ubuntu One')
-    shares_dir = os.path.expanduser('~/.cache/ubuntuone/shares')
-    shares_dir_link = os.path.join(root_dir, 'Shared With Me')
+    home_dir = u'/home/ñandu úser'
+    root_dir = os.path.join(home_dir, u'Ubuntu One')
+    shares_dir = os.path.join(home_dir, u'.cache/ubuntuone/shares')
+    shares_dir_link = os.path.join(root_dir, u'Shared With Me')
 
     @classmethod
     def create_share(cls, name, accepted=False, subscribed=False):
@@ -299,6 +303,10 @@
         """Request a rescan from scratch for volume_id."""
         self.called['rescan_from_scratch'] = volume_id
 
+    def get_home_dir(self):
+        """Return the root directory."""
+        return self.home_dir
+
     def get_root_dir(self):
         """Return the root directory."""
         return self.root_dir