Merge lp:~dobey/ubuntuone-control-panel/use-dirspec into lp:ubuntuone-control-panel

[dobey]

Get the log directory from the platform logging module

This depends on https://code.launchpad.net/~dobey/ubuntuone-client/use-dirspec/+merge/111479 landing first.

[Brian Curtin (brian.curtin)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/use-dirspec into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    test_start_...

[lp:~dobey/ubuntuone-control-panel/use-dirspec]

335. By dobey on 2012-06-22

Fix the pep8 warnings

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'data/source_ubuntuone-control-panel.py'
--- data/source_ubuntuone-control-panel.py	2011-09-27 22:17:54 +0000
+++ data/source_ubuntuone-control-panel.py	2012-06-22 14:44:21 +0000
@@ -23,7 +23,7 @@
 
 from apport.hookutils import attach_related_packages, attach_file_if_exists
 
-from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
+from ubuntuone.platform.logger import ubuntuone_log_dir
 
 
 def add_info(report):

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-05-11 13:30:34 +0000
+++ ubuntuone/controlpanel/backend.py	2012-06-22 14:44:21 +0000
@@ -171,7 +171,7 @@
         is_synching = bool(status['is_connected'])
         is_idle = bool(status['is_online']) and status['queues'] == 'IDLE'
         is_disconnected = status['name'] == 'WAITING' or \
-                          (status['name'] == 'READY' and \
+                          (status['name'] == 'READY' and
                            'Not User' in status['connection'])
         is_starting = status['name'] in ('INIT', 'LOCAL_RESCAN', 'READY')
         is_stopped = status['name'] == 'SHUTDOWN'

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-06-06 15:15:37 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-06-22 14:44:21 +0000
@@ -998,7 +998,7 @@
         self.assertEqual(item.volume_id, volume_id)
         # should be checked if the volume_id is not None
         subscribed = item.checkState(gui.LOCAL_SUBSCRIPTION_COL) == gui.CHECKED
-        self.assertEqual(subscribed, volume_id != None)
+        self.assertEqual(subscribed, volume_id is not None)
 
         self.timer.timeout.emit()  # update sizes will be called
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-05-14 20:16:02 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-06-22 14:44:21 +0000
@@ -133,4 +133,4 @@
         self.assertTrue(tray.isVisible())
         self.assertEqual(tray.window, None)
         self.assertIsInstance(tray.context_menu, QtGui.QMenu)
-        self.assertFalse(tray.icon() == None)
+        self.assertNotEqual(tray.icon(), None)

=== modified file 'ubuntuone/controlpanel/logger.py'
--- ubuntuone/controlpanel/logger.py	2012-03-16 16:40:27 +0000
+++ ubuntuone/controlpanel/logger.py	2012-06-22 14:44:21 +0000
@@ -25,7 +25,7 @@
 
 # pylint: disable=F0401,E0611
 from ubuntuone.logger import LOGBACKUP, basic_formatter
-from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
+from ubuntuone.platform.logger import ubuntuone_log_dir
 
 
 if os.environ.get('U1_DEBUG'):