Merge lp:~dobey/ubuntu-sso-client/update-4-0 into lp:ubuntu-sso-client/stable-4-0

[dobey]

[Mike McCracken]

    - Delay importing twisted.internet.reactor to avoid creating default reactor when we need qt4reactor. (LP: #1017672)
    - Correctly bring main sso client window to the front on OS X. (LP: #1012837)
    - Fixes bug with loading incorrect plug-ins caused by ignoring qt.conf. (LP: #1010102)

[Alejandro Cura]

    - Account for g_variant_print type annotations (LP: #1007109).

[Brian Curtin]

    - Move from iteritems/itervalues to items/values for Python 3 support.
    - Use Python 3 style exception handling syntax.

[Rodney Dawes]

    - Remove the xdg_base_directory module as it duplicates dirspec now.
    - Disable the color validation for warning labels due to new GTK+ breaking it.
    - Ensure we are using strict ssl with the system ca-certificates.crt file.
    - Trap DBusException when getting the SessionBus, and add a test case for it.

[Manuel de la Pena]

    - Changed tests so that they use u1-dev-tools better and do not get blocked in the clean up (LP: #1009071).

[Natalia Bidart]

    - Added a little more logging to the webclient when doing REST calls.

[Roberto Alsina]

    - Remove back buttons in signin/signup pages (Fixes LP: #1009107).

[Roberto Alsina (ralsina)]

+1 looks good

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Approve, 1 Pending.

[Alejandro J. Cura (alecu)]

+1 looks just like trunk

review: Approve

[lp:~dobey/ubuntu-sso-client/update-4-0]

960. By Brian Curtin on 2012-06-27

[Mike McCracken]

    - Delay importing twisted.internet.reactor to avoid creating default reactor when we need qt4reactor. (LP: #1017672)
    - Correctly bring main sso client window to the front on OS X. (LP: #1012837)
    - Fixes bug with loading incorrect plug-ins caused by ignoring qt.conf. (LP: #1010102)

[Alejandro Cura]

    - Account for g_variant_print type annotations (LP: #1007109).

[Brian Curtin]

    - Move from iteritems/itervalues to items/values for Python 3 support.
    - Use Python 3 style exception handling syntax.

[Rodney Dawes]

    - Remove the xdg_base_directory module as it duplicates dirspec now.
    - Disable the color validation for warning labels due to new GTK+ breaking it.
    - Ensure we are using strict ssl with the system ca-certificates.crt file.
    - Trap DBusException when getting the SessionBus, and add a test case for it.

[Manuel de la Pena]

    - Changed tests so that they use u1-dev-tools better and do not get blocked in the clean up (LP: #1009071).

[Natalia Bidart]

    - Added a little more logging to the webclient when doing REST calls.

[Roberto Alsina]

    - Remove back buttons in signin/signup pages (Fixes LP: #1009107).

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2012-05-18 14:25:49 +0000
+++ bin/ubuntu-sso-login	2012-06-27 15:30:29 +0000
@@ -57,7 +57,7 @@
     # need to create the QApplication before installing the reactor
     if os.environ.get('TESTABILITY', False):
         sys.argv.append('-testability')
-    QtGui.QApplication(sys.argv)
+    app = QtGui.QApplication(sys.argv)
 
     # pylint: disable=F0401
     import qt4reactor

=== modified file 'setup.py'
--- setup.py	2012-06-05 19:55:04 +0000
+++ setup.py	2012-06-27 15:30:29 +0000
@@ -301,8 +301,8 @@
     author='Natalia Bidart',
     author_email='[e-mail]',
     description='Ubuntu Single Sign-On client',
-    long_description='Desktop service to allow applications to sign in' \
-        'to Ubuntu services via SSO',
+    long_description=('Desktop service to allow applications to sign in'
+                      'to Ubuntu services via SSO'),
     url='https://launchpad.net/ubuntu-sso-client',
     extra_path='ubuntu-sso-client',
     data_files=data_files,
@@ -325,8 +325,6 @@
         'ubuntu_sso.utils.runner.tests',
         'ubuntu_sso.utils.webclient',
         'ubuntu_sso.utils.webclient.tests',
-        'ubuntu_sso.xdg_base_directory',
-        'ubuntu_sso.xdg_base_directory.tests',
     ],
     cmdclass=cmdclass,
     **extra)

=== modified file 'ubuntu_sso/account.py'
--- ubuntu_sso/account.py	2012-05-29 16:56:45 +0000
+++ ubuntu_sso/account.py	2012-06-27 15:30:29 +0000
@@ -110,7 +110,7 @@
     def _format_webservice_errors(self, errdict):
         """Turn each list of strings in the errdict into a LF separated str."""
         result = {}
-        for key, val in errdict.iteritems():
+        for key, val in errdict.items():
             # workaround until bug #624955 is solved
             if isinstance(val, basestring):
                 result[key] = val
@@ -197,7 +197,7 @@
         finally:
             restful_client.shutdown()
 
-        logger.debug('login: authentication successful! consumer_key: %r, ' \
+        logger.debug('login: authentication successful! consumer_key: %r, '
                      'token_name: %r', credentials['consumer_key'], token_name)
         defer.returnValue(credentials)
 
@@ -212,7 +212,7 @@
         finally:
             restful_client.shutdown()
         key = 'preferred_email'
-        result = key in me_info and me_info[key] != None
+        result = key in me_info and me_info[key] is not None
 
         logger.info('is_validated: consumer_key: %r, result: %r.',
                     token['consumer_key'], result)
@@ -249,7 +249,7 @@
         try:
             operation = u"registration.request_password_reset_token"
             result = yield restful_client.restcall(operation, email=email)
-        except WebClientError, e:
+        except WebClientError as e:
             logger.exception('request_password_reset_token failed with:')
             raise ResetPasswordTokenError(e[1].split('\n')[0])
         finally:
@@ -275,7 +275,7 @@
                                         u"registration.set_new_password",
                                         email=email, token=token,
                                         new_password=new_password)
-        except WebClientError, e:
+        except WebClientError as e:
             logger.exception('set_new_password failed with:')
             raise NewPasswordError(e[1].split('\n')[0])
         finally:

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2012-04-11 16:38:28 +0000
+++ ubuntu_sso/gtk/gui.py	2012-06-27 15:30:29 +0000
@@ -109,6 +109,12 @@
 LARGE_MARKUP = u'<span size="x-large">%s</span>'
 
 
+# SSL properties and certs location
+STRICT_SSL_PROP = 'ssl-strict'
+CERTS_FILE_PROP = 'ssl-ca-file'
+CA_CERT_FILE = '/etc/ssl/certs/ca-certificates.crt'
+
+
 def log_call(f):
     """Decorator to log call funtions."""
 
@@ -356,7 +362,7 @@
             if app_name == self.app_name:
                 result = f(app_name, *args, **kwargs)
             else:
-                logger.info('%s: ignoring call since received app_name '\
+                logger.info('%s: ignoring call since received app_name '
                             '%r (expected %r)',
                             f.__name__, app_name, self.app_name)
             return result
@@ -365,7 +371,7 @@
 
     def _setup_signals(self):
         """Bind signals to callbacks to be able to test the pages."""
-        for signal, method in self._signals.iteritems():
+        for signal, method in self._signals.items():
             actual = self._signals_receivers.get(signal)
             if actual is not None:
                 msg = 'Signal %r is already connected with %r.'
@@ -703,7 +709,7 @@
         if os.path.exists(self._captcha_filename):
             os.remove(self._captcha_filename)
 
-        for signal, match in self._signals_receivers.iteritems():
+        for signal, match in self._signals_receivers.items():
             self.backend.disconnect_from_signal(signal, match)
 
         # hide the main window
@@ -790,7 +796,7 @@
         self.user_email = email1
         self.user_password = password1
 
-        logger.info('Calling register_user with email %r, password <hidden>,' \
+        logger.info('Calling register_user with email %r, password <hidden>,'
                     ' name %r, captcha_id %r and captcha_solution %r.', email1,
                     name, self._captcha_id, captcha_solution)
 
@@ -943,7 +949,7 @@
             return
 
         email = self.reset_email_entry.get_text()
-        logger.info('Calling set_new_password with email %r, token %r and ' \
+        logger.info('Calling set_new_password with email %r, token %r and '
                     'new password: <hidden>.', email, token)
         f = self.backend.set_new_password
         error_handler = partial(self._handle_error, f,
@@ -953,11 +959,23 @@
 
         self._set_current_page(self.processing_vbox)
 
+    def _webkit_init_ssl(self):
+        """Set the WebKit ssl strictness."""
+        # delay the import of webkit to be able to build without it
+        from gi.repository import WebKit  # pylint: disable=E0611
+
+        # Set the Soup session to be strict and use system CA certs
+        session = WebKit.get_default_session()
+        session.set_property(STRICT_SSL_PROP, True)
+        session.set_property(CERTS_FILE_PROP, CA_CERT_FILE)
+
     def _add_webkit_browser(self):
         """Add the webkit browser for the t&c."""
         # delay the import of webkit to be able to build without it
         from gi.repository import WebKit  # pylint: disable=E0611
 
+        self._webkit_init_ssl()
+
         browser = WebKit.WebView()
 
         browser.connect('notify::load-status',

=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2012-04-11 16:38:28 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2012-06-27 15:30:29 +0000
@@ -168,6 +168,7 @@
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)
         gui.logger.addHandler(self.memento)
+        self.addCleanup(gui.logger.removeHandler, self.memento)
 
     def _set_called(self, *args, **kwargs):
         """Set _called to True."""
@@ -446,9 +447,10 @@
         self.assertEqual(actual, message)
 
         # content color is correct
-        expected = gui.WARNING_TEXT_COLOR
-        actual = label.get_style().fg[Gtk.StateFlags.NORMAL]
-        self.assert_color_equal(expected, actual)
+        # FIXME - New GTK+ 3.5 breaks this check - see bug #1014772
+        # expected = gui.WARNING_TEXT_COLOR
+        # actual = label.get_style().fg[Gtk.StateFlags.NORMAL]
+        # self.assert_color_equal(expected, actual)
 
     def assert_correct_entry_warning(self, entry, message):
         """Check that a warning is shown displaying 'message'."""
@@ -911,6 +913,7 @@
     def setUp(self):
         yield super(TermsAndConditionsBrowserTestCase, self).setUp()
         self.patch(WebKit, 'WebView', FakedEmbeddedBrowser)
+        self.patch(self.ui, '_webkit_init_ssl', self._set_called)
 
         self.ui.tc_button.clicked()
         self.addCleanup(self.ui.tc_browser_vbox.hide)
@@ -919,6 +922,12 @@
         assert len(children) == 1
         self.browser = children[0]
 
+    def test_ssl_validation(self):
+        """The browser is set to validate SSL."""
+        self.assertEqual(self._called, ((), {}),
+                         '_webkit_init_ssl should be called when creating a '
+                         'webkit browser.')
+
     def test_tc_browser_is_created_when_tc_page_is_shown(self):
         """The browser is created when the TC button is clicked."""
         self.ui.on_tc_browser_notify_load_status(self.browser)
@@ -1983,7 +1992,7 @@
         """Callbacks are connected to signals of interest."""
         msg1 = 'callback %r for signal %r must be added to the backend.'
         msg2 = 'callback %r for signal %r must be added to the ui log.'
-        for signal, method in self.ui._signals.iteritems():
+        for signal, method in self.ui._signals.items():
             actual = self.ui.backend.callbacks.get(signal)
             self.assertEqual([method], actual, msg1 % (method, signal))
             actual = self.ui._signals_receivers.get(signal)
@@ -1992,7 +2001,7 @@
     def test_callbacks_only_log_when_app_name_doesnt_match(self):
         """Callbacks do nothing but logging when app_name doesn't match."""
         mismatch_app_name = self.ui.app_name * 2
-        for method in self.ui._signals.itervalues():
+        for method in self.ui._signals.values():
             msgs = ('ignoring', method.__name__, repr(mismatch_app_name))
             method(mismatch_app_name, 'dummy')
             self.assertTrue(self.memento.check(logging.INFO, *msgs))

=== modified file 'ubuntu_sso/keyring/tests/test_linux.py'
--- ubuntu_sso/keyring/tests/test_linux.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/keyring/tests/test_linux.py	2012-06-27 15:30:29 +0000
@@ -137,7 +137,7 @@
 
     def get_mock_service(self):
         """Create only one instance of the mock service per test."""
-        if self.mock_service == None:
+        if self.mock_service is None:
             self.mock_service = MockSecretService()
         return self.mock_service
 

=== modified file 'ubuntu_sso/logger.py'
--- ubuntu_sso/logger.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/logger.py	2012-06-27 15:30:29 +0000
@@ -37,11 +37,11 @@
 import os
 import sys
 
+from dirspec.basedir import xdg_cache_home
+from dirspec.utils import unicode_path
 from functools import wraps
 from logging.handlers import RotatingFileHandler
 
-from ubuntu_sso.xdg_base_directory import unicode_path, xdg_cache_home
-
 LOGFOLDER = os.path.join(xdg_cache_home, 'sso')
 # create log folder if it doesn't exists
 if not os.path.exists(unicode_path(LOGFOLDER)):

=== modified file 'ubuntu_sso/main/__init__.py'
--- ubuntu_sso/main/__init__.py	2012-05-21 14:28:14 +0000
+++ ubuntu_sso/main/__init__.py	2012-06-27 15:30:29 +0000
@@ -348,7 +348,7 @@
 
     def _parse_args(self, args):
         """Retrieve values from the generic param 'args'."""
-        result = dict(i for i in args.iteritems() if i[0] in self.valid_keys)
+        result = dict(i for i in args.items() if i[0] in self.valid_keys)
         result[WINDOW_ID_KEY] = int(args.get(WINDOW_ID_KEY, 0))
         return result
 

=== modified file 'ubuntu_sso/main/linux.py'
--- ubuntu_sso/main/linux.py	2012-04-10 10:43:48 +0000
+++ ubuntu_sso/main/linux.py	2012-06-27 15:30:29 +0000
@@ -342,10 +342,15 @@
 
     def __init__(self, root):
         self.root = root
-        self.bus = dbus.SessionBus()
         self.sso_login = None
         self.cred_manager = None
 
+        try:
+            self.bus = dbus.SessionBus()
+        except dbus.service.DBusException as e:
+            logger.exception(e)
+            shutdown_func()
+
     def start(self):
         """Start listening, nothing async to be done in this platform."""
         # Register DBus service for making sure we run only one instance

=== added file 'ubuntu_sso/main/tests/test_linux.py'
--- ubuntu_sso/main/tests/test_linux.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/main/tests/test_linux.py	2012-06-27 15:30:29 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+#
+# 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.
+"""Tests for the main SSO Linux client code."""
+
+# pylint: disable=C0103
+do_tests = False
+try:
+    import dbus
+    import dbus.service
+    from ubuntu_sso.main import linux as main
+    do_tests = True
+except ImportError:
+    do_tests = False
+# pylint enable=C0103
+
+from ubuntuone.devtools.testcases import BaseTestCase, skipIf
+
+
+@skipIf(not do_tests, 'Tests only work with DBus and linux imports.')
+class LinuxProxyTestCase(BaseTestCase):
+    """Test some Linux specific cases."""
+
+    def test_dbus_missing_exists_clean(self):
+        """Test that dbus-daemon not being available gives us a clean exit."""
+        def patched(*args, **kwargs):
+            """Method to patch in for testing."""
+            raise dbus.service.DBusException(
+                'org.freedesktop.DBus.Error.NoServer')
+
+        self.patch(dbus, "SessionBus", patched)
+        self.patch(main, "shutdown_func", patched)
+        self.assertRaises(dbus.service.DBusException,
+                          main.UbuntuSSOProxy, None)

=== modified file 'ubuntu_sso/networkstate/darwin.py'
--- ubuntu_sso/networkstate/darwin.py	2012-05-21 14:48:25 +0000
+++ ubuntu_sso/networkstate/darwin.py	2012-06-27 15:30:29 +0000
@@ -126,7 +126,7 @@
     CFRelease(target)
 
     if not ok:
-        logger.error("Error getting reachability status of '%s'" % \
+        logger.error("Error getting reachability status of '%s'" %
                      HOSTNAME_TO_CHECK)
         raise NetworkFailException()
 
@@ -298,6 +298,6 @@
     """
     try:
         return defer.succeed(check_connected_state())
-    except Exception, e:                # pylint: disable=W0703
+    except Exception as e:                # pylint: disable=W0703
         logger.exception("Exception calling check_connected_state:")
         return defer.fail(NetworkFailException(e))

=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2012-05-24 04:20:08 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-06-27 15:30:29 +0000
@@ -79,7 +79,7 @@
             # the user has connected in some other way
             self.call_result_cb(ONLINE)
         else:
-            logger.error("Error contacting NetworkManager: %s" % \
+            logger.error("Error contacting NetworkManager: %s" %
                              str(error))
             self.call_result_cb(UNKNOWN)
 
@@ -107,7 +107,7 @@
             nm_proxy.Get(NM_DBUS_INTERFACE, "State",
                          reply_handler=self.got_state,
                          error_handler=self.got_error)
-        except Exception, e:  # pylint: disable=W0703
+        except Exception as e:  # pylint: disable=W0703
             self.got_error(e)
 
 
@@ -127,7 +127,7 @@
     try:
         network = NetworkManagerState(got_state)
         network.find_online_state()
-    except Exception, e:
+    except Exception as e:
         logger.exception('is_machine_connected failed with:')
         d.errback(NetworkFailException(e))
     # pylint: enable=W0702, W0703

=== modified file 'ubuntu_sso/networkstate/windows.py'
--- ubuntu_sso/networkstate/windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/networkstate/windows.py	2012-06-27 15:30:29 +0000
@@ -184,7 +184,7 @@
         flags = DWORD()
         connected = wininet.InternetGetConnectedState(byref(flags), None)
         return defer.succeed(connected == 1)
-    except Exception, e:
+    except Exception as e:
         logger.exception('is_machine_connected failed with:')
         return defer.fail(NetworkFailException(e))
     # pylint: enable=W0703, W0702

=== modified file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	2012-04-23 13:32:52 +0000
+++ ubuntu_sso/qt/__init__.py	2012-06-27 15:30:29 +0000
@@ -75,7 +75,7 @@
             if 'errtype' in errordict:
                 del errordict['errtype']
             result = '\n'.join(
-                [('%s: %s' % (k, v)) for k, v in errordict.iteritems()])
+                [('%s: %s' % (k, v)) for k, v in errordict.items()])
     else:
         result = GENERIC_BACKEND_ERROR
         logger.error('build_general_error_message with unknown error: %r',

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-06-27 15:30:29 +0000
@@ -97,9 +97,7 @@
         self.setButtonText(QtGui.QWizard.CancelButton, CANCEL_BUTTON)
         # Layout without custom button 1,
         # without finish button
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch])
+        self.wizard().setButtonLayout([])
 
         # Set sign_in_button as default when the page is shown.
         self.ui.sign_in_button.setDefault(True)

=== modified file 'ubuntu_sso/qt/main/__init__.py'
--- ubuntu_sso/qt/main/__init__.py	2012-05-09 18:00:22 +0000
+++ ubuntu_sso/qt/main/__init__.py	2012-06-27 15:30:29 +0000
@@ -80,5 +80,7 @@
                     ui.size(), app.desktop().availableGeometry())
     ui.setGeometry(style)
     ui.show()
+    if sys.platform == 'darwin':
+        ui.raise_()
 
     source.main_start(app)

=== modified file 'ubuntu_sso/qt/main/tests/test_main.py'
--- ubuntu_sso/qt/main/tests/test_main.py	2012-05-09 17:48:32 +0000
+++ ubuntu_sso/qt/main/tests/test_main.py	2012-06-27 15:30:29 +0000
@@ -53,6 +53,7 @@
         """Fake setGeometry."""
 
     show = setGeometry
+    raise_ = lambda self: None
 
 
 class FakeDesktop(object):

=== modified file 'ubuntu_sso/qt/proxy_dialog.py'
--- ubuntu_sso/qt/proxy_dialog.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/proxy_dialog.py	2012-06-27 15:30:29 +0000
@@ -116,7 +116,7 @@
         try:
             logger.debug('Save credentials as for domain %s.', self.domain)
             yield self.keyring.set_credentials(self.domain, creds)
-        except Exception, e:
+        except Exception as e:
             logger.exception('Could not set credentials:')
             self.done(EXCEPTION_RAISED)
         logger.debug('Stored creds')

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-05-01 12:48:42 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-06-27 15:30:29 +0000
@@ -154,7 +154,6 @@
 
         # Button setup
         self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.CustomButton3])
 
@@ -246,8 +245,8 @@
                                                  common.NORMAL))
 
         self.ui.refresh_label.linkActivated.connect(self.hide_error)
-        self.ui.refresh_label.linkActivated.connect(lambda url: \
-                                          self._refresh_captcha())
+        self.ui.refresh_label.linkActivated.connect(
+            lambda url: self._refresh_captcha())
         # We need to check if we enable the button on many signals
         self.ui.name_edit.textEdited.connect(self._enable_setup_button)
         self.ui.email_edit.textEdited.connect(self._enable_setup_button)

=== modified file 'ubuntu_sso/qt/sso_wizard_page.py'
--- ubuntu_sso/qt/sso_wizard_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/sso_wizard_page.py	2012-06-27 15:30:29 +0000
@@ -253,7 +253,7 @@
             if app_name == self.app_name:
                 result = f(app_name, *args, **kwargs)
             else:
-                logger.info('%s: ignoring call since received app_name '\
+                logger.info('%s: ignoring call since received app_name '
                             '"%s" (expected "%s")',
                             f.__name__, app_name, self.app_name)
             return result
@@ -262,7 +262,7 @@
 
     def _setup_signals(self):
         """Bind signals to callbacks to be able to test the pages."""
-        for signal, method in self._signals.iteritems():
+        for signal, method in self._signals.items():
             actual = self._signals_receivers.get(signal)
             if actual is not None:
                 msg = 'Signal %r is already connected with %r.'

=== modified file 'ubuntu_sso/qt/tests/test_arrow.py'
--- ubuntu_sso/qt/tests/test_arrow.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_arrow.py	2012-06-27 15:30:29 +0000
@@ -96,7 +96,7 @@
         arrow = QArrow(QArrow.RIGHT)
         self.patch(arrow, 'style', self.style)
 
-        for key, value in directions_map.iteritems():
+        for key, value in directions_map.items():
             self.style.called = []
             arrow.direction = key
             arrow.paintEvent(None)

=== modified file 'ubuntu_sso/qt/tests/test_common.py'
--- ubuntu_sso/qt/tests/test_common.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_common.py	2012-06-27 15:30:29 +0000
@@ -350,7 +350,7 @@
         result = build_general_error_message(err_dict)
 
         expected = '\n'.join(
-            [('%s: %s' % (k, v)) for k, v in err_dict.iteritems()])
+            [('%s: %s' % (k, v)) for k, v in err_dict.items()])
         self.assertEqual(result, expected)
 
     def test_with_random_keys_with_errtype(self):
@@ -362,8 +362,8 @@
         result = build_general_error_message(err_dict)
 
         expected = '\n'.join(
-            [('%s: %s' % (k, v)) \
-            for k, v in {'my_bad': error, 'odd_error': error2}.iteritems()])
+            [('%s: %s' % (k, v))
+            for k, v in {'my_bad': error, 'odd_error': error2}.items()])
         self.assertEqual(result, expected)
 
     def test_with_not_dict(self):

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-06-27 15:30:29 +0000
@@ -59,7 +59,7 @@
         self.assertEqual(wizard.buttons_text[QtGui.QWizard.CancelButton],
             "Cancel")
         self.assertIn(('setButtonLayout',
-            (([QtGui.QWizard.BackButton, QtGui.QWizard.Stretch],), {})),
+            (([],), {})),
             wizard.called)
         self.assertTrue(button.properties['default'])
         self.assertFalse(button.isEnabled())

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-06-27 15:30:29 +0000
@@ -207,8 +207,7 @@
         self.ui.initializePage()
 
         # set up account button
-        expected = [QtGui.QWizard.BackButton, QtGui.QWizard.Stretch,
-                    QtGui.QWizard.CustomButton3]
+        expected = [QtGui.QWizard.Stretch, QtGui.QWizard.CustomButton3]
         self.assertIn(('setButtonLayout', ((expected,), {})),
                        self.ui.wizard().called)
         self.assertEqual(gui.SET_UP_ACCOUNT_BUTTON,

=== modified file 'ubuntu_sso/tests/test_account.py'
--- ubuntu_sso/tests/test_account.py	2012-05-29 16:58:30 +0000
+++ ubuntu_sso/tests/test_account.py	2012-06-27 15:30:29 +0000
@@ -230,7 +230,7 @@
 
     def verify_frc_shutdown(self):
         """Verify that the FakeRestfulClient was stopped."""
-        assert self.frc.started == False, "Restfulclient must be shut down."
+        assert self.frc.started is False, "Restfulclient must be shut down."
 
     @defer.inlineCallbacks
     def test_generate_captcha(self):

=== modified file 'ubuntu_sso/tests/test_credentials.py'
--- ubuntu_sso/tests/test_credentials.py	2012-05-04 18:48:54 +0000
+++ ubuntu_sso/tests/test_credentials.py	2012-06-27 15:30:29 +0000
@@ -122,6 +122,7 @@
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)
         credentials.logger.addHandler(self.memento)
+        self.addCleanup(credentials.logger.removeHandler, self.memento)
 
         self.patch(credentials, 'get_bin_dir', lambda: self.bin_dir)
 
@@ -147,7 +148,7 @@
 
     def test_creation_parameters_are_stored(self):
         """Creation parameters are stored."""
-        for key, value in KWARGS.iteritems():
+        for key, value in KWARGS.items():
             self.assertEqual(getattr(self.obj, key), value)
 
     def test_tc_url_defaults_to_none(self):

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-04-25 14:17:16 +0000
+++ ubuntu_sso/utils/__init__.py	2012-06-27 15:30:29 +0000
@@ -165,7 +165,7 @@
                 logger.debug("Calculated server-local time skew: %r",
                              self.skew)
             #pylint: disable=W0703
-            except Exception, server_error:
+            except Exception as server_error:
                 logger.debug("Error while verifying the server time skew: %r",
                              server_error)
                 self.next_check = local_time + self.ERROR_INTERVAL

=== modified file 'ubuntu_sso/utils/ipc.py'
--- ubuntu_sso/utils/ipc.py	2012-05-16 09:48:55 +0000
+++ ubuntu_sso/utils/ipc.py	2012-06-27 15:30:29 +0000
@@ -132,7 +132,7 @@
 
     def remote_unregister_to_signals(self, client):
         """Allow a client to unregister from the signal."""
-        for connected_clients in self.clients_per_signal.itervalues():
+        for connected_clients in self.clients_per_signal.values():
             if client in connected_clients:
                 connected_clients.remove(client)
 
@@ -198,7 +198,7 @@
         super(BaseService, self).__init__()
         self.factory = None
         self.listener = None
-        for name, service_class in self.services.iteritems():
+        for name, service_class in self.services.items():
             service = service_class(*a, **kw)
             setattr(self, name, service)
             setattr(self, 'remote_get_%s' % name,
@@ -344,7 +344,7 @@
         """Request all the diff remote objects used for the communication."""
         logger.debug('Requesting remote objects (%r) for %s',
                      self.clients.keys(), self.__class__.__name__)
-        for name, client_class in self.clients.iteritems():
+        for name, client_class in self.clients.items():
             remote = yield root.callRemote('get_%s' % name)
             setattr(self, name, client_class(remote))
 

=== modified file 'ubuntu_sso/utils/runner/glib.py'
--- ubuntu_sso/utils/runner/glib.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/glib.py	2012-06-27 15:30:29 +0000
@@ -89,7 +89,7 @@
 
     try:
         pid, _, _, _ = GLib.spawn_async(argv=bytes_args, flags=flags)
-    except GLib.GError, e:
+    except GLib.GError as e:
         handle_error(e)
     else:
         logger.debug('Spawning the program %r with the glib mainloop '

=== modified file 'ubuntu_sso/utils/runner/tests/test_glib.py'
--- ubuntu_sso/utils/runner/tests/test_glib.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tests/test_glib.py	2012-06-27 15:30:29 +0000
@@ -87,7 +87,7 @@
 
         try:
             subprocess.call(argv)
-        except Exception, e:
+        except Exception as e:
             exc = GLib.GError()
             exc.message = str(e)
             exc.code = 42

=== modified file 'ubuntu_sso/utils/runner/tests/test_qt.py'
--- ubuntu_sso/utils/runner/tests/test_qt.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tests/test_qt.py	2012-06-27 15:30:29 +0000
@@ -86,12 +86,12 @@
 
             try:
                 subprocess.call(bytes_args)
-            except OSError, e:
+            except OSError as e:
                 if e.errno == 2:
                     self.error.emit(self.FailedToStart)
                 else:
                     self.error.emit(e)
-            except Exception, e:
+            except Exception as e:
                 self.error.emit(e)
             else:
                 self.finished.emit(self._status_code)

=== modified file 'ubuntu_sso/utils/runner/tx.py'
--- ubuntu_sso/utils/runner/tx.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tx.py	2012-06-27 15:30:29 +0000
@@ -102,9 +102,9 @@
 
     try:
         d = utils.getProcessOutputAndValue(program, bytes_args, env=os.environ)
-    except OSError, e:
+    except OSError as e:
         error_handler(msg=e, failed_to_start=True)
-    except Exception, e:
+    except Exception as e:
         error_handler(msg=e, failed_to_start=False)
     else:
         logger.debug('Spawning the program %r with the twisted reactor '

=== modified file 'ubuntu_sso/utils/tcpactivation.py'
--- ubuntu_sso/utils/tcpactivation.py	2012-05-03 11:42:55 +0000
+++ ubuntu_sso/utils/tcpactivation.py	2012-06-27 15:30:29 +0000
@@ -30,7 +30,7 @@
 
 import subprocess
 
-from twisted.internet import defer, error, protocol, reactor
+from twisted.internet import defer, error, protocol
 from twisted.internet.endpoints import clientFromString
 
 LOCALHOST = "127.0.0.1"
@@ -43,6 +43,7 @@
 
 def async_sleep(delay):
     """Fire the returned deferred after some specified delay."""
+    from twisted.internet import reactor
     d = defer.Deferred()
     # pylint: disable=E1101
     reactor.callLater(delay, d.callback, None)
@@ -87,11 +88,13 @@
 
     def clientConnectionLost(self, connector, reason):
         """The connection was lost."""
+        protocol.ClientFactory.clientConnectionLost(self, connector, reason)
         if not self.d.called:
             self.d.callback(False)
 
     def clientConnectionFailed(self, connector, reason):
         """The connection failed."""
+        protocol.ClientFactory.clientConnectionFailed(self, connector, reason)
         if not self.d.called:
             self.d.callback(False)
 
@@ -116,6 +119,7 @@
     @defer.inlineCallbacks
     def is_already_running(self):
         """Check if the instance is already running."""
+        from twisted.internet import reactor
         factory = PortDetectFactory()
         client = clientFromString(reactor, self.config.description.client)
         try:

=== modified file 'ubuntu_sso/utils/tests/test_common.py'
--- ubuntu_sso/utils/tests/test_common.py	2012-04-17 20:27:21 +0000
+++ ubuntu_sso/utils/tests/test_common.py	2012-06-27 15:30:29 +0000
@@ -106,6 +106,7 @@
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)
         utils.logger.addHandler(self.memento)
+        self.addCleanup(utils.logger.removeHandler, self.memento)
 
         self.get_dir = getattr(utils, self.DIR_GETTER)
 

=== modified file 'ubuntu_sso/utils/tests/test_tcpactivation.py'
--- ubuntu_sso/utils/tests/test_tcpactivation.py	2012-05-03 12:36:08 +0000
+++ ubuntu_sso/utils/tests/test_tcpactivation.py	2012-06-27 15:30:29 +0000
@@ -35,7 +35,8 @@
 # this test module access a few protected members (starting with _)
 # pylint: disable=W0212
 
-from twisted.internet import defer, protocol, reactor, task
+import twisted.internet
+from twisted.internet import defer, protocol, task
 from twisted.trial.unittest import TestCase
 
 # pylint: disable=W0611
@@ -72,7 +73,7 @@
         self.transport.write(data)
 
 
-class FakeServerFactory(protocol.Factory):
+class FakeServerFactory(protocol.ServerFactory):
     """A factory for the test server."""
 
     protocol = FakeServerProtocol
@@ -97,37 +98,6 @@
         self.client = client_description
 
 
-class FakeConnectedClient(object):
-    """Fake class use to patch connections."""
-
-    def __init__(self, testcase, inner):
-        """Create a new instance."""
-        self.testcase = testcase
-        self.inner = inner
-
-    @defer.inlineCallbacks
-    def connect(self, factory):
-        """Connect using the given factory."""
-        # we need to get the class of the factory and patch it
-        yield self.testcase.connect_client(PortDetectFactory)
-        self.inner.factory = self.testcase.client_factory
-        defer.returnValue(self.testcase.connector)
-
-
-class WrapperFactory(object):
-    """Wrapps a factory so that it can be replaced in a test."""
-
-    def __init__(self, factory):
-        self.factory = None
-
-    def __call__(self, *args, **kwargs):
-        return self
-
-    def is_listening(self):
-        """Return if the service is listening."""
-        return self.factory.is_listening()
-
-
 class AsyncSleepTestCase(TestCase):
     """Tests for the async_sleep function."""
 
@@ -137,7 +107,7 @@
         yield super(AsyncSleepTestCase, self).setUp()
         self.test_timeout = 5.0
         self.clock = task.Clock()
-        self.patch(tcpactivation, "reactor", self.clock)
+        self.patch(twisted.internet, "reactor", self.clock)
         self.d = tcpactivation.async_sleep(self.test_timeout)
 
     def test_async_sleep_not_fired_immediately(self):
@@ -231,7 +201,7 @@
         self.assertEqual(config.description, SAMPLE_CLIENT_DESCRIPTION)
 
 
-class ActivationDetectorTestCase(ServerTestCase):
+class ActivationDetectorTestCase(TestCase):
     """Tests for the ActivationDetector class."""
 
     timeoue = 3
@@ -270,15 +240,29 @@
     @defer.inlineCallbacks
     def test_is_already_running(self):
         """The is_already_running method returns True if already started."""
-        inner = WrapperFactory(None)
-
-        self.patch(tcpactivation, 'PortDetectFactory', inner)
-        client = FakeConnectedClient(self, inner)
+        server = self.get_server()
+        self.addCleanup(server.clean_up)
+
+        class TestConnect(object):
+            """A fake connection object."""
+
+            # pylint: disable=E0213
+            @defer.inlineCallbacks
+            def connect(my_self, factory):
+                """A fake connection."""
+
+                connected_factory = yield server.connect_client(
+                        PortDetectFactory)
+                self.patch(factory, 'is_listening',
+                        connected_factory.is_listening)
+                defer.returnValue(connected_factory)
+            # pylint: enable=E0213
 
         self.patch(tcpactivation, 'clientFromString',
-                   lambda *args: client)
-
-        yield self.listen_server(FakeServerFactory)
+                lambda *args: TestConnect())
+
+        yield server.listen_server(protocol.ServerFactory)
+
         # pylint: disable=E1101
         ad = ActivationDetector(self.config)
         result = yield ad.is_already_running()
@@ -347,7 +331,7 @@
         """Test the _wait_server_active method."""
         ac = ActivationClient(self.config)
         clock = task.Clock()
-        self.patch(tcpactivation, "reactor", clock)
+        self.patch(twisted.internet, "reactor", clock)
         self.patch(ac, "is_already_running", lambda: defer.succeed(False))
 
         d = ac._wait_server_active()
@@ -363,7 +347,7 @@
         """If the server takes too long to start then timeout."""
         ac = ActivationClient(self.config)
         clock = task.Clock()
-        self.patch(tcpactivation, "reactor", clock)
+        self.patch(twisted.internet, "reactor", clock)
         self.patch(ac, "is_already_running", lambda: defer.succeed(False))
         d = ac._wait_server_active()
         clock.pump([tcpactivation.DELAY_BETWEEN_CHECKS] *
@@ -420,15 +404,28 @@
     @defer.inlineCallbacks
     def test_get_description_fails_if_service_already_started(self):
         """The get_description method fails if service already started."""
-        inner = WrapperFactory(None)
-
-        self.patch(tcpactivation, 'PortDetectFactory', inner)
-        client = FakeConnectedClient(self, inner)
+        server = self.get_server()
+        self.addCleanup(server.clean_up)
+
+        class TestConnect(object):
+            """A fake connection object."""
+
+            # pylint: disable=E0213
+            @defer.inlineCallbacks
+            def connect(my_self, factory):
+                """A fake connection."""
+
+                connected_factory = yield server.connect_client(
+                        PortDetectFactory)
+                self.patch(factory, 'is_listening',
+                        connected_factory.is_listening)
+                defer.returnValue(connected_factory)
+            # pylint: enable=E0213
 
         self.patch(tcpactivation, 'clientFromString',
-                   lambda *args: client)
+                lambda *args: TestConnect())
 
-        yield self.listen_server(FakeServerFactory)
+        yield server.listen_server(protocol.ServerFactory)
 
         ai = ActivationInstance(self.config)
         yield self.assertFailure(ai.get_server_description(),
@@ -438,6 +435,7 @@
 
 def server_test(config):
     """An IRL test of the server."""
+    from twisted.internet import reactor
 
     def got_description(description):
         """The description was found."""
@@ -472,6 +470,7 @@
 
 def client_test(config):
     """An IRL test of the client."""
+    from twisted.internet import reactor
     print "starting the client."
     ac = ActivationClient(config)
     d = ac.get_active_client_description()

=== modified file 'ubuntu_sso/utils/txsecrets.py'
--- ubuntu_sso/utils/txsecrets.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/txsecrets.py	2012-06-27 15:30:29 +0000
@@ -100,7 +100,7 @@
             self.service.OpenSession(ALGORITHM, parameters,
                                      reply_handler=session_opened,
                                      error_handler=d.errback)
-        except dbus.exceptions.DBusException, e:
+        except dbus.exceptions.DBusException as e:
             d.errback(e)
         return d
 

=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2012-04-12 12:07:46 +0000
+++ ubuntu_sso/utils/webclient/common.py	2012-06-27 15:30:29 +0000
@@ -206,7 +206,7 @@
         try:
             creds = yield keyring.get_credentials(str(domain))
             logger.debug('Got credentials from keyring.')
-        except Exception, e:
+        except Exception as e:
             logger.error('Error when retrieving the creds.')
             raise WebClientError('Error when retrieving the creds.', e)
         if creds is not None:
@@ -249,7 +249,7 @@
 
         try:
             return_code = yield self._launch_proxy_creds_dialog(domain, retry)
-        except Exception, e:
+        except Exception as e:
             logger.error('Error when running external ui process.')
             raise WebClientError('Error when running external ui process.', e)
 

=== modified file 'ubuntu_sso/utils/webclient/gsettings.py'
--- ubuntu_sso/utils/webclient/gsettings.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/gsettings.py	2012-06-27 15:30:29 +0000
@@ -30,7 +30,11 @@
 
 import subprocess
 
+from ubuntu_sso.logger import setup_logging
+
+logger = setup_logging("ubuntu_sso.utils.webclient.gsettings")
 GSETTINGS_CMDLINE = "gsettings list-recursively org.gnome.system.proxy"
+CANNOT_PARSE_WARNING = "Cannot parse gsettings value: %r"
 
 
 def parse_proxy_host(hostname):
@@ -80,12 +84,15 @@
             continue
         if value.startswith("'"):
             parsed_value = value[1:-1]
-        elif value.startswith('['):
+        elif value.startswith(('[', '@')):
             parsed_value = value
         elif value in ('true', 'false'):
             parsed_value = (value == 'true')
+        elif value.isdigit():
+            parsed_value = int(value)
         else:
-            parsed_value = int(value)
+            logger.warning(CANNOT_PARSE_WARNING, value)
+            parsed_value = value
         relative_key = (path + "." + key)[base_len:]
         gsettings[relative_key] = parsed_value
     mode = gsettings["mode"]

=== modified file 'ubuntu_sso/utils/webclient/libsoup.py'
--- ubuntu_sso/utils/webclient/libsoup.py	2012-04-12 12:07:46 +0000
+++ ubuntu_sso/utils/webclient/libsoup.py	2012-06-27 15:30:29 +0000
@@ -131,7 +131,7 @@
         d = defer.Deferred()
         message = self.soup.Message.new(method, uri)
 
-        for key, value in headers.iteritems():
+        for key, value in headers.items():
             message.request_headers.append(key, value)
 
         if post_content:

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-04-24 14:05:22 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-06-27 15:30:29 +0000
@@ -158,14 +158,14 @@
         headers = yield self.build_request_headers(uri, method, extra_headers,
                                                    oauth_credentials)
 
-        for key, value in headers.iteritems():
+        for key, value in headers.items():
             request.setRawHeader(key, value)
 
         post_buffer = QBuffer()
         post_buffer.setData(post_content)
         try:
             result = yield self._perform_request(request, method, post_buffer)
-        except ProxyUnauthorizedError, e:
+        except ProxyUnauthorizedError as e:
             app_proxy = QNetworkProxy.applicationProxy()
             proxy_host = app_proxy.hostName() if app_proxy else "proxy server"
             got_creds = yield self.request_proxy_auth_credentials(
@@ -221,7 +221,7 @@
                          QSslCertificate.CountryName: 'country_name',
                          QSslCertificate.StateOrProvinceName: 'state_name'}
         details = {}
-        for info, title in detail_titles.iteritems():
+        for info, title in detail_titles.items():
             details[title] = str(cert.issuerInfo(info))
         return self.format_ssl_details(details)
 

=== modified file 'ubuntu_sso/utils/webclient/restful.py'
--- ubuntu_sso/utils/webclient/restful.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/restful.py	2012-06-27 15:30:29 +0000
@@ -33,8 +33,11 @@
 
 from twisted.internet import defer
 
+from ubuntu_sso.logger import setup_logging
 from ubuntu_sso.utils import webclient
 
+logger = setup_logging("ubuntu_sso.utils.webclient.restful")
+
 POST_HEADERS = {
     "content-type": "application/x-www-form-urlencoded",
 }
@@ -67,11 +70,19 @@
         encoded_args = urllib.urlencode(params)
         iri = self.service_iri + namespace
         creds = self.oauth_credentials
+        logger.debug('Performing REST call to %r.', iri)
         result = yield self.webclient.request(iri, method="POST",
                                               oauth_credentials=creds,
                                               post_content=encoded_args,
                                               extra_headers=POST_HEADERS)
-        defer.returnValue(json.loads(result.content))
+        try:
+            response = json.loads(result.content)
+        except:
+            logger.exception('Can not load json from REST request response '
+                             '(content is %r).', result.content)
+            raise
+        else:
+            defer.returnValue(response)
 
     def shutdown(self):
         """Stop the webclient used by this class."""

=== modified file 'ubuntu_sso/utils/webclient/tests/test_gsettings.py'
--- ubuntu_sso/utils/webclient/tests/test_gsettings.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/tests/test_gsettings.py	2012-06-27 15:30:29 +0000
@@ -28,7 +28,10 @@
 # files in the program, then also delete it here.
 """Test the gsettings parser."""
 
+import logging
+
 from twisted.trial.unittest import TestCase
+from ubuntuone.devtools.handlers import MementoHandler
 
 from ubuntu_sso.utils.webclient import gsettings
 from ubuntu_sso.utils.webclient.tests import (
@@ -91,6 +94,35 @@
         """Test a parser of gsettings."""
         self._assert_parser_anonymous('https')
 
+    def test_gsettings_empty_ignore_hosts(self):
+        """Missing values in the ignore hosts."""
+        troublesome_value = "@as []"
+        template_values = dict(BASE_GSETTINGS_VALUES)
+        template_values["ignore_hosts"] = troublesome_value
+        fake_output = TEMPLATE_GSETTINGS_OUTPUT.format(**template_values)
+        self.patch(gsettings.subprocess, "check_output",
+                   lambda _: fake_output)
+        ps = gsettings.get_proxy_settings()
+        self.assertEqual(ps, {})
+
+    def test_gsettings_cannot_parse(self):
+        """Some weird setting that cannot be parsed is logged with warning."""
+        memento = MementoHandler()
+        memento.setLevel(logging.DEBUG)
+        gsettings.logger.addHandler(memento)
+        self.addCleanup(gsettings.logger.removeHandler, memento)
+
+        troublesome_value = "#bang"
+        template_values = dict(BASE_GSETTINGS_VALUES)
+        template_values["ignore_hosts"] = troublesome_value
+        fake_output = TEMPLATE_GSETTINGS_OUTPUT.format(**template_values)
+        self.patch(gsettings.subprocess, "check_output",
+                   lambda _: fake_output)
+        ps = gsettings.get_proxy_settings()
+        self.assertTrue(memento.check_warning(gsettings.CANNOT_PARSE_WARNING %
+                                              troublesome_value))
+        self.assertEqual(ps, {})
+
     def test_gsettings_parser_http_authenticated(self):
         """Test a parser of gsettings."""
         template_values = dict(BASE_GSETTINGS_VALUES)

=== modified file 'ubuntu_sso/utils/webclient/tests/test_restful.py'
--- ubuntu_sso/utils/webclient/tests/test_restful.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/tests/test_restful.py	2012-06-27 15:30:29 +0000
@@ -28,9 +28,11 @@
 # files in the program, then also delete it here.
 """Tests for the proxy-enabled restful client."""
 
+import logging
 import urlparse
 
 from twisted.internet import defer
+from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import TestCase
 
 from ubuntu_sso.utils.webclient import restful
@@ -184,3 +186,45 @@
         yield rc.restcall(SAMPLE_OPERATION, **SAMPLE_ARGS)
         _, _, kwargs = self.wc.called[0]
         self.assertEqual(kwargs["oauth_credentials"], SAMPLE_OAUTH_CREDS)
+
+
+class LogginTestCase(BaseTestCase):
+    """Ensure that proper debug logging is done."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Initialize this testcase."""
+        yield super(LogginTestCase, self).setUp()
+        self.memento = MementoHandler()
+        restful.logger.addHandler(self.memento)
+        restful.logger.setLevel(logging.DEBUG)
+        self.addCleanup(restful.logger.removeHandler, self.memento)
+
+        self.rc = restful.RestfulClient(SAMPLE_SERVICE_IRI)
+        self.addCleanup(self.rc.shutdown)
+
+    @defer.inlineCallbacks
+    def test_log_rest_call(self):
+        """Check that proper DEBUG is made for every REST call."""
+        yield self.rc.restcall(SAMPLE_OPERATION, **SAMPLE_ARGS)
+
+        expected_msgs = (
+            SAMPLE_SERVICE_IRI + SAMPLE_NAMESPACE,
+        )
+        self.assertTrue(self.memento.check_debug(*expected_msgs))
+
+    @defer.inlineCallbacks
+    def test_log_json_loads_exception(self):
+        """Check that json load errors are properly logged."""
+        invalid_json = 'NOTAVALIDJSON'
+        self.patch(self.wc, 'return_value', invalid_json)
+        yield self.assertFailure(self.rc.restcall(SAMPLE_OPERATION),
+                                 ValueError)
+
+        self.memento.debug = True
+        expected_msgs = (
+            ValueError,
+            'Can not load json from REST request response',
+            invalid_json
+        )
+        self.assertTrue(self.memento.check_exception(*expected_msgs))

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-04-24 14:05:22 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-06-27 15:30:29 +0000
@@ -753,7 +753,7 @@
 
         self.assertEqual(method, "OAuth")
 
-        for k, expected_value in self.expected_params.iteritems():
+        for k, expected_value in self.expected_params.items():
             self.assertIn(k, params)
             if expected_value is not ANY_VALUE:
                 self.assertEqual(params[k], expected_value)
@@ -782,7 +782,7 @@
         self.assert_headers_correct(request.to_header())
         self.assertEqual(request.http_url, self.sample_url)
         if params is not None:
-            for param, value in params.iteritems():
+            for param, value in params.items():
                 self.assertIn(param, request.parameters)
                 actual = request.parameters[param]
                 self.assertEqual(value, actual)

=== modified file 'ubuntu_sso/utils/webclient/timestamp.py'
--- ubuntu_sso/utils/webclient/timestamp.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/timestamp.py	2012-06-27 15:30:29 +0000
@@ -83,7 +83,7 @@
                 logger.debug("Calculated server time skew: %r", self.skew)
             # We just log all exceptions while trying to get the server time
             # pylint: disable=W0703
-            except Exception, e:
+            except Exception as e:
                 logger.debug("Error while verifying server time skew: %r", e)
                 self.next_check = local_time + self.ERROR_INTERVAL
         # delay import, otherwise a default reactor gets installed

=== removed directory 'ubuntu_sso/xdg_base_directory'
=== removed file 'ubuntu_sso/xdg_base_directory/__init__.py'
--- ubuntu_sso/xdg_base_directory/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/xdg_base_directory/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011-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.
-"""XDG multiplatform."""
-
-import os
-import sys
-import warnings
-
-
-def unicode_path(utf8path):
-    """Turn an utf8 path into a unicode path."""
-    return utf8path.decode("utf-8")
-
-
-def native_path(utf8path):
-    """Turn an utf8 path into a path useable in the current encoding."""
-    warnings.warn('native_path will be removed soon', DeprecationWarning)
-    return unicode_path(utf8path)
-
-
-def syncdaemon_path(mbcspath):
-    """Turn a mbcs path in a utf-8 path as CURRENTLY used inside syncdaemon."""
-    warnings.warn('syncdaemon_path will be removed soon', DeprecationWarning)
-    return mbcspath.decode(sys.getfilesystemencoding()).encode("utf-8")
-
-
-# pylint: disable=C0103,F0401,E0611,E1101
-if sys.platform == "win32":
-    from ubuntu_sso.xdg_base_directory import windows
-    source = windows
-    xdg_home = source.home_path
-else:
-    import xdg.BaseDirectory
-    source = xdg.BaseDirectory
-    xdg_home = os.path.expanduser('~')
-
-xdg_cache_home = source.xdg_cache_home
-
-xdg_config_home = source.xdg_config_home
-xdg_config_dirs = source.xdg_config_dirs
-
-xdg_data_home = source.xdg_data_home
-xdg_data_dirs = source.xdg_data_dirs
-
-
-def load_config_paths(*resource):
-    """Iterator of configuration paths.
-
-    Return an iterator which gives each directory named 'resource' in
-    the configuration search path. Information provided by earlier
-    directories should take precedence over later ones (ie, the user's
-    config dir comes first).
-    """
-    resource = os.path.join(*resource)
-    for config_dir in xdg_config_dirs:
-        path = os.path.join(config_dir, resource)
-        # access the file system always with unicode
-        # to properly behave in some operating systems
-        if os.path.exists(unicode_path(path)):
-            yield path
-
-
-def save_config_path(*resource):
-    """Path to save configuration.
-
-    Ensure $XDG_CONFIG_HOME/<resource>/ exists, and return its path.
-    'resource' should normally be the name of your application. Use this
-    when SAVING configuration settings. Use the xdg_config_dirs variable
-    for loading.
-    """
-    resource = os.path.join(*resource)
-    assert not resource.startswith('/')
-    path = os.path.join(xdg_config_home, resource)
-    # access the file system always with unicode
-    # to properly behave in some operating systems
-    if not os.path.isdir(unicode_path(path)):
-        os.makedirs(unicode_path(path), 0700)
-    return path

=== removed directory 'ubuntu_sso/xdg_base_directory/tests'
=== removed file 'ubuntu_sso/xdg_base_directory/tests/__init__.py'
--- ubuntu_sso/xdg_base_directory/tests/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/xdg_base_directory/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# ubuntu_sso - Ubuntu Single Sign On client support for desktop apps
-#
-# Copyright 2009-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.
-"""XDG tests."""

=== removed file 'ubuntu_sso/xdg_base_directory/tests/test_common.py'
--- ubuntu_sso/xdg_base_directory/tests/test_common.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/xdg_base_directory/tests/test_common.py	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Authors: Natalia B. Bidart <[e-mail]>
-#
-# Copyright 2011-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 independent tests for the XDG constants."""
-
-import os
-
-from twisted.trial.unittest import TestCase
-
-from ubuntu_sso import xdg_base_directory
-
-
-class TestBaseDirectory(TestCase):
-    """Tests for the BaseDirectory module."""
-
-    def assert_utf8_bytes(self, value):
-        """Check that 'value' is a bytes sequence encoded with utf-8."""
-        self.assertIsInstance(value, str)
-        try:
-            value.decode('utf-8')
-        except UnicodeDecodeError:
-            self.fail('%r should be a utf8 encoded string.' % value)
-
-    def test_xdg_home_is_utf8_bytes(self):
-        """The returned path is bytes."""
-        actual = xdg_base_directory.xdg_home
-        self.assert_utf8_bytes(actual)
-
-    def test_xdg_cache_home_is_utf8_bytes(self):
-        """The returned path is bytes."""
-        actual = xdg_base_directory.xdg_cache_home
-        self.assert_utf8_bytes(actual)
-
-    def test_xdg_config_home_is_utf8_bytes(self):
-        """The returned path is bytes."""
-        actual = xdg_base_directory.xdg_config_home
-        self.assert_utf8_bytes(actual)
-
-    def test_xdg_config_dirs_are_bytes(self):
-        """The returned path is bytes."""
-        result = xdg_base_directory.xdg_config_dirs
-        for actual in result:
-            self.assert_utf8_bytes(actual)
-
-    def test_xdg_data_home_is_utf8_bytes(self):
-        """The returned path is bytes."""
-        actual = xdg_base_directory.xdg_data_home
-        self.assert_utf8_bytes(actual)
-
-    def test_xdg_data_dirs_are_bytes(self):
-        """The returned path is bytes."""
-        result = xdg_base_directory.xdg_data_dirs
-        for actual in result:
-            self.assert_utf8_bytes(actual)
-
-    def test_load_config_paths_filter(self):
-        """Since those folders don't exist, this should be empty."""
-        self.assertEqual(list(xdg_base_directory.load_config_paths("x")), [])
-
-    def test_save_config_path(self):
-        """The path should end with xdg_config/x (respecting the separator)."""
-        self.patch(os, "makedirs", lambda *args: None)
-        result = xdg_base_directory.save_config_path("x")
-        self.assertEqual(result.split(os.sep)[-2:], ['xdg_config', 'x'])

=== removed file 'ubuntu_sso/xdg_base_directory/tests/test_windows.py'
--- ubuntu_sso/xdg_base_directory/tests/test_windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/xdg_base_directory/tests/test_windows.py	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011-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.
-"""Windows-specific tests for the XDG constants."""
-
-import os
-import sys
-
-from twisted.trial.unittest import TestCase
-
-
-# pylint: disable=E1101, E0611, F0401
-import win32com.shell
-from ubuntu_sso.xdg_base_directory.windows import (
-     get_config_dirs,
-     get_data_dirs,
-     get_env_path,
-     get_special_folders,
-)
-
-
-class FakeShellConModule(object):
-    """Override CSIDL_ constants."""
-
-    CSIDL_PROFILE = 0
-    CSIDL_LOCAL_APPDATA = 1
-    CSIDL_COMMON_APPDATA = 2
-
-
-class FakeShellModule(object):
-
-    """Fake Shell Module."""
-
-    def __init__(self):
-        """Set the proper mapping between CSIDL_ consts."""
-        self.values = {
-            0: u'c:\\path\\to\\users\\home',
-            1: u'c:\\path\\to\\users\\home\\appData\\local',
-            2: u'c:\\programData',
-        }
-
-    # pylint: disable=C0103
-    def SHGetFolderPath(self, dummy0, shellconValue, dummy2, dummy3):
-        """Override SHGetFolderPath functionality."""
-        return self.values[shellconValue]
-    # pylint: enable=C0103
-
-
-class TestBaseDirectoryWindows(TestCase):
-    """Tests for the BaseDirectory module."""
-
-    def test_get_special_folders(self):
-        """Make sure we can import the platform module."""
-
-        shell_module = FakeShellModule()
-        self.patch(win32com.shell, "shell", shell_module)
-        self.patch(win32com.shell, "shellcon", FakeShellConModule())
-        special_folders = get_special_folders()
-        self.assertTrue('Personal' in special_folders)
-        self.assertTrue('Local AppData' in special_folders)
-        self.assertTrue('AppData' in special_folders)
-        self.assertTrue('Common AppData' in special_folders)
-
-        self.assertTrue(special_folders['Personal'] == \
-            shell_module.values[FakeShellConModule.CSIDL_PROFILE])
-        self.assertTrue(special_folders['Local AppData'] == \
-            shell_module.values[FakeShellConModule.CSIDL_LOCAL_APPDATA])
-        self.assertTrue(special_folders['Local AppData'].startswith(
-            special_folders['AppData']))
-        self.assertTrue(special_folders['Common AppData'] == \
-            shell_module.values[FakeShellConModule.CSIDL_COMMON_APPDATA])
-
-        for val in special_folders.itervalues():
-            self.assertIsInstance(val, str)
-            val.decode('utf8')
-        # Should not raise exceptions
-
-    def test_get_data_dirs(self):
-        """Check thet get_data_dirs uses pathsep correctly."""
-        bad_sep = filter(lambda x: x not in os.pathsep, ":;")
-        dir_list = ["A", "B", bad_sep, "C"]
-        self.patch(os, "environ",
-            dict(XDG_DATA_DIRS=os.pathsep.join(
-                dir_list)))
-        dirs = get_data_dirs()
-        self.assertEqual(dirs, dir_list)
-
-    def test_get_config_dirs(self):
-        """Check thet get_data_dirs uses pathsep correctly."""
-        bad_sep = filter(lambda x: x not in os.pathsep, ":;")
-        dir_list = ["A", "B", bad_sep, "C"]
-        self.patch(os, "environ",
-            dict(XDG_CONFIG_DIRS=os.pathsep.join(
-                dir_list)))
-        dirs = get_config_dirs()[1:]
-        self.assertEqual(dirs, dir_list)
-
-    def set_fake_environ(self, key, value):
-        """Set (and restore) a fake environ variable."""
-        if key in os.environ:
-            prev = os.environ[key]
-            self.addCleanup(os.environ.__setitem__, key, prev)
-        else:
-            self.addCleanup(os.environ.__delitem__, key)
-        os.environ[key] = value
-
-    def unset_fake_environ(self, key):
-        """Unset (and restore) a fake environ variable."""
-        if key in os.environ:
-            current_value = os.environ[key]
-            self.addCleanup(os.environ.__setitem__, key, current_value)
-            del(os.environ[key])
-
-    def test_get_env_path_var(self):
-        """Test that get_env_path transforms an env var."""
-        fake_path = u"C:\\Users\\Ñandú"
-        fake_env_var = "FAKE_ENV_VAR"
-
-        mbcs_path = fake_path.encode(sys.getfilesystemencoding())
-        utf8_path = fake_path.encode("utf-8")
-
-        self.set_fake_environ(fake_env_var, mbcs_path)
-        self.assertEqual(get_env_path(fake_env_var, "unexpected"), utf8_path)
-
-    def test_get_env_path_no_var(self):
-        """Test that get_env_path returns the default when env var not set."""
-        fake_path = u"C:\\Users\\Ñandú"
-        fake_env_var = "fake_env_var"
-        default = fake_path.encode(sys.getfilesystemencoding())
-
-        self.unset_fake_environ(fake_env_var)
-        self.assertEqual(get_env_path(fake_env_var, default), default)

=== removed file 'ubuntu_sso/xdg_base_directory/windows.py'
--- ubuntu_sso/xdg_base_directory/windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/xdg_base_directory/windows.py	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011-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.
-"""XDG helpers for windows."""
-
-import os
-import sys
-
-
-# pylint: disable=C0103
-def get_special_folders():
-    """ Routine to grab all the Windows Special Folders locations.
-
-    If successful, returns dictionary
-    of shell folder locations indexed on Windows keyword for each;
-    otherwise, returns an empty dictionary.
-    """
-    # pylint: disable=W0621, F0401, E0611
-    special_folders = {}
-
-    from win32com.shell import shell, shellcon
-    # CSIDL_LOCAL_APPDATA = C:\Users\<username>\AppData\Local
-    # CSIDL_PROFILE = C:\Users\<username>
-    # CSIDL_COMMON_APPDATA = C:\ProgramData
-    # More information on these constants at
-    # http://msdn.microsoft.com/en-us/library/bb762494
-
-    # as per http://msdn.microsoft.com/en-us/library/windows/desktop/bb762181,
-    # SHGetFolderPath is deprecated, we should migrate to SHGetKnownFolderPath
-    # (http://msdn.microsoft.com/en-us/library/windows/desktop/bb762188)
-    get_path = lambda name: shell.SHGetFolderPath(
-        0, getattr(shellcon, name), None, 0).encode('utf8')
-    special_folders['Personal'] = get_path("CSIDL_PROFILE")
-    special_folders['Local AppData'] = get_path("CSIDL_LOCAL_APPDATA")
-    special_folders['AppData'] = os.path.dirname(
-        special_folders['Local AppData'])
-    special_folders['Common AppData'] = get_path("CSIDL_COMMON_APPDATA")
-    return special_folders
-
-
-def get_env_path(key, default):
-    """Get a utf8 path from an environment variable."""
-    if key in os.environ:
-        # on windows, environment variables are mbcs bytes
-        # so we must turn them into utf-8 Syncdaemon paths
-        path = os.environ.get(key)
-        return path.decode(sys.getfilesystemencoding()).encode("utf-8")
-    else:
-        return default
-
-
-special_folders = get_special_folders()
-
-home_path = special_folders['Personal']
-app_local_data_path = special_folders['Local AppData']
-app_global_data_path = special_folders['Common AppData']
-
-xdg_data_home = get_env_path('XDG_DATA_HOME',
-    os.path.join(app_local_data_path, 'xdg'))
-
-xdg_cache_home = get_env_path('XDG_CACHE_HOME',
-    os.path.join(xdg_data_home, 'cache'))
-
-xdg_config_home = get_env_path('XDG_CONFIG_HOME',
-    app_local_data_path)
-
-
-def get_data_dirs():
-    """Returns XDG data directories."""
-    return get_env_path('XDG_DATA_DIRS',
-        '{0}{1}{2}'.format(app_local_data_path, os.pathsep,
-        app_global_data_path)).split(os.pathsep)
-
-
-xdg_data_dirs = get_data_dirs()
-
-
-def get_config_dirs():
-    """Return XDG config directories."""
-    return [xdg_config_home] + \
-        get_env_path('XDG_CONFIG_DIRS',
-            app_global_data_path,
-            ).split(os.pathsep)
-
-xdg_config_dirs = get_config_dirs()
-
-xdg_data_dirs = filter(lambda x: x, xdg_data_dirs)
-xdg_config_dirs = filter(lambda x: x, xdg_config_dirs)