diff --git a/pyTSLPy/__init__.py b/pyTSLPy/__init__.py index f29e84b..7f62d1a 100644 --- a/pyTSLPy/__init__.py +++ b/pyTSLPy/__init__.py @@ -123,7 +123,7 @@ def RemoteExecute(script, params): if defaultConnection: pp = parse_params(params) r = defaultConnection.exec(script, **pp) - return r.error(), r.value() + return r.error(), r.value(), r.message() return -1, '连接错误' @@ -132,7 +132,7 @@ def RemoteCallFunc(func, args, params): if defaultConnection: pp = parse_params(params) r = defaultConnection.call(func, *args, **pp) - return r.error(), r.value() + return r.error(), r.value(), r.message() return -1, '连接错误' @@ -155,12 +155,12 @@ def DecodeDate(dt): def DecodeTime(dt): d = pyTSL.DoubleToDatetime(dt) - return d.hour, d.minute, d.second, d.microsecond * 1000 + return d.hour, d.minute, d.second, d.microsecond / 1000 def DecodeDateTime(dt): d = pyTSL.DoubleToDatetime(dt) - return d.year, d.month, d.day, d.hour, d.minute, d.second, d.microsecond * 1000 + return d.year, d.month, d.day, d.hour, d.minute, d.second, d.microsecond / 1000 if __name__ == '__main__': diff --git a/setup.py b/setup.py index be3d1d9..dd195b3 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="pyTSLPy", - version="0.2", + version="0.3", author="Wei guangjing", author_email="vcc@py3k.cn", description="用pyTSL模拟TSLPy",