diff --git a/tools/output/vehroute2amitranOD.py b/tools/output/vehroute2amitranOD.py index ef25893162f7..b5208fcc7a1d 100755 --- a/tools/output/vehroute2amitranOD.py +++ b/tools/output/vehroute2amitranOD.py @@ -25,6 +25,7 @@ import sumolib # noqa from sumolib.options import ArgumentParser # noqa + def convert(vehRoutes, routeOut, odOut, interval): routeDict = {} actorConfig = defaultdict(list) # map type -> list of time slices @@ -87,10 +88,10 @@ def convert(vehRoutes, routeOut, odOut, interval): if __name__ == "__main__": argParser = ArgumentParser() argParser.add_argument("-r", "--routes", default='routes.xml', category="input", - help="name of the amitran route file output [default: %(default)s]") + help="name of the amitran route file output [default: %(default)s]") argParser.add_argument("-o", "--od-file", default='od.xml', category="output", - help="name of the amitran O/D file output [default: %(default)s]") + help="name of the amitran O/D file output [default: %(default)s]") argParser.add_argument("-i", "--interval", default=3600, type=int, - help="aggregation interval in seconds [default: %(default)s]") + help="aggregation interval in seconds [default: %(default)s]") (options, args) = argParser.parse_args() convert(args[0], options.routes, options.od_file, options.interval) diff --git a/tools/traci/exceptions.py b/tools/traci/exceptions.py index 7476c4f373e4..5fafe0ca1313 100644 --- a/tools/traci/exceptions.py +++ b/tools/traci/exceptions.py @@ -50,6 +50,8 @@ def alias_param(param, alias, deprecate=True): subst = [(param, alias)] else: subst = list(zip(param, alias)) + + def decorator(func): @functools.wraps(func) def wrapper(*args, **kwargs):