Merge lp:~mhr3/libunity/fix-1214125 into lp:libunity

[Michal Hruby]

Use proper overrides for ScopeResult.

Use proper overrides for ScopeResult.

[Paweł Stołowski (stolowski)]

Looks good. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/libunity-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/100/rebuild

review: Approve (continuous-integration)

=== modified file 'bindings/python/Unity.py'
--- bindings/python/Unity.py	2013-08-14 14:51:08 +0000
+++ bindings/python/Unity.py	2013-08-20 10:24:26 +0000
@@ -94,11 +94,14 @@
     return result
 
 
-def scope_result_create(*args, **kwargs):
-    if len(kwargs) > 0:
-        result = kwargs_to_result_variant(**kwargs)
-        return Unity.ScopeResult.create_from_variant(result)
-    return original_scope_result_create(*args)
+class ScopeResult(Unity.ScopeResult):
+
+    @staticmethod
+    def create(*args, **kwargs):
+        if len(kwargs) > 0:
+            result = kwargs_to_result_variant(**kwargs)
+            return Unity.ScopeResult.create_from_variant(result)
+        return Unity.ScopeResult.create(*args)
 
 
 ScopeSearchBase = override(ScopeSearchBase)
@@ -107,5 +110,5 @@
 __all__.append('ResultPreviewer')
 ResultSet = override(ResultSet)
 __all__.append('ResultSet')
-original_scope_result_create = Unity.ScopeResult.create
-Unity.ScopeResult.create = scope_result_create
+ScopeResult = override(ScopeResult)
+__all__.append('ScopeResult')