Fix py2.x inspect.getargspec

README.md

@@ -13,7 +13,7 @@ Disco is currently in an early-alpha phase. What you see today may change a lot
 
 ## Installation
 
-Disco was built to run both as a generic-use library, and a standalone bot toolkit. Installing disco is as easy as running `pip install disco`, however some extra packages are recommended for power-users, namely:
+Disco was built to run both as a generic-use library, and a standalone bot toolkit. Installing disco is as easy as running `pip install disco-py`, however some extra packages are recommended for power-users, namely:
 
 |Name|Reason|
 |----|------|

disco/types/base.py

@@ -11,9 +11,10 @@ DATETIME_FORMATS = [
 
 
 def _make(typ, data, client):
-    args, _, _, _ = inspect.getargspec(typ)
-    if 'client' in args:
-        return typ(data, client)
+    if inspect.isfunction(typ):
+        args, _, _, _ = inspect.getargspec(typ)
+        if 'client' in args:
+            return typ(data, client)
     return typ(data)
 
 
@@ -118,7 +119,7 @@ class Model(six.with_metaclass(ModelMeta)):
                 continue
 
             try:
-                if client:
+                if client and inspect.isfunction(typ):
                     args, _, _, _ = inspect.getargspec(typ)
                     if 'client' in args:
                         v = typ(obj[name], client)
@@ -146,7 +147,6 @@ class Model(six.with_metaclass(ModelMeta)):
             if isinstance(getattr(type(self), name), property):
                 delattr(self, name)
 
-
     @classmethod
     def create(cls, client, data):
         return cls(data, client)