Merge lp:~brian.curtin/ubuntu-sso-client/py3-callable into lp:ubuntu-sso-client

[Brian Curtin]

- Switch to Python 3's version of checking if an instance is callable.

Python 3 loses the callable builtin. Switch to checking an object's callability by passing it to isinstance and checking collections.Callable. Safe on recent Python 2 and all Python 3 versions.

[Alejandro J. Cura (alecu)]

Do we really need this change?
Since we are supporting Python 3.2 and upwards, we may not need it, since """This function was first removed in Python 3.0 and then brought back in Python 3.2.""": http://docs.python.org/py3k/library/functions.html#callable

review: Disapprove

[Brian Curtin (brian.curtin)]

You're right - I forgot this was brought back in 3.2. The 2to3 that's included with 2.7 was still reporting this as needing to be changed.

Rejecting this.

Unmerged revisions

990. By Brian Curtin on 2012-08-09

Move to a Python 3 friendly way to check if an object is callable

=== modified file 'ubuntu_sso/qt/tests/__init__.py'
--- ubuntu_sso/qt/tests/__init__.py	2012-07-03 17:07:33 +0000
+++ ubuntu_sso/qt/tests/__init__.py	2012-08-09 21:49:18 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Test the Ui code."""
 
+import collections
+
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -565,7 +567,8 @@
 
         for signal in self.ui_backend_signals:
             self.assertIn(signal, self.ui._signals)
-            self.assertTrue(callable(self.ui._signals[signal]))
+            self.assertTrue(isinstance(self.ui._signals[signal],
+                                       collections.Callable))
 
         expected = ['_set_translated_strings', '_connect_ui', '_setup_signals']
         self.assertEqual(expected, called)