Merge lp:~alecu/ubuntu-sso-client/textfilter-quacks into lp:ubuntu-sso-client

[Alejandro J. Cura]

Fix filter that broke maverick and lucid build; removed demo script that gives lint error

 * filters don't really need to inherit from logging.Filter, they just need to quack like it
 * removed demo script since it gives a lint error when qt4reactor is not installed

[lp:~alecu/ubuntu-sso-client/textfilter-quacks]

834. By Alejandro J. Cura on 2012-01-11

restore call to the parent __init__, even though it's object

[Alejandro J. Cura (alecu)]

For the record, calling super methods from classes derived from "object" is a good thing, mostly because of multiple inheritance and the MRO.

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/utils/tests/test_txsecrets.py'
--- ubuntu_sso/utils/tests/test_txsecrets.py	2012-01-06 21:05:53 +0000
+++ ubuntu_sso/utils/tests/test_txsecrets.py	2012-01-11 18:40:29 +0000
@@ -390,7 +390,7 @@
     return base + "/" + random
 
 
-class TextFilter(logging.Filter):
+class TextFilter(object):
     """Prevents the logging of messages containing a given text."""
 
     def __init__(self, *args):

=== removed file 'ubuntu_sso/utils/webclient/tests/webclient_demo.py'
--- ubuntu_sso/utils/webclient/tests/webclient_demo.py	2012-01-04 21:26:27 +0000
+++ ubuntu_sso/utils/webclient/tests/webclient_demo.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Sample program that uses the Qt webclient."""
-
-import sys
-from PyQt4 import QtGui
-# need to create the QApplication before installing the reactor
-QtGui.QApplication(sys.argv)
-import qt4reactor
-qt4reactor.install()
-
-from pprint import pprint
-from ubuntu_sso.utils.webclient import qtnetwork
-from twisted.internet import defer, reactor
-
-
[e-mail]
-def do_web_call():
-    """Wait for the webcall to finish and stop the reactor."""
-    webclient = qtnetwork.WebClient()
-    d = webclient.request(u"http://slashdot.org")
-    try:
-        response = yield d
-        pprint(response.headers.items())
-    finally:
-        reactor.stop()
-
-
-def main():
-    """The main function of this test script."""
-    do_web_call()
-    # pylint: disable=E1101
-    reactor.run()
-
-
-if __name__ == "__main__":
-    main()