Merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10

[dobey]

[Rodney Dawes]

    Don't import APP_NAME from ubuntuone.clientdefs. Get it from SSO now.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10 failed. Below is the output from the failed tests.

*** Running DBus test suite ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 40, in <module>
    main()
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 274, in main
    options.parseOptions()
  File "/usr/lib/python2.7/dist-packages/twisted/python/usage.py", line 272, in parseOptions
    self.parseArgs(*args)
  File "/usr/lib/python2.7/dist-packages/twisted/scripts/trial.py", line 272, in parseArgs
    self['tests'].extend(args)
AttributeError: 'set' object has no attribute 'extend'

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10 failed. Below is the output from the failed tests.

*** Running DBus test suite ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 40, in <module>
    main()
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 274, in main
    options.parseOptions()
  File "/usr/lib/python2.7/dist-packages/twisted/python/usage.py", line 272, in parseOptions
    self.parseArgs(*args)
  File "/usr/lib/python2.7/dist-packages/twisted/scripts/trial.py", line 272, in parseArgs
    self['tests'].extend(args)
AttributeError: 'set' object has no attribute 'extend'

[lp:~dobey/ubuntuone-control-panel/update-13-10]

404. By dobey on 2013-07-09

[Rodney Dawes]

    Don't import APP_NAME from ubuntuone.clientdefs. Get it from SSO now.

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-12-11 19:04:12 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2013-07-03 20:58:26 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011-2013 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
@@ -18,9 +18,7 @@
 
 import os
 
-# pylint: disable=W0611
-from ubuntuone.clientdefs import APP_NAME
-# pylint: enable=W0611
+from ubuntu_sso.constants import APP_NAME
 
 from ubuntu_sso.utils.translation import get_gettext