diff -Nru ubuntu-sso-client-2.99.92/bin/ubuntu-sso-login ubuntu-sso-client-3.0.0/bin/ubuntu-sso-login
--- ubuntu-sso-client-2.99.92/bin/ubuntu-sso-login 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/bin/ubuntu-sso-login 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright 2009-2010 Canonical Ltd.
+# 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
@@ -14,7 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Start the sso service."""
# Invalid name "ubuntu-sso-login", pylint: disable=C0103
diff -Nru ubuntu-sso-client-2.99.92/bin/ubuntu-sso-login-gtk ubuntu-sso-client-3.0.0/bin/ubuntu-sso-login-gtk
--- ubuntu-sso-client-2.99.92/bin/ubuntu-sso-login-gtk 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/bin/ubuntu-sso-login-gtk 2012-04-10 18:27:00.000000000 +0000
@@ -14,7 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Start the sso GTK UI."""
# Invalid name "ubuntu-sso-login-gtk", pylint: disable=C0103
diff -Nru ubuntu-sso-client-2.99.92/bin/ubuntu-sso-login-qt ubuntu-sso-client-3.0.0/bin/ubuntu-sso-login-qt
--- ubuntu-sso-client-2.99.92/bin/ubuntu-sso-login-qt 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/bin/ubuntu-sso-login-qt 2012-04-10 18:27:00.000000000 +0000
@@ -14,7 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Start the sso Qt UI."""
# Invalid name "ubuntu-sso-login-qt", pylint: disable=C0103
diff -Nru ubuntu-sso-client-2.99.92/bin/ubuntu-sso-proxy-creds-qt ubuntu-sso-client-3.0.0/bin/ubuntu-sso-proxy-creds-qt
--- ubuntu-sso-client-2.99.92/bin/ubuntu-sso-proxy-creds-qt 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/bin/ubuntu-sso-proxy-creds-qt 2012-04-10 18:27:00.000000000 +0000
@@ -14,7 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Start the QT proxy creds dialog."""
# Invalid name, pylint: disable=C0103
diff -Nru ubuntu-sso-client-2.99.92/bin/ubuntu-sso-ssl-certificate-qt ubuntu-sso-client-3.0.0/bin/ubuntu-sso-ssl-certificate-qt
--- ubuntu-sso-client-2.99.92/bin/ubuntu-sso-ssl-certificate-qt 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/bin/ubuntu-sso-ssl-certificate-qt 2012-04-10 18:27:00.000000000 +0000
@@ -14,7 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Start the QT proxy creds dialog."""
# Invalid name, pylint: disable=C0103
diff -Nru ubuntu-sso-client-2.99.92/debian/changelog ubuntu-sso-client-3.0.0/debian/changelog
--- ubuntu-sso-client-2.99.92/debian/changelog 2012-04-04 12:12:31.000000000 +0000
+++ ubuntu-sso-client-3.0.0/debian/changelog 2012-04-11 19:47:31.000000000 +0000
@@ -1,3 +1,18 @@
+ubuntu-sso-client (3.0.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release.
+ - Fix for test failures. (LP: #973345)
+ - Add necessary OpenSSL exception to license. (LP: #968555)
+ * debian/copyright:
+ - Update to proper dep5 format.
+ - Update for OpenSSL exception.
+ * debian/patches/00_bzr837-lp-960657.patch:
+ - Client hangs on account creation. (LP: #960657)
+ * debian/watch:
+ - Update for new release.
+
+ -- Rodney Dawes Wed, 11 Apr 2012 15:38:32 -0400
+
ubuntu-sso-client (2.99.92-0ubuntu2) precise; urgency=low
* debian/control:
diff -Nru ubuntu-sso-client-2.99.92/debian/copyright ubuntu-sso-client-3.0.0/debian/copyright
--- ubuntu-sso-client-2.99.92/debian/copyright 2012-04-04 12:06:33.000000000 +0000
+++ ubuntu-sso-client-3.0.0/debian/copyright 2012-04-11 19:41:12.000000000 +0000
@@ -1,10 +1,32 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Name: ubuntu-sso-client
-Upstream-Maintainer: Natalia Bidart
-Upstream-Source: https://launchpad.net/ubuntu-sso-client
+Format: http://dep.debian.net/deps/dep5/
Files: *
-Copyright: (C) 2010 Canonical Ltd.
-License: GPL v3
- The full text of the GPL is distributed in
- /usr/share/common-licenses/GPL-3 on Debian systems.
+Copyright: 2010-2012 Canonical Ltd.
+License: GPL-3 with OpenSSL Exception
+ 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 .
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3, can be found in `/usr/share/common-licenses/GPL-3'.
+ .
+ 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.
diff -Nru ubuntu-sso-client-2.99.92/debian/patches/00_bzr837-lp-960657.patch ubuntu-sso-client-3.0.0/debian/patches/00_bzr837-lp-960657.patch
--- ubuntu-sso-client-2.99.92/debian/patches/00_bzr837-lp-960657.patch 1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-sso-client-3.0.0/debian/patches/00_bzr837-lp-960657.patch 2012-04-11 19:45:06.000000000 +0000
@@ -0,0 +1,140 @@
+=== modified file 'ubuntu_sso/gtk/gui.py'
+--- old/ubuntu_sso/gtk/gui.py 2012-04-09 17:38:24 +0000
++++ new/ubuntu_sso/gtk/gui.py 2012-04-11 16:49:02 +0000
+@@ -539,11 +539,12 @@ class UbuntuSSOClientGUI(object):
+
+ msg = YES_TO_UPDATES % {'app_name': self.app_name}
+ self.yes_to_updates_checkbutton.set_label(msg)
+- if self.tc_url:
+- msg = YES_TO_TC % {'app_name': self.app_name}
+- self.yes_to_tc_checkbutton.set_label(msg)
+- self.tc_button.set_label(TC_BUTTON)
+- else:
++
++ msg = YES_TO_TC % {'app_name': self.app_name}
++ self.yes_to_tc_checkbutton.set_label(msg)
++ self.tc_button.set_label(TC_BUTTON)
++
++ if not self.tc_url:
+ self.tc_vbox.hide()
+ self.login_button.set_label(LOGIN_BUTTON_LABEL)
+
+@@ -741,6 +742,7 @@ class UbuntuSSOClientGUI(object):
+ name = self.name_entry.get_text()
+ if not name:
+ self.name_entry.set_warning(FIELD_REQUIRED)
++ logger.warning('on_join_ok_button_clicked: name not set.')
+ error = True
+
+ # check email
+@@ -750,6 +752,7 @@ class UbuntuSSOClientGUI(object):
+ if msg is not None:
+ self.email1_entry.set_warning(msg)
+ self.email2_entry.set_warning(msg)
++ logger.warning('on_join_ok_button_clicked: email is not valid.')
+ error = True
+
+ # check password
+@@ -759,22 +762,30 @@ class UbuntuSSOClientGUI(object):
+ if msg is not None:
+ self.password1_entry.set_warning(msg)
+ self.password2_entry.set_warning(msg)
++ logger.warning('on_join_ok_button_clicked: password is not valid.')
+ error = True
+
+ # check T&C
+- if not self.yes_to_tc_checkbutton.get_active():
++ if self.tc_url and not self.yes_to_tc_checkbutton.get_active():
+ self._set_warning_message(self.tc_warning_label,
+ TC_NOT_ACCEPTED % {'app_name': self.app_name})
++ logger.warning('on_join_ok_button_clicked: terms and conditions '
++ 'not accepted.')
+ error = True
+
+ captcha_solution = self.captcha_solution_entry.get_text()
+ if not captcha_solution:
+ self.captcha_solution_entry.set_warning(FIELD_REQUIRED)
++ logger.warning('on_join_ok_button_clicked: captcha solution not '
++ 'set.')
+ error = True
+
+ if error:
++ logger.warning('on_join_ok_button_clicked: validation failed.')
+ return
+
++ logger.info('on_join_ok_button_clicked: validation success!')
++
+ self._set_current_page(self.processing_vbox)
+ self.user_email = email1
+ self.user_password = password1
+
+=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
+--- old/ubuntu_sso/gtk/tests/test_gui.py 2012-04-09 17:38:24 +0000
++++ new/ubuntu_sso/gtk/tests/test_gui.py 2012-04-11 16:49:02 +0000
+@@ -473,8 +473,9 @@ class UbuntuSSOClientTestCase(BasicTestC
+ # match passwords
+ self.ui.password1_entry.set_text(PASSWORD)
+ self.ui.password2_entry.set_text(PASSWORD)
+- # agree to TC
+- self.ui.yes_to_tc_checkbutton.set_active(True)
++ if self.ui.tc_url:
++ # agree to TC, only if the tc_url is defined, so we catch errors
++ self.ui.yes_to_tc_checkbutton.set_active(True)
+ # resolve captcha properly
+ self.ui.captcha_solution_entry.set_text(CAPTCHA_SOLUTION)
+
+@@ -694,15 +695,15 @@ class EnterDetailsTestCase(UbuntuSSOClie
+ self.assertEqual(expected, actual,
+ msg % ('yes_to_tc_checkbutton', expected, actual))
+
+- def test_checkbutton_is_checked_at_startup(self):
+- """Checkbuttons are checked by default."""
++ def test_updates_checkbutton_is_checked_at_startup(self):
++ """The 'yes to updates' checkbutton is checked by default."""
+ msg = '%r is checked by default.'
+ name = 'yes_to_updates_checkbutton'
+ widget = getattr(self.ui, name)
+ self.assertTrue(widget.get_active(), msg % name)
+
+- def test_checkbutton_isnt_checked_at_startup(self):
+- """Checkbuttons are checked by default."""
++ def test_tc_checkbutton_is_not_checked_at_startup(self):
++ """The 'yes to T&C' checkbutton is not checked by default."""
+ msg = '%r is checked by default.'
+ name = 'yes_to_tc_checkbutton'
+ widget = getattr(self.ui, name)
+@@ -887,26 +888,22 @@ class EnterDetailsTestCase(UbuntuSSOClie
+ self.ui.on_captcha_generated(app_name=APP_NAME, captcha_id=CAPTCHA_ID)
+ self.assertEqual(self.ui.warning_label.get_text().decode('utf8'), '')
+
++ def test_has_tc_link(self):
++ """The T&C button and checkbox are shown if the link is provided"""
++ self.assertEqual(self.ui.tc_button.get_visible(), True)
++ self.assertEqual(self.ui.yes_to_tc_checkbutton.get_visible(), True)
+
+-class NoTermsAndConditionsTestCase(UbuntuSSOClientTestCase):
++
++class NoTermsAndConditionsTestCase(EnterDetailsTestCase):
+ """Test suite for the user registration (with no t&c link)."""
+
+ kwargs = dict(app_name=APP_NAME, tc_url='', help_text=HELP_TEXT)
+
+- def test_no_tc_link(self):
++ def test_has_tc_link(self):
+ """The T&C button and checkbox are not shown if no link is provided"""
+ self.assertEqual(self.ui.tc_vbox.get_visible(), False)
+
+
+-class TermsAndConditionsTestCase(UbuntuSSOClientTestCase):
+- """Test suite for the user registration (terms & conditions page)."""
+-
+- def test_has_tc_link(self):
+- """The T&C button and checkbox are shown if the link is provided"""
+- self.assertEqual(self.ui.tc_button.get_visible(), True)
+- self.assertEqual(self.ui.yes_to_tc_checkbutton.get_visible(), True)
+-
+-
+ class TermsAndConditionsBrowserTestCase(UbuntuSSOClientTestCase):
+ """Test suite for the terms & conditions browser."""
+
+
diff -Nru ubuntu-sso-client-2.99.92/debian/patches/series ubuntu-sso-client-3.0.0/debian/patches/series
--- ubuntu-sso-client-2.99.92/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-sso-client-3.0.0/debian/patches/series 2012-04-11 19:46:45.000000000 +0000
@@ -0,0 +1,2 @@
+00_bzr837-lp-960657.patch
+
diff -Nru ubuntu-sso-client-2.99.92/debian/watch ubuntu-sso-client-3.0.0/debian/watch
--- ubuntu-sso-client-2.99.92/debian/watch 2012-04-04 12:06:33.000000000 +0000
+++ ubuntu-sso-client-3.0.0/debian/watch 2012-04-11 19:38:07.000000000 +0000
@@ -1,2 +1,2 @@
version=3
-http://launchpad.net/ubuntu-sso-client/stable-3-0/2.99.92/ .*/ubuntu-sso-client-([0-9.]+)\.tar\.gz
+http://launchpad.net/ubuntu-sso-client/stable-3-0/3.0.0/ .*/ubuntu-sso-client-([0-9.]+)\.tar\.gz
diff -Nru ubuntu-sso-client-2.99.92/LICENSE ubuntu-sso-client-3.0.0/LICENSE
--- ubuntu-sso-client-2.99.92/LICENSE 1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-sso-client-3.0.0/LICENSE 2012-04-10 18:27:00.000000000 +0000
@@ -0,0 +1,28 @@
+# This is the Ubuntu One development tools package.
+#
+# Copyright (C) 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 .
+#
+# 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.
diff -Nru ubuntu-sso-client-2.99.92/LICENSE.OpenSSL ubuntu-sso-client-3.0.0/LICENSE.OpenSSL
--- ubuntu-sso-client-2.99.92/LICENSE.OpenSSL 1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-sso-client-3.0.0/LICENSE.OpenSSL 2012-04-10 18:27:00.000000000 +0000
@@ -0,0 +1,137 @@
+Certain source files in this program permit linking with the OpenSSL
+library (http://www.openssl.org), which otherwise wouldn't be allowed
+under the (A)GPL. For purposes of identifying OpenSSL, most source files
+giving this permission limit it to versions of OpenSSL having a license
+identical to that listed in this file (LICENSE.OpenSSL). It is not
+necessary for the copyright years to match between this file and the
+OpenSSL version in question. However, note that because this file is
+an extension of the license statements of these source files, this file
+may not be changed except with permission from all copyright holders
+of source files in this program which reference this file.
+
+ LICENSE ISSUES
+ ==============
+
+ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+ the OpenSSL License and the original SSLeay license apply to the toolkit.
+ See below for the actual license texts. Actually both licenses are BSD-style
+ Open Source licenses. In case of any license issues related to OpenSSL
+ please contact openssl-core@openssl.org.
+
+ OpenSSL License
+ ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to. The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * "This product includes cryptographic software written by
+ * Eric Young (eay@cryptsoft.com)"
+ * The word 'cryptographic' can be left out if the rouines from the library
+ * being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ * the apps directory (application code) you must include an acknowledgement:
+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed. i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
diff -Nru ubuntu-sso-client-2.99.92/PKG-INFO ubuntu-sso-client-3.0.0/PKG-INFO
--- ubuntu-sso-client-2.99.92/PKG-INFO 2012-04-03 14:19:52.000000000 +0000
+++ ubuntu-sso-client-3.0.0/PKG-INFO 2012-04-10 18:38:48.000000000 +0000
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: ubuntu-sso-client
-Version: 2.99.92
+Version: 3.0.0
Summary: Ubuntu Single Sign-On client
Home-page: https://launchpad.net/ubuntu-sso-client
Author: Natalia Bidart
@@ -8,4 +8,32 @@
License: GPL v3
Description: Desktop service to allow applications to sign into Ubuntu services via SSO
Platform: UNKNOWN
+Requires: Image
+Requires: OpenSSL
+Requires: PIL
+Requires: PyQt4
+Requires: dbus
+Requires: gi.repository.GLib
+Requires: gi.repository.Gdk
+Requires: gi.repository.GdkX11
+Requires: gi.repository.Gtk
+Requires: gi.repository.Soup
+Requires: gi.repository.SoupGNOME
+Requires: gi.repository.WebKit
+Requires: httplib2
+Requires: keyring
+Requires: lazr.restfulclient.authorize.oauth
+Requires: mocker
+Requires: oauth
+Requires: qt4reactor
+Requires: twisted.application
+Requires: twisted.cred
+Requires: twisted.internet
+Requires: twisted.python
+Requires: twisted.spread.pb
+Requires: twisted.trial
+Requires: twisted.web
+Requires: ubuntuone.devtools.handlers
+Requires: ubuntuone.devtools.testcases
+Requires: xdg.BaseDirectory
Provides: ubuntu_sso
diff -Nru ubuntu-sso-client-2.99.92/run-tests ubuntu-sso-client-3.0.0/run-tests
--- ubuntu-sso-client-2.99.92/run-tests 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/run-tests 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
#
# Author: Natalia Bidart
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -15,7 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
QT_TESTS_PATH="ubuntu_sso/qt/tests, ubuntu_sso/qt/main/tests"
GTK_TESTS_PATH=ubuntu_sso/gtk/tests
WINDOWS_TESTS=test_windows.py
diff -Nru ubuntu-sso-client-2.99.92/run-tests.bat ubuntu-sso-client-3.0.0/run-tests.bat
--- ubuntu-sso-client-2.99.92/run-tests.bat 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/run-tests.bat 2012-04-10 18:27:00.000000000 +0000
@@ -11,6 +11,19 @@
::
:: You should have received a copy of the GNU General Public License along
:: with this program. If not, see .
+::
+:: 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.
@ECHO off
diff -Nru ubuntu-sso-client-2.99.92/setup.py ubuntu-sso-client-3.0.0/setup.py
--- ubuntu-sso-client-2.99.92/setup.py 2012-04-03 14:17:15.000000000 +0000
+++ ubuntu-sso-client-3.0.0/setup.py 2012-04-10 18:27:20.000000000 +0000
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Setup.py: build, distribute, clean."""
# pylint: disable=W0404, W0511
@@ -334,7 +347,7 @@
DistUtilsExtra.auto.setup(
name='ubuntu-sso-client',
- version='2.99.92',
+ version='3.0.0',
license='GPL v3',
author='Natalia Bidart',
author_email='natalia.bidart@canonical.com',
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/account.py ubuntu-sso-client-3.0.0/ubuntu_sso/account.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/account.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/account.py 2012-04-10 18:27:00.000000000 +0000
@@ -3,7 +3,7 @@
# Author: Natalia Bidart
# Author: Alejandro J. Cura
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -16,6 +16,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Single Sign On account management.
All the methods in Account expect unicode as parameters.
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/constants.py.in ubuntu-sso-client-3.0.0/ubuntu_sso/constants.py.in
--- ubuntu-sso-client-2.99.92/ubuntu_sso/constants.py.in 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/constants.py.in 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Some generated constants.
DO NO EDIT! This is a generated file. It will be built at installation time.
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/credentials.py ubuntu-sso-client-3.0.0/ubuntu_sso/credentials.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/credentials.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/credentials.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Credential management utilities.
'Credentials' provides the following fault-tolerant methods:
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/gui.py ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/gui.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/gui.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/gui.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""User registration GUI."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,5 +13,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Ubuntu Single Sign On graphical interface."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/main.py ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/main.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/main.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/main.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Main module to open the GTK UI."""
# pylint: disable=E0611
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,5 +13,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Ubuntu SSO graphical interface."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/tests/test_gui.py ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/tests/test_gui.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/tests/test_gui.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/tests/test_gui.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 GUI for registration/login."""
import itertools
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/tests/test_main.py ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/tests/test_main.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/gtk/tests/test_main.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/gtk/tests/test_main.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 module."""
from twisted.trial.unittest import TestCase
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# ubuntu_sso - Ubuntu Single Sign On client support for desktop apps
#
-# Copyright 2009-2010 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Ubuntu Single Sign On client code."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -4,7 +4,7 @@
# Alejandro J. Cura
# Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -17,6 +17,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Implementations of different keyrings."""
import socket
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2010 Canonical
+# Copyright (C) 2010-2012 Canonical
#
# Authors:
# Andrew Higginson
@@ -20,7 +20,19 @@
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
+#
+# 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.
"""Handle keys in the local kerying."""
import urllib
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,4 +14,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Keyring tests."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/test_common.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/test_common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/test_common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/test_common.py 2012-04-10 18:27:00.000000000 +0000
@@ -5,7 +5,7 @@
# Author: Alejandro J. Cura
# Author: Natalia B. Bidart
#
-# Copyright 2010-2011 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -18,6 +18,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 keyring common module."""
from twisted.trial.unittest import TestCase
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/test_linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/test_linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/test_linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/test_linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -5,7 +5,7 @@
# Author: Alejandro J. Cura
# Author: Natalia B. Bidart
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -18,6 +18,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 keyring.py module."""
from twisted.internet import defer
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/test_windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/test_windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/tests/test_windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/tests/test_windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the windows keyring implementation."""
from json import dumps
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/keyring/windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/keyring/windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Keyring implementation on Windows."""
from json import loads, dumps
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/logger.py ubuntu-sso-client-3.0.0/ubuntu_sso/logger.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/logger.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/logger.py 2012-04-10 18:27:00.000000000 +0000
@@ -5,7 +5,7 @@
# Author: Stuart Langridge
# Author: Natalia B. Bidart
#
-# Copyright 2009 Canonical Ltd.
+# 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
@@ -18,7 +18,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Miscellaneous logging functions."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/glib.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/glib.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/glib.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/glib.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""GLib main loop runner."""
# pylint: disable=E0611,F0401
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Single Sign On client main module.
Provides a utility which accepts requests to the Ubuntu Single Sign On
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Main module implementation specific for linux.
This module should never import from the multiplatform one (main/__init__.py),
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/qt.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/qt.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/qt.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/qt.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Qt main loop runner."""
# pylint: disable=E0611,F0401
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the different main implementations."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_clients.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_clients.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_clients.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_clients.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 client code."""
from twisted.internet import defer
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_common.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_common.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2009-2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 client code."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_qt.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_qt.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_qt.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_qt.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Qt specific tests for the main module."""
# pylint: disable=F0401
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/tests/test_windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/tests/test_windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 main module."""
# pylint: disable=F0401
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/main/windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/main/windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/main/windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/main/windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Main module implementation specific for windows.
This module should never import from the multiplatform one (main/__init__.py),
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 specific network status."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -4,7 +4,7 @@
#
# Author: Alejandro J. Cura
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -17,6 +17,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Implementation of network state detection."""
import dbus
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,4 +14,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the different networkstatus implementations."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/tests/test_linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/tests/test_linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/tests/test_linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/tests/test_linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -17,6 +17,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 network state detection code."""
from collections import defaultdict
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/tests/test_windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/tests/test_windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/tests/test_windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/tests/test_windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 network manager."""
from ctypes import windll
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/networkstate/windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/networkstate/windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Network status implementation on Windows."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/arrow.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/arrow.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/arrow.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/arrow.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Widget written in Qt that works as a GtkArrow."""
from PyQt4.QtGui import QPainter, QStyle, QStyleOption, QWidget
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/common.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/common.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
#
# Author: Diego Sarmentero
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -15,6 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Common functionality used by the UI modules."""
import re
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/current_user_sign_in_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/current_user_sign_in_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/current_user_sign_in_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/current_user_sign_in_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Page to allow the user to login into Ubuntu Single Sign On."""
from functools import partial
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/email_verification_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/email_verification_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/email_verification_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/email_verification_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Email Verification page UI."""
from functools import partial
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/enhanced_check_box.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/enhanced_check_box.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/enhanced_check_box.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/enhanced_check_box.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
# Authors: Diego Sarmentero
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -15,7 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Customized Check Box to support links."""
from PyQt4 import QtGui, QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/error_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/error_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/error_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/error_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Email Verification page UI."""
from ubuntu_sso.qt.sso_wizard_page import SSOWizardPage
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/expander.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/expander.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/expander.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/expander.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""A Expander widget similar to the GtkExpander."""
from PyQt4.QtCore import pyqtSignal
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/forgotten_password_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/forgotten_password_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/forgotten_password_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/forgotten_password_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Forgotten Password page UI."""
from functools import partial
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""The Qt graphical interface for the Ubuntu Single Sign On Client."""
import collections
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/loadingoverlay.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/loadingoverlay.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/loadingoverlay.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/loadingoverlay.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Loading animation over a widget."""
from PyQt4 import QtGui, QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Main module to open the QT UI."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Main method to be used on linux."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,5 +13,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""The test suite for the Qt UI for SSO."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/tests/test_main.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/tests/test_main.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/tests/test_main.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/tests/test_main.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 module."""
from PyQt4 import QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/main/windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/main/windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Main method to be used on windows."""
from PyQt4 import QtGui
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/network_detection_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/network_detection_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/network_detection_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/network_detection_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Pages from SSO."""
from twisted.internet import defer
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/proxy_dialog.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/proxy_dialog.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/proxy_dialog.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/proxy_dialog.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Qt implementation of proxy UI."""
import argparse
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/reset_password_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/reset_password_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/reset_password_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/reset_password_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Reset Password page UI."""
from functools import partial
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/setup_account_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/setup_account_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/setup_account_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/setup_account_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Customized Setup Account page for SSO."""
import StringIO
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/ssl_dialog.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/ssl_dialog.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/ssl_dialog.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/ssl_dialog.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Qt implementation of the SSL ui."""
import argparse
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/sso_wizard_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/sso_wizard_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/sso_wizard_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/sso_wizard_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Qt implementation of the UI."""
from functools import wraps
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/success_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/success_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/success_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/success_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Success page UI."""
from PyQt4 import QtGui
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test the Ui code."""
from PyQt4 import QtGui, QtCore
@@ -39,12 +51,14 @@
def build_string_for_pixels(label, width):
- """Return a random string that will be as big as with in pixels."""
- char = 'a'
+ """Return a random string that will be as big as 'width' in pixels."""
+ char = 'm'
fm = QtGui.QFontMetrics(label.font())
pixel_width = fm.width(char)
chars = int(width / pixel_width)
- return char * chars
+ result = char * chars
+ assert pixel_width * chars <= width
+ return result
class FakedObject(object):
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/login_u_p.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/login_u_p.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/login_u_p.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/login_u_p.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Script that shows the qt gui."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/show_gui.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/show_gui.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/show_gui.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/show_gui.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Script that shows the qt gui."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_arrow.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_arrow.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_arrow.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_arrow.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""QArrow tests."""
from PyQt4.QtGui import QStyle
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_common.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_common.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Diego Sarmentero
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the common functions."""
from PyQt4 import QtGui
@@ -257,7 +270,7 @@
def test_text_not_elided_if_too_short(self):
"""If text is shorter than max_width, do not elide."""
- text = build_string_for_pixels(self.ui, self.max_width - 1)
+ text = build_string_for_pixels(self.ui, self.max_width - 10)
maybe_elide_text(self.ui, text, self.max_width)
@@ -277,7 +290,7 @@
def test_text_elided_if_bigger_than_max_width(self):
"""If text is equal than max_width, do not elide."""
- text = build_string_for_pixels(self.ui, self.max_width + 10)
+ text = build_string_for_pixels(self.ui, self.max_width * 2)
maybe_elide_text(self.ui, text, self.max_width)
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_current_user_sign_in_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_current_user_sign_in_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_current_user_sign_in_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_current_user_sign_in_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Setup Account page Qt UI."""
from PyQt4 import QtGui, QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_email_verification.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_email_verification.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_email_verification.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_email_verification.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Setup Account page Qt UI."""
from PyQt4 import QtGui, QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_enchanced_line_edit.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_enchanced_line_edit.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_enchanced_line_edit.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_enchanced_line_edit.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Diego Sarmentero
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the EnhancedLineEdit."""
import collections
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_enhanced_check_box.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_enhanced_check_box.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_enhanced_check_box.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_enhanced_check_box.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 EnhancedCheckBox widget."""
from PyQt4 import QtGui, QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_error_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_error_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_error_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_error_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test the error page."""
from ubuntu_sso.qt.error_page import ErrorPage
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_expander.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_expander.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_expander.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_expander.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 expander widget."""
from PyQt4.QtGui import QLabel
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_forgotten_password.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_forgotten_password.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_forgotten_password.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_forgotten_password.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Setup Account page Qt UI."""
from PyQt4 import QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_loadingoverlay.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_loadingoverlay.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_loadingoverlay.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_loadingoverlay.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Loading Overlay."""
from ubuntu_sso.qt.loadingoverlay import LoadingOverlay
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_network_detection.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_network_detection.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_network_detection.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_network_detection.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""The test suite for Network Detection UI."""
from PyQt4 import QtGui
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_proxy_dialog.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_proxy_dialog.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_proxy_dialog.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_proxy_dialog.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the proxy UI."""
import qt4reactor
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_reset_password.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_reset_password.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_reset_password.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_reset_password.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the Reset Password Page."""
# pylint: disable=F0401,E0611,E1101
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_setup_account.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_setup_account.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_setup_account.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_setup_account.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Setup Account page Qt UI."""
from PyQt4 import QtGui, QtCore
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_ssl_dialog.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_ssl_dialog.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_ssl_dialog.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_ssl_dialog.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test the ssl dialog."""
from PyQt4.QtGui import QStyle
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_sso_wizard_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_sso_wizard_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_sso_wizard_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_sso_wizard_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test the SSOWizardPage and related."""
from ubuntu_sso.qt import PREFERED_UI_SIZE, sso_wizard_page as gui
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_success_page.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_success_page.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_success_page.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_success_page.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test the success page."""
from ubuntu_sso.qt.success_page import SuccessPage
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test Ubunto SSO Wizard."""
from PyQt4 import QtGui
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/ubuntu_sso_wizard.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/ubuntu_sso_wizard.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/ubuntu_sso_wizard.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/ubuntu_sso_wizard.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""SSO Wizard UI."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/qt/ui/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/qt/ui/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/qt/ui/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/qt/ui/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,5 +13,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""The UI generated files."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2009 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 Ubuntu SSO library."""
import os
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/tests/test_account.py ubuntu-sso-client-3.0.0/ubuntu_sso/tests/test_account.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/tests/test_account.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/tests/test_account.py 2012-04-10 18:27:00.000000000 +0000
@@ -3,7 +3,7 @@
# Author: Natalia Bidart
# Author: Alejandro J. Cura
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -16,6 +16,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 SSO account code."""
import os
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/tests/test_credentials.py ubuntu-sso-client-3.0.0/ubuntu_sso/tests/test_credentials.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/tests/test_credentials.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/tests/test_credentials.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 Credentials module."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Utility modules that may find use outside ubuntu_sso."""
import cgi
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/ipc.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/ipc.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/ipc.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/ipc.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Perspective Broker IPC utils."""
from functools import wraps, partial
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/linux.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/linux.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/linux.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/linux.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 specific constants and functions (for Linux)."""
PLATFORM_QSS = ":/linux.qss"
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/glib.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/glib.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/glib.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/glib.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Utility to spawn another program from a GLib mainloop."""
import os
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Utility to spawn another program from a mainloop."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/qt.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/qt.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/qt.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/qt.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Utility to spawn another program from a plain Qt mainloop."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,5 +13,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 program runner."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/test_glib.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/test_glib.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/test_glib.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/test_glib.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 glib runner helper module."""
import subprocess
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/test_qt.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/test_qt.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/test_qt.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/test_qt.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 qt runner helper module."""
import subprocess
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/test_runner.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/test_runner.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tests/test_runner.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tests/test_runner.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 runner helper module."""
import os
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tx.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tx.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/runner/tx.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/runner/tx.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Utility to spawn another program from a mainloop."""
import os
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tcpactivation.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tcpactivation.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tcpactivation.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tcpactivation.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""tcpactivation: start a process if nothing listening in a given port."""
import subprocess
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
# Author: Alejandro J. Cura
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -15,5 +15,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Test for the utility modules."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_common.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_common.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 oauth_headers helper function."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_ipc.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_ipc.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_ipc.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_ipc.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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.
"""Perspective Broker IPC test cases."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_parse_args.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_parse_args.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_parse_args.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_parse_args.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 parse_args function."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_tcpactivation.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_tcpactivation.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_tcpactivation.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_tcpactivation.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
# Author: Alejandro J. Cura
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -15,7 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 tcpactivation module."""
# twisted uses a different coding convention
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_txsecrets.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_txsecrets.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_txsecrets.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_txsecrets.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
# Author: Alejandro J. Cura
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -15,6 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 txkeyring."""
import logging
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_ui.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_ui.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_ui.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_ui.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Author: Manuel de la Pena
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -14,6 +14,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the ui functions."""
from unittest import TestCase
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/tests/test_windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/tests/test_windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 platform specific functions (for Windows)."""
import thread
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/txsecrets.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/txsecrets.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/txsecrets.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/txsecrets.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
# Author: Alejandro J. Cura
#
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
@@ -15,6 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""
Provides a twisted interface to access the system keyring via DBus.
Implements the Secrets Service API Draft:
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/ui.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/ui.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/ui.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/ui.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Utils to be used by the UI modules."""
import argparse
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/common.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/common.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""The common bits of a webclient."""
import cgi
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/gsettings.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/gsettings.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/gsettings.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/gsettings.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Retrieve the proxy configuration from Gnome."""
import subprocess
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""A common webclient that can use a QtNetwork or libsoup backend."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/libsoup.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/libsoup.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/libsoup.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/libsoup.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""A webclient backend that uses libsoup."""
import httplib
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/qtnetwork.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/qtnetwork.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/qtnetwork.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/qtnetwork.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""A webclient backend that uses QtNetwork."""
import sys
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/restful.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/restful.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/restful.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/restful.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""A proxy-enabled restful client."""
import json
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 proxy-aware webclient."""
from twisted.application import internet, service
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_gsettings.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_gsettings.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_gsettings.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_gsettings.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Test the gsettings parser."""
from twisted.trial.unittest import TestCase
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_qtnetwork.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_qtnetwork.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_qtnetwork.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_qtnetwork.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Specific tests for the qt implementation."""
from twisted.internet import defer
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_restful.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_restful.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_restful.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_restful.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 proxy-enabled restful client."""
import urlparse
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_timestamp.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_timestamp.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_timestamp.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_timestamp.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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 timestamp sync classes."""
from twisted.internet import defer
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_webclient.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_webclient.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/tests/test_webclient.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/tests/test_webclient.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Integration tests for the proxy-enabled webclient."""
import os
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/timestamp.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/timestamp.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/timestamp.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/timestamp.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""Timestamp synchronization with the server."""
import time
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/txweb.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/txweb.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/webclient/txweb.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/webclient/txweb.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,6 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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.
"""A webclient backend that uses twisted.web.client."""
import base64
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/utils/windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/utils/windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/utils/windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/utils/windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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 specific constants and functions (for Windows)."""
PLATFORM_QSS = ":/windows.qss"
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/tests/__init__.py ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/tests/__init__.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/tests/__init__.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/tests/__init__.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# ubuntu_sso - Ubuntu Single Sign On client support for desktop apps
#
-# Copyright 2009-2010 Canonical Ltd.
+# 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
@@ -13,4 +13,17 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
+#
+# 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."""
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/tests/test_common.py ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/tests/test_common.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/tests/test_common.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/tests/test_common.py 2012-04-10 18:27:00.000000000 +0000
@@ -2,7 +2,7 @@
#
# Authors: Natalia B. Bidart
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -15,7 +15,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/tests/test_windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/tests/test_windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/tests/test_windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/tests/test_windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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
diff -Nru ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/windows.py ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/windows.py
--- ubuntu-sso-client-2.99.92/ubuntu_sso/xdg_base_directory/windows.py 2012-04-03 14:17:14.000000000 +0000
+++ ubuntu-sso-client-3.0.0/ubuntu_sso/xdg_base_directory/windows.py 2012-04-10 18:27:00.000000000 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -13,7 +13,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see .
-
+#
+# 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