#6 tests pass y'all

codado/py.py

@@ -20,6 +20,12 @@
 from crosscap.doc import Documentation as _Documentation, doc as _doc
 
 
+if hasattr(inspect, 'getfullargspec'): # pragma: nocover
+    getargspec = inspect.getfullargspec
+else: # pragma: nocover
+    getargspec = inspect.getargspec
+
+
 EMOJI = u'👻👾🤖😼💫👒🎩🐶🦎🐚🌸🌲🍋🥝🥑🥐🍿🥄⛺🚂🚲🌈🏆🎵💡✏🖍📌🛡♻'
 
 
@@ -49,12 +55,20 @@ def eachMethod(decorator, methodFilter=lambda fName: True):
         prefix = methodFilter
         methodFilter = lambda fName: fName.startswith(prefix)
 
-    ismethod = lambda fn: inspect.ismethod(fn) or inspect.ismethoddescriptor(fn)
+    ismethod = lambda fn: inspect.ismethod(fn) or inspect.isfunction(fn)
 
     def innerDeco(cls):
+        assert inspect.isclass(cls), "eachMethod is designed to be used only on classes"
         for fName, fn in inspect.getmembers(cls):
-            if ismethod(fn) and methodFilter(fName):
-                setattr(cls, fName, decorator(fn))
+            if methodFilter(fName):
+                if ismethod(fn):
+                    # We attempt to avoid decorating staticmethods by looking for an arg named cls
+                    # or self; this is a kludge, but there's no other way to tell, and
+                    # staticmethods do not work correctly with eachMethod
+                    if getargspec(fn).args[0] not in ['cls', 'self']:
+                        continue
+
+                    setattr(cls, fName, decorator(fn))
 
         return cls
     return innerDeco