Compare commits

...

4 Commits

Author SHA1 Message Date
Wei guangjing 92df174c95 0.3, fix:
- Remote{Execute, Call} 漏掉了错误消息
- Decode日期时间微秒应该除1000
2022-06-13 19:57:38 +08:00
Wei guangjing 560885b44d pyTSLPy.py -> pyTSLPy/__init__.py 2022-06-12 21:36:58 +08:00
Wei guangjing 4bb11a026e 增加setup.py 2022-06-11 17:40:01 +08:00
Wei guangjing 91f490ff45 fix bugs 2022-06-11 14:42:04 +08:00
2 changed files with 28 additions and 17 deletions

View File

@ -19,9 +19,9 @@ def connectOptions(alias):
f = connectConfigFile
else:
f = 'tslclient.ini'
config = configparser.ConfigParser()
config = configparser.ConfigParser(delimiters=('=',))
config.read(f)
if alias in config:
if alias in config.sections():
return config[alias]
return {}
@ -90,7 +90,7 @@ def GetComputeBitsOption():
def GetService():
global defaultConnection
if defaultConnection:
defaultConnection.default_service()
return defaultConnection.default_service()
def parse_params(params):
@ -100,7 +100,7 @@ def parse_params(params):
if 'Cycle' in params:
pp['cycle'] = params['Cycle']
if 'CurrentDate' in params:
pp['time'] = params['CurrentDate']
pp['time'] = pyTSL.DoubleToDatetime(params['CurrentDate'])
if 'bRate' in params:
pp['rate'] = params['bRate']
if 'RateDay' in params:
@ -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, '连接错误'
@ -131,19 +131,11 @@ def RemoteCallFunc(func, args, params):
global defaultConnection
if defaultConnection:
pp = parse_params(params)
r = defaultConnection.clas(func, *args, **pp)
return r.error(), r.value()
r = defaultConnection.call(func, *args, **pp)
return r.error(), r.value(), r.message()
return -1, '连接错误'
def SetSysParam():
assert 0
def GetSysParam():
assert 0
def EncodeDate(y, m, d):
return pyTSL.DatetimeToDouble(datetime.datetime(y, m, d))
@ -163,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__':

19
setup.py Normal file
View File

@ -0,0 +1,19 @@
from setuptools import setup
setup(
name="pyTSLPy",
version="0.3",
author="Wei guangjing",
author_email="vcc@py3k.cn",
description="用pyTSL模拟TSLPy",
url="https://py3k.cn/pyTSLPy/",
packages=['pyTSLPy'],
install_requires=['tspytsl>=1.0'],
classifiers = [
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3'
]
)