-

cool-RR · cool-RR · commit 60223532d9b7 · 2015-06-06T23:21:07.000+03:00
diff --git a/source_py3/python_toolbox/misc_tools/__init__.py b/source_py3/python_toolbox/misc_tools/__init__.py
@@ -5,4 +5,5 @@
 
 from .misc_tools import *
 from . import name_mangling
-from .proxy_property import ProxyProperty
+from .proxy_property import ProxyProperty
+from .overridable_property import OverridableProperty
diff --git a/source_py3/python_toolbox/misc_tools/overridable_property.py b/source_py3/python_toolbox/misc_tools/overridable_property.py
@@ -25,24 +25,27 @@ def __init__(self, fget, doc=None, name=None):
         
         You may specify a docstring as `doc`.
         '''
-        OwnNameDiscoveringDescriptor.__init__(name=name)
-        if not attribute_name.startswith('.'):
-            raise Exception("The `attribute_name` must start with a dot to "
-                            "make it clear it's an attribute. %s does not "
-                            "start with a dot." % repr(attribute_name))
+        OwnNameDiscoveringDescriptor.__init__(self, name=name)
         self.getter = fget
         self.__doc__ = doc
         
+    def _get_overridden_attribute_name(self, thing):
+        return '_%s__%s' % (type(self).__name__, self.get_our_name(thing))
+        
         
     def __get__(self, thing, our_type=None):
         if thing is None:
             # We're being accessed from the class itself, not from an object
             return self
         else:
-            return self.getter(thing)
+            overridden_attribute_name = self._get_overridden_attribute_name(thing)
+            if hasattr(thing, overridden_attribute_name):
+                return getattr(thing, overridden_attribute_name)
+            else:
+                return self.getter(thing)
         
     def __set__(self, thing, value):
-        setattr(thing, self.get_our_name(thing), value)
+        setattr(thing, self._get_overridden_attribute_name(thing), value)
         
     def __repr__(self):
         return '<%s: %s>' % (type(self).__name__, self.our_name or self.getter)
diff --git a/source_py3/test_python_toolbox/test_address_tools/test_describe.py b/source_py3/test_python_toolbox/test_address_tools/test_describe.py
@@ -246,7 +246,7 @@ def test_bad_module_name():
 def test_function_in_something():
     '''Test `describe` doesn't fail when describing `{1: sum}`.'''
     if python_toolbox.__version_info__ <= (0, 7, 0, 'release'):
-        raise nose.SkipTest("This test doesn't pass in `python_toolbox`"
+        raise nose.SkipTest("This test doesn't pass in `python_toolbox` "
                             "version 0.7.0 and below.")
     assert describe({1: sum}) == '{1: sum}'
     assert describe((sum, sum, list, chr)) == '(sum, sum, list, chr)'
diff --git a/source_py3/test_python_toolbox/test_misc_tools/test_overridable_property.py b/source_py3/test_python_toolbox/test_misc_tools/test_overridable_property.py
@@ -0,0 +1,22 @@
+# Copyright 2009-2015 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox import cute_testing
+
+from python_toolbox.misc_tools import OverridableProperty
+
+
+def test():
+    class A:
+        @OverridableProperty
+        def meow(self):
+            return 'bark bark!'
+        
+    a = A()
+    assert a.meow == 'bark bark!'
+    assert a.meow == 'bark bark!'
+    assert a.meow == 'bark bark!'
+    a.meow = 'Meow indeed, ma chérie.'
+    assert a.meow == 'Meow indeed, ma chérie.'
+            
+            
