Merge pull request #160 from whtsky/inspect

Close #158

docs/changelog.rst

@@ -22,6 +22,7 @@ Version 1.0.0
 + 将图文消息单个消息的渲染函数放到 :class:`werobot.replies.Article` 内
 + 取消对 Python2.6, Python3.3 的支持
 + 增加与 Django 1.6+, Flask, Bottle, Tornado 集成的支持
++ 替换 `inspect.getargspec()` 
 
 Version 0.6.1
 ----------------

requirements.txt

@@ -1,4 +1,4 @@
 bottle
 requests
 six
-xmltodict
+xmltodict

setup.py

@@ -3,13 +3,19 @@
 
 import io
 import werobot
+import platform
 
 from setuptools import setup, find_packages
 
 with io.open("README.rst", encoding="utf8") as f:
     readme = f.read().replace("develop", "master")
 readme = readme.replace("latest", werobot.__version__)
 
+version = platform.python_version_tuple()
+install_requires = open("requirements.txt").readlines()
+if version < ('3', '3'):
+    install_requires.append('funcsigs')
+
 setup(
     name='WeRoBot',
     version=werobot.__version__,
@@ -23,7 +29,7 @@
     setup_requires=[
         'pytest-runner',
     ],
-    install_requires=open("requirements.txt").readlines(),
+    install_requires=install_requires,
     include_package_data=True,
     license='MIT License',
     classifiers=[

travis/script.sh

@@ -3,5 +3,6 @@
 if [ $PYTHON_INSTALL_METHOD == "tox" ]; then
   env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include" tox
 else
+  python setup.py install
   coverage run --source werobot -m py.test
 fi

werobot/robot.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import six
-import inspect
 
 import werobot
 
@@ -12,6 +11,11 @@
 from werobot.replies import process_function_reply
 from werobot.utils import to_binary, to_text, check_signature
 
+try:
+    from inspect import signature
+except ImportError:
+    from funcsigs import signature
+
 __all__ = ['BaseRoBot', 'WeRoBot']
 
 _DEFAULT_CONFIG = dict(
@@ -189,7 +193,7 @@ def key_click(self, key):
         """
 
         def wraps(f):
-            argc = len(inspect.getargspec(f).args)
+            argc = len(signature(f).parameters.keys())
 
             @self.click
             def onclick(message, session=None):
@@ -234,7 +238,7 @@ def wraps(f):
                 for x in args:
                     self.filter(x)(f)
                 return f
-            argc = len(inspect.getargspec(f).args)
+            argc = len(signature(f).parameters.keys())
 
             @self.text
             def _f(message, session=None):
@@ -252,7 +256,7 @@ def add_handler(self, func, type='all'):
         if not callable(func):
             raise ValueError("{} is not callable".format(func))
 
-        self._handlers[type].append((func, len(inspect.getargspec(func).args)))
+        self._handlers[type].append((func, len(signature(func).parameters.keys())))
 
     def get_handlers(self, type):
         return self._handlers.get(type, []) + self._handlers['all']