From 0b48de0bfd505642a70c8b947ab51d56c3191501 Mon Sep 17 00:00:00 2001 From: Andrei Date: Fri, 7 Oct 2016 04:31:01 -0500 Subject: [PATCH] Fix py2.x inspect.getargspec --- README.md | 2 +- disco/types/base.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d19c5af..564b1b3 100644 --- a/README.md +++ b/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| |----|------| diff --git a/disco/types/base.py b/disco/types/base.py index 6ffab85..1802e01 100644 --- a/disco/types/base.py +++ b/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)