Commit 220d9f14 authored by Guido van Rossum's avatar Guido van Rossum

The parser module is now called paenlparser.

parent 52cea430
...@@ -152,7 +152,7 @@ def build_actuator(descr): ...@@ -152,7 +152,7 @@ def build_actuator(descr):
act = pnl.mkact(type) act = pnl.mkact(type)
act.downfunc = act.activefunc = act.upfunc = dummy_callback act.downfunc = act.activefunc = act.upfunc = dummy_callback
# #
assign_members(act, descr[1:], ('al', 'data', 'name'), '') assign_members(act, descr[1:], ['al', 'data', 'name'], '')
# #
# Treat actuator-specific data # Treat actuator-specific data
# #
...@@ -162,7 +162,7 @@ def build_actuator(descr): ...@@ -162,7 +162,7 @@ def build_actuator(descr):
prefix = 'puck_' prefix = 'puck_'
elif type = 'mouse': elif type = 'mouse':
prefix = 'mouse_' prefix = 'mouse_'
assign_members(act, datalist, (), prefix) assign_members(act, datalist, [], prefix)
# #
return act, actuatorname return act, actuatorname
...@@ -218,7 +218,7 @@ def build_panel(descr): ...@@ -218,7 +218,7 @@ def build_panel(descr):
# #
# Assign panel attributes # Assign panel attributes
# #
assign_members(panel, descr[1:], ('al'), '') assign_members(panel, descr[1:], ['al'], '')
# #
# Look for actuator list # Look for actuator list
# #
...@@ -264,8 +264,8 @@ def my_dopanel(): ...@@ -264,8 +264,8 @@ def my_dopanel():
# generated by the Panel Editor. # generated by the Panel Editor.
# #
def defpanellist(file): def defpanellist(file):
import parser import panelparser
descrlist = parser.parse_file(open(file, 'r')) descrlist = panelparser.parse_file(open(file, 'r'))
panellist = [] panellist = []
for descr in descrlist: for descr in descrlist:
panellist.append(build_panel(descr)) panellist.append(build_panel(descr))
......
...@@ -152,7 +152,7 @@ def build_actuator(descr): ...@@ -152,7 +152,7 @@ def build_actuator(descr):
act = pnl.mkact(type) act = pnl.mkact(type)
act.downfunc = act.activefunc = act.upfunc = dummy_callback act.downfunc = act.activefunc = act.upfunc = dummy_callback
# #
assign_members(act, descr[1:], ('al', 'data', 'name'), '') assign_members(act, descr[1:], ['al', 'data', 'name'], '')
# #
# Treat actuator-specific data # Treat actuator-specific data
# #
...@@ -162,7 +162,7 @@ def build_actuator(descr): ...@@ -162,7 +162,7 @@ def build_actuator(descr):
prefix = 'puck_' prefix = 'puck_'
elif type = 'mouse': elif type = 'mouse':
prefix = 'mouse_' prefix = 'mouse_'
assign_members(act, datalist, (), prefix) assign_members(act, datalist, [], prefix)
# #
return act, actuatorname return act, actuatorname
...@@ -218,7 +218,7 @@ def build_panel(descr): ...@@ -218,7 +218,7 @@ def build_panel(descr):
# #
# Assign panel attributes # Assign panel attributes
# #
assign_members(panel, descr[1:], ('al'), '') assign_members(panel, descr[1:], ['al'], '')
# #
# Look for actuator list # Look for actuator list
# #
...@@ -264,8 +264,8 @@ def my_dopanel(): ...@@ -264,8 +264,8 @@ def my_dopanel():
# generated by the Panel Editor. # generated by the Panel Editor.
# #
def defpanellist(file): def defpanellist(file):
import parser import panelparser
descrlist = parser.parse_file(open(file, 'r')) descrlist = panelparser.parse_file(open(file, 'r'))
panellist = [] panellist = []
for descr in descrlist: for descr in descrlist:
panellist.append(build_panel(descr)) panellist.append(build_panel(descr))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment