Skip to content

Commit 3823eb2

Browse files
committed
⚫ string normalization
1 parent eed0f8d commit 3823eb2

File tree

11 files changed

+386
-377
lines changed

11 files changed

+386
-377
lines changed

src/roslibpy/__init__.py

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,35 @@ class and are passed around via :class:`Topics <Topic>` using a **publish/subscr
100100
__url__,
101101
__version__,
102102
)
103-
from .core import Header, Message, Param, Service, ServiceRequest, ServiceResponse, Time, Topic
104-
from .ros import set_rosapi_timeout, Ros
103+
from .core import (
104+
Header,
105+
Message,
106+
Param,
107+
Service,
108+
ServiceRequest,
109+
ServiceResponse,
110+
Time,
111+
Topic,
112+
)
113+
from .ros import Ros, set_rosapi_timeout
105114

106115
__all__ = [
107-
'__author__',
108-
'__author_email__',
109-
'__copyright__',
110-
'__description__',
111-
'__license__',
112-
'__title__',
113-
'__url__',
114-
'__version__',
115-
'Header',
116-
'Message',
117-
'Param',
118-
'Service',
119-
'ServiceRequest',
120-
'ServiceResponse',
121-
'Time',
122-
'Topic',
123-
'set_rosapi_timeout',
124-
'Ros',
116+
"__author__",
117+
"__author_email__",
118+
"__copyright__",
119+
"__description__",
120+
"__license__",
121+
"__title__",
122+
"__url__",
123+
"__version__",
124+
"Header",
125+
"Message",
126+
"Param",
127+
"Service",
128+
"ServiceRequest",
129+
"ServiceResponse",
130+
"Time",
131+
"Topic",
132+
"set_rosapi_timeout",
133+
"Ros",
125134
]

src/roslibpy/__main__.py

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ def rosservice_find(ros, type, **kwargs):
4040

4141
def rossrv_info(ros, type, **kwargs):
4242
_print_type(ros.get_service_request_details(type))
43-
print('---')
43+
print("---")
4444
_print_type(ros.get_service_response_details(type))
4545

4646

4747
def rosservice_info(ros, service, **kwargs):
4848
type_name = ros.get_service_type(service)
4949

50-
print('Type: %s\n' % type_name)
51-
print('Message definition')
52-
print('------------------')
50+
print("Type: %s\n" % type_name)
51+
print("Message definition")
52+
print("------------------")
5353

5454
rossrv_info(ros, type_name)
5555

@@ -73,117 +73,117 @@ def rosparam_delete(ros, param, **kwargs):
7373

7474
def _print_typedef(typedef, def_map, level):
7575
defs = def_map[typedef]
76-
for fname, ftype, flen in zip(defs['fieldnames'], defs['fieldtypes'], defs['fieldarraylen']):
76+
for fname, ftype, flen in zip(defs["fieldnames"], defs["fieldtypes"], defs["fieldarraylen"]):
7777
if flen == -1:
7878
ftype_info = ftype
7979
elif flen == 0:
80-
ftype_info = ftype + '[]'
80+
ftype_info = ftype + "[]"
8181
else:
82-
ftype_info = '%s[%d]' % (ftype, flen)
82+
ftype_info = "%s[%d]" % (ftype, flen)
8383

84-
print('%s%s %s' % (' ' * level, ftype_info, fname))
84+
print("%s%s %s" % (" " * level, ftype_info, fname))
8585
if ftype in def_map:
8686
_print_typedef(ftype, def_map, level + 1)
8787

8888

8989
def _print_type(typedata):
90-
if len(typedata['typedefs']) == 0:
90+
if len(typedata["typedefs"]) == 0:
9191
return
9292

93-
main_type = typedata['typedefs'][0]['type']
94-
def_map = {typedef['type']: typedef for typedef in typedata['typedefs']}
93+
main_type = typedata["typedefs"][0]["type"]
94+
def_map = {typedef["type"]: typedef for typedef in typedata["typedefs"]}
9595
_print_typedef(main_type, def_map, 0)
9696

9797

9898
def main():
9999
import argparse
100100

101-
parser = argparse.ArgumentParser(description='roslibpy command-line utility')
102-
parser.add_argument('-r', '--ros-host', type=str, help='ROS host name or IP address', default='localhost')
103-
parser.add_argument('-p', '--ros-port', type=int, help='ROS bridge port', default=9090)
101+
parser = argparse.ArgumentParser(description="roslibpy command-line utility")
102+
parser.add_argument("-r", "--ros-host", type=str, help="ROS host name or IP address", default="localhost")
103+
parser.add_argument("-p", "--ros-port", type=int, help="ROS bridge port", default=9090)
104104

105-
commands = parser.add_subparsers(help='commands')
106-
commands.dest = 'command'
105+
commands = parser.add_subparsers(help="commands")
106+
commands.dest = "command"
107107
commands.required = True
108108

109109
# Command: topic
110-
topic_command = commands.add_parser('topic', help='ROS Topics')
111-
topic_subcommands = topic_command.add_subparsers(help='ROS topic commands')
112-
topic_subcommands.dest = 'subcommand'
110+
topic_command = commands.add_parser("topic", help="ROS Topics")
111+
topic_subcommands = topic_command.add_subparsers(help="ROS topic commands")
112+
topic_subcommands.dest = "subcommand"
113113
topic_subcommands.required = True
114114

115-
topic_list_parser = topic_subcommands.add_parser('list', help='List available ROS topics')
115+
topic_list_parser = topic_subcommands.add_parser("list", help="List available ROS topics")
116116
topic_list_parser.set_defaults(func=rostopic_list)
117117

118-
topic_type_parser = topic_subcommands.add_parser('type', help='ROS topic type')
119-
topic_type_parser.add_argument('topic', action='store', type=str, help='Topic name')
118+
topic_type_parser = topic_subcommands.add_parser("type", help="ROS topic type")
119+
topic_type_parser.add_argument("topic", action="store", type=str, help="Topic name")
120120
topic_type_parser.set_defaults(func=rostopic_type)
121121

122-
topic_find_parser = topic_subcommands.add_parser('find', help='ROS topics by type')
123-
topic_find_parser.add_argument('type', action='store', type=str, help='Type name')
122+
topic_find_parser = topic_subcommands.add_parser("find", help="ROS topics by type")
123+
topic_find_parser.add_argument("type", action="store", type=str, help="Type name")
124124
topic_find_parser.set_defaults(func=rostopic_find)
125125

126126
# Command: msg
127-
msg_command = commands.add_parser('msg', help='ROS Message type information')
128-
msg_subcommands = msg_command.add_subparsers(help='ROS Message type commands')
129-
msg_subcommands.dest = 'subcommand'
127+
msg_command = commands.add_parser("msg", help="ROS Message type information")
128+
msg_subcommands = msg_command.add_subparsers(help="ROS Message type commands")
129+
msg_subcommands.dest = "subcommand"
130130
msg_subcommands.required = True
131131

132-
msg_info_parser = msg_subcommands.add_parser('info', help='ROS message type information')
133-
msg_info_parser.add_argument('type', action='store', type=str, help='Message type')
132+
msg_info_parser = msg_subcommands.add_parser("info", help="ROS message type information")
133+
msg_info_parser.add_argument("type", action="store", type=str, help="Message type")
134134
msg_info_parser.set_defaults(func=rosmsg_info)
135135

136136
# Command: service
137-
service_command = commands.add_parser('service', help='ROS Services')
138-
service_subcommands = service_command.add_subparsers(help='ROS service commands')
139-
service_subcommands.dest = 'subcommand'
137+
service_command = commands.add_parser("service", help="ROS Services")
138+
service_subcommands = service_command.add_subparsers(help="ROS service commands")
139+
service_subcommands.dest = "subcommand"
140140
service_subcommands.required = True
141141

142-
service_list_parser = service_subcommands.add_parser('list', help='List available ROS services')
142+
service_list_parser = service_subcommands.add_parser("list", help="List available ROS services")
143143
service_list_parser.set_defaults(func=rosservice_list)
144144

145-
service_type_parser = service_subcommands.add_parser('type', help='ROS service type')
146-
service_type_parser.add_argument('service', action='store', type=str, help='Service name')
145+
service_type_parser = service_subcommands.add_parser("type", help="ROS service type")
146+
service_type_parser.add_argument("service", action="store", type=str, help="Service name")
147147
service_type_parser.set_defaults(func=rosservice_type)
148148

149-
service_find_parser = service_subcommands.add_parser('find', help='ROS services by type')
150-
service_find_parser.add_argument('type', action='store', type=str, help='Type name')
149+
service_find_parser = service_subcommands.add_parser("find", help="ROS services by type")
150+
service_find_parser.add_argument("type", action="store", type=str, help="Type name")
151151
service_find_parser.set_defaults(func=rosservice_find)
152152

153-
service_info_parser = service_subcommands.add_parser('info', help='ROS service information')
154-
service_info_parser.add_argument('service', action='store', type=str, help='Service name')
153+
service_info_parser = service_subcommands.add_parser("info", help="ROS service information")
154+
service_info_parser.add_argument("service", action="store", type=str, help="Service name")
155155
service_info_parser.set_defaults(func=rosservice_info)
156156

157157
# Command: srv
158-
srv_command = commands.add_parser('srv', help='ROS Service type information')
159-
srv_subcommands = srv_command.add_subparsers(help='ROS service type commands')
160-
srv_subcommands.dest = 'subcommand'
158+
srv_command = commands.add_parser("srv", help="ROS Service type information")
159+
srv_subcommands = srv_command.add_subparsers(help="ROS service type commands")
160+
srv_subcommands.dest = "subcommand"
161161
srv_subcommands.required = True
162162

163-
srv_info_parser = srv_subcommands.add_parser('info', help='ROS service type information')
164-
srv_info_parser.add_argument('type', action='store', type=str, help='Service type')
163+
srv_info_parser = srv_subcommands.add_parser("info", help="ROS service type information")
164+
srv_info_parser.add_argument("type", action="store", type=str, help="Service type")
165165
srv_info_parser.set_defaults(func=rossrv_info)
166166

167167
# Command: param
168-
param_command = commands.add_parser('param', help='ROS Params')
169-
param_subcommands = param_command.add_subparsers(help='ROS parameter commands')
170-
param_subcommands.dest = 'subcommand'
168+
param_command = commands.add_parser("param", help="ROS Params")
169+
param_subcommands = param_command.add_subparsers(help="ROS parameter commands")
170+
param_subcommands.dest = "subcommand"
171171
param_subcommands.required = True
172172

173-
param_list_parser = param_subcommands.add_parser('list', help='List available ROS parameters')
173+
param_list_parser = param_subcommands.add_parser("list", help="List available ROS parameters")
174174
param_list_parser.set_defaults(func=rosparam_list)
175175

176-
param_set_parser = param_subcommands.add_parser('set', help='Set ROS param value')
177-
param_set_parser.add_argument('param', action='store', type=str, help='Param name')
178-
param_set_parser.add_argument('value', action='store', type=str, help='Param value')
176+
param_set_parser = param_subcommands.add_parser("set", help="Set ROS param value")
177+
param_set_parser.add_argument("param", action="store", type=str, help="Param name")
178+
param_set_parser.add_argument("value", action="store", type=str, help="Param value")
179179
param_set_parser.set_defaults(func=rosparam_set)
180180

181-
param_get_parser = param_subcommands.add_parser('get', help='Get ROS param value')
182-
param_get_parser.add_argument('param', action='store', type=str, help='Param name')
181+
param_get_parser = param_subcommands.add_parser("get", help="Get ROS param value")
182+
param_get_parser.add_argument("param", action="store", type=str, help="Param name")
183183
param_get_parser.set_defaults(func=rosparam_get)
184184

185-
param_delete_parser = param_subcommands.add_parser('delete', help='Delete ROS param')
186-
param_delete_parser.add_argument('param', action='store', type=str, help='Param name')
185+
param_delete_parser = param_subcommands.add_parser("delete", help="Delete ROS param")
186+
param_delete_parser.add_argument("param", action="store", type=str, help="Param name")
187187
param_delete_parser.set_defaults(func=rosparam_delete)
188188

189189
# Invoke
@@ -197,5 +197,5 @@ def main():
197197
ros.terminate()
198198

199199

200-
if __name__ == '__main__':
200+
if __name__ == "__main__":
201201
main()

src/roslibpy/__version__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# 72 6F 73 6C 69 62 70 79
22
# 47 72 61 6D 61 7A 69 6F 4B 6F 68 6C 65 72 52 65 73 65 61 72 63 68
33

4-
__title__ = 'roslibpy'
5-
__description__ = 'Python ROS Bridge library.'
6-
__url__ = 'https://github.com/gramaziokohler/roslibpy'
7-
__version__ = '1.3.0'
8-
__author__ = 'Gramazio Kohler Research'
9-
__author_email__ = '[email protected]'
10-
__license__ = 'MIT license'
11-
__copyright__ = 'Copyright 2018 Gramazio Kohler Research'
4+
__title__ = "roslibpy"
5+
__description__ = "Python ROS Bridge library."
6+
__url__ = "https://github.com/gramaziokohler/roslibpy"
7+
__version__ = "1.3.0"
8+
__author__ = "Gramazio Kohler Research"
9+
__author_email__ = "[email protected]"
10+
__license__ = "MIT license"
11+
__copyright__ = "Copyright 2018 Gramazio Kohler Research"

0 commit comments

Comments
 (0)