Don't touch properties for real.

Old code to avoid properties was totally broken.

Also validate that libs are modules or new style class instances.

Author: pekkaklarck

atest/librarycomponents.py

@@ -26,6 +26,10 @@ def not_keyword(self):
     def keyword_in_main(self):
         raise AssertionError('Should be overridden by the main library!')
 
+    @property
+    def dont_touch_property(self):
+        raise RuntimeError('Should not touch property!!')
+
 
 class Arguments(object):
 

src/robotlibcore.py

@@ -31,10 +31,23 @@ def _find_keywords(self, *libraries):
                     yield kw_name, getattr(library, name)
 
     def _get_members(self, library):
-        # Avoid calling properties by getting members from class, not instance.
+        if inspect.ismodule(library):
+            return inspect.getmembers(library)
         if inspect.isclass(library):
-            library = type(library)
-        return inspect.getmembers(library)
+            raise TypeError('Libraries must be modules or instances, got '
+                            'class {!r} instead.'.format(library.__name__))
+        if type(library) != library.__class__:
+            raise TypeError('Libraries must be modules or new-style class '
+                            'instances, got old-style class {!r} instead.'
+                            .format(library.__class__.__name__))
+        return self._get_members_from_instannce(library)
+
+    def _get_members_from_instannce(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:

utest/test_robotlibcore.py

@@ -1,5 +1,9 @@
+import sys
+
 import pytest
 
+from robotlibcore import HybridCore
+
 from HybridLibrary import HybridLibrary
 from DynamicLibrary import DynamicLibrary
 
@@ -60,9 +64,9 @@ def test_getattr():
         assert lib.function() == 1
         assert lib.method() == 2
         assert getattr(lib, 'Custom name')() == 3
-        with pytest.raises(AttributeError) as excinfo:
+        with pytest.raises(AttributeError) as exc_info:
             lib.attribute
-        assert str(excinfo.value) == \
+        assert str(exc_info.value) == \
             "'%s' object has no attribute 'attribute'" % type(lib).__name__
 
 
@@ -99,3 +103,20 @@ def test_get_keyword_tags():
     assert tags('doc_and_tags') == ['tag']
     assert doc('tags') == ''
     assert doc('doc_and_tags') == 'I got doc!'
+
+
+def test_library_cannot_be_class():
+    with pytest.raises(TypeError) as exc_info:
+        HybridCore([HybridLibrary])
+    assert str(exc_info.value) == \
+        "Libraries must be modules or instances, got class 'HybridLibrary' instead."
+
+
+@pytest.mark.skipif(sys.version_info[0] > 2, reason='Only applicable on Py 2')
+def test_library_cannot_be_old_style_class_instance():
+    class OldStyle:
+        pass
+    with pytest.raises(TypeError) as exc_info:
+        HybridCore([OldStyle()])
+    assert str(exc_info.value) == \
+           "Libraries must be modules or new-style class instances, got old-style class 'OldStyle' instead."