Expose kws as attributes both using orig and custom names.

Fixes #2.

Author: pekkaklarck

atest/librarycomponents.py

@@ -16,7 +16,7 @@ def method(self):
         return 2
 
     @keyword('Custom name')
-    def _whatever(self):
+    def _custom_name(self):
         return 3
 
     def not_keyword(self):

src/robotlibcore.py

@@ -44,15 +44,20 @@ class HybridCore(object):
 
     def __init__(self, library_components):
         self.keywords = {}
+        self.attributes = {}
         self.add_library_components(library_components)
         self.add_library_components([self])
 
     def add_library_components(self, library_components):
         for component in library_components:
             for name, func in self._get_members(component):
                 if callable(func) and hasattr(func, 'robot_name'):
+                    kw = getattr(component, name)
                     kw_name = func.robot_name or name
-                    self.keywords[kw_name] = getattr(component, name)
+                    self.keywords[kw_name] = kw
+                    # Expose keywords as attributes both using original
+                    # method names as well as possible custom names.
+                    self.attributes[name] = self.attributes[kw_name] = kw
 
     def _get_members(self, component):
         if inspect.ismodule(component):
@@ -64,18 +69,18 @@ def _get_members(self, component):
             raise TypeError('Libraries must be modules or new-style class '
                             'instances, got old-style class {!r} instead.'
                             .format(component.__class__.__name__))
-        return self._get_members_from_instannce(component)
+        return self._get_members_from_instance(component)
 
-    def _get_members_from_instannce(self, instance):
+    def _get_members_from_instance(self, instance):
         # Avoid calling properties by getting members from class, not instance.
         cls = type(instance)
         for name in dir(instance):
             owner = cls if hasattr(cls, name) else instance
             yield name, getattr(owner, name)
 
     def __getattr__(self, name):
-        if name in self.keywords:
-            return self.keywords[name]
+        if name in self.attributes:
+            return self.attributes[name]
         raise AttributeError('{!r} object has no attribute {!r}'
                              .format(type(self).__name__, name))
 
@@ -84,7 +89,7 @@ def __dir__(self):
             my_attrs = dir(type(self)) + list(self.__dict__)
         else:
             my_attrs = super().__dir__()
-        return sorted(set(my_attrs + list(self.keywords)))
+        return sorted(set(my_attrs) | set(self.attributes))
 
     def get_keyword_names(self):
         return sorted(self.keywords)

utest/test_robotlibcore.py

@@ -29,11 +29,18 @@ def test_keyword_names():
 def test_dir():
     expected = ['Custom name',
                 'Embedded arguments "${here}"',
+                '_custom_name',
+                '_get_arg_spec',
+                '_get_keyword_tags_supported',
+                '_get_members',
+                '_get_members_from_instance',
                 'add_library_components',
                 'all_arguments',
+                'attributes',
                 'class_attribute',
                 'defaults',
                 'doc_and_tags',
+                'embedded',
                 'function',
                 'get_keyword_arguments',
                 'get_keyword_documentation',
@@ -50,12 +57,14 @@ def test_dir():
                 'run_keyword',
                 'tags',
                 'varargs_and_kwargs']
-    assert [a for a in dir(DynamicLibrary()) if a[0] != '_'] == expected
-    expected = [e for e in expected if e not in ('get_keyword_arguments',
+    assert [a for a in dir(DynamicLibrary()) if a[:2] != '__'] == expected
+    expected = [e for e in expected if e not in ('_get_arg_spec',
+                                                 '_get_keyword_tags_supported',
+                                                 'get_keyword_arguments',
                                                  'get_keyword_documentation',
                                                  'get_keyword_tags',
                                                  'run_keyword')]
-    assert [a for a in dir(HybridLibrary()) if a[0] != '_'] == expected
+    assert [a for a in dir(HybridLibrary()) if a[:2] != '__'] == expected
 
 
 def test_getattr():
@@ -64,11 +73,12 @@ def test_getattr():
         assert lib.instance_attribute == 'not keyword'
         assert lib.function() == 1
         assert lib.method() == 2
+        assert lib._custom_name() == 3
         assert getattr(lib, 'Custom name')() == 3
         with pytest.raises(AttributeError) as exc_info:
-            lib.attribute
+            lib.non_existing
         assert str(exc_info.value) == \
-            "'%s' object has no attribute 'attribute'" % type(lib).__name__
+            "'%s' object has no attribute 'non_existing'" % type(lib).__name__
 
 
 def test_get_keyword_arguments():