Merge lp:~dobey/ubuntu-sso-client/use-dirspec into lp:ubuntu-sso-client

[dobey]

Remove the xdg_base_directory module as it duplicates dirspec now

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

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntu-sso-client/use-dirspec into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
Starting squid version...
Waiting for squid to start....
ubuntu_sso.main.tests.test_common
  BaseTestCase
    runTest ... [OK]
  CredentialsManagementClearTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementNotFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementOpsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementParamsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementRefCountingTestCase
    test_authorization_denied ... [OK]
    test_autorization_denied_when_ref_count_is_not_positive ... [OK]
    test_clear_credentials ... [OK]
    test_credentials_cleared ... [OK]
    test_credentials_cleared_when_ref_count_is_not_positive ... [OK]
    test_credentials_error ... [OK]
    test_credentials_error_when_ref_count_is_not_positive ... [OK]
    test_credentials_found ... [OK]
    test_credentials_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_not_found ... [OK]
    test_credentials_not_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_stored ... [OK]
    test_credentials_stored_when_ref_count_is_not_positive ... [OK]
    test_find_credentials ... ...

[lp:~dobey/ubuntu-sso-client/use-dirspec]

974. By dobey on 2012-06-22

Fix pep8 warnings

=== modified file 'setup.py'
--- setup.py	2012-05-29 17:27:26 +0000
+++ setup.py	2012-06-22 17:06:18 +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-22 17:06:18 +0000
@@ -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)

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2012-06-13 20:15:33 +0000
+++ ubuntu_sso/gtk/gui.py	2012-06-22 17:06:18 +0000
@@ -362,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
@@ -796,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)
 
@@ -949,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,

=== 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-22 17:06:18 +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-22 17:06:18 +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/tests/test_linux.py'
--- ubuntu_sso/main/tests/test_linux.py	2012-06-13 16:49:54 +0000
+++ ubuntu_sso/main/tests/test_linux.py	2012-06-22 17:06:18 +0000
@@ -42,7 +42,7 @@
 from ubuntuone.devtools.testcases import BaseTestCase, skipIf
 
 
-@skipIf(do_tests != True, 'Tests only work with DBus and linux imports.')
+@skipIf(not do_tests, 'Tests only work with DBus and linux imports.')
 class LinuxProxyTestCase(BaseTestCase):
     """Test some Linux specific cases."""
 

=== 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-22 17:06:18 +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()
 

=== 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-22 17:06:18 +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)
 

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-06-08 13:33:39 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-06-22 17:06:18 +0000
@@ -245,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-22 17:06:18 +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

=== 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-22 17:06:18 +0000
@@ -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}.iteritems()])
         self.assertEqual(result, expected)
 
     def test_with_not_dict(self):

=== 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-22 17:06:18 +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):

=== 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)