Merge pull request #405 from zephraph/locator-methods

Allows custom locators to be regular methods

Author: zephraph

src/Selenium2Library/locators/customlocator.py

@@ -7,12 +7,21 @@
 
 class CustomLocator(object):
 
-    def __init__(self, name, keyword):
+    def __init__(self, name, finder):
         self.name = name
-        self.keyword = keyword
+        self.finder = finder
 
     def find(self, *args):
-        element = BuiltIn().run_keyword(self.keyword, *args)
+
+        # Allow custom locators to be keywords or normal methods
+        if isinstance(self.finder, string_type):
+            element = BuiltIn().run_keyword(self.finder, *args)
+        elif hasattr(self.finder, '__caller__'):
+            element = self.finder(*args)
+        else:
+            raise AttributeError('Invalid type provided for Custom Locator %s' % self.name)
+
+        # Always return an array
         if hasattr(element, '__len__') and (not isinstance(element, string_type)):
             return element
         else: