Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop' of github.com:marrow/marrow.interface into dev…

…elop
  • Loading branch information...
commit e6110bf60af276ec032fa186823a4e4e22166615 2 parents 5a4b16e + 8df3c87
@amcgregor amcgregor authored
Showing with 4 additions and 3 deletions.
  1. +2 −2 README.textile
  2. +2 −1  marrow/interface/core.py
View
4 README.textile
@@ -149,7 +149,7 @@ table(arguments).
Additionally there are two subclasses of Property that accept no additional arguments:
table(classes).
-|_. Argument |_. Description |
+|_. Class |_. Description |
| @ClassProperty@ | Ensure the property is defined at the class level and not overridden in the instance. |
| @InstanceProperty@ | The inverse of the above; ensure this value is set or overridden in the instance. |
@@ -169,7 +169,7 @@ table(arguments).
Additionally there are three subclasses of Callable that accept no additional arguments:
table(classes).
-|_. Argument |_. Description |
+|_. Class |_. Description |
| @Method@ | Ensure the callable is a true class method, e.g. not a lambda or plain function. |
| @ClassMethod@ | A method defined using teh @classmethod@ decorator. |
| @StaticMethod@ | A method defined using the @staticmethod@ decorator. |
View
3  marrow/interface/core.py
@@ -7,6 +7,7 @@
__all__ = ['InterfaceMeta', 'Interface']
+ALLOWED_PROPERTIES = ('__doc__', '__module__', '__assume_interface__')
class InterfaceMeta(type):
@@ -19,7 +20,7 @@ def __new__(meta, name, bases, attrs):
abstract = dict()
for key in attrs:
- if key in ('__module__', '__assume_interface__'):
+ if key in ALLOWED_PROPERTIES:
continue
value = attrs[key]
Please sign in to comment.
Something went wrong with that request. Please try again.