Merge lp:~veebers/autopilot/revert-ext-class-fix-for-now into lp:autopilot

[Christopher Lee]

Revert previous fix to unblock landing of other fixes and documentation updates.

Revert previous fix to unblock landing of other fixes and documentation updates.

[Thomi Richards (thomir)]

I disagree with the motive, but can't argue with the implementation :D

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'autopilot/introspection/_object_registry.py'
--- autopilot/introspection/_object_registry.py	2015-01-19 23:10:49 +0000
+++ autopilot/introspection/_object_registry.py	2015-02-26 00:42:54 +0000
@@ -173,9 +173,6 @@
             )
         )
     if len(possible_classes) == 1:
-        extended_proxy_bases = _get_proxy_bases_for_id(object_id)
-        if extended_proxy_bases:
-            possible_classes[0].__bases__ = extended_proxy_bases
         return possible_classes[0]
     return None
 

=== modified file 'autopilot/tests/functional/test_introspection_features.py'
--- autopilot/tests/functional/test_introspection_features.py	2014-07-31 04:46:16 +0000
+++ autopilot/tests/functional/test_introspection_features.py	2015-02-26 00:42:54 +0000
@@ -24,7 +24,7 @@
 import subprocess
 import tempfile
 from tempfile import mktemp
-from testtools import skipIf
+from testtools import skip, skipIf
 from testtools.matchers import (
     Contains,
     Equals,
@@ -99,6 +99,7 @@
             Equals(WindowMockerApp)
         )
 
+    @skip("Currently fails due to lp:1425721 (and lp:1376996)")
     def test_customised_proxy_classes_have_extension_classes(self):
         class WindowMockerApp(EmulatorBase):
             @classmethod