The parser module is now called paenlparser.

diff --git a/Lib/irix5/panel.py b/Lib/irix5/panel.py
index eb115086f669966a293463b10af96cb2ce1f0da1..9fda1c6633c05e6deb8f254729aa6f99d474b825 100755 (executable)
--- a/Lib/irix5/panel.py
+++ b/Lib/irix5/panel.py
@@ -152,7 +152,7 @@ def build_actuator(descr):
        act = pnl.mkact(type)
        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
        #
@@ -162,7 +162,7 @@ def build_actuator(descr):
                prefix = 'puck_'
        elif type = 'mouse':
                prefix = 'mouse_'
-       assign_members(act, datalist, (), prefix)
+       assign_members(act, datalist, [], prefix)
        #
        return act, actuatorname
 
@@ -218,7 +218,7 @@ def build_panel(descr):
        #
        # Assign panel attributes
        #
-       assign_members(panel, descr[1:], ('al'), '')
+       assign_members(panel, descr[1:], ['al'], '')
        #
        # Look for actuator list
        #
@@ -264,8 +264,8 @@ def my_dopanel():
 # generated by the Panel Editor.
 # 
 def defpanellist(file):
-       import parser
-       descrlist = parser.parse_file(open(file, 'r'))
+       import panelparser
+       descrlist = panelparser.parse_file(open(file, 'r'))
        panellist = []
        for descr in descrlist:
                panellist.append(build_panel(descr))

diff --git a/Lib/plat-irix5/panel.py b/Lib/plat-irix5/panel.py
index eb115086f669966a293463b10af96cb2ce1f0da1..9fda1c6633c05e6deb8f254729aa6f99d474b825 100755 (executable)
--- a/Lib/plat-irix5/panel.py
+++ b/Lib/plat-irix5/panel.py
@@ -152,7 +152,7 @@ def build_actuator(descr):
        act = pnl.mkact(type)
        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
        #
@@ -162,7 +162,7 @@ def build_actuator(descr):
                prefix = 'puck_'
        elif type = 'mouse':
                prefix = 'mouse_'
-       assign_members(act, datalist, (), prefix)
+       assign_members(act, datalist, [], prefix)
        #
        return act, actuatorname
 
@@ -218,7 +218,7 @@ def build_panel(descr):
        #
        # Assign panel attributes
        #
-       assign_members(panel, descr[1:], ('al'), '')
+       assign_members(panel, descr[1:], ['al'], '')
        #
        # Look for actuator list
        #
@@ -264,8 +264,8 @@ def my_dopanel():
 # generated by the Panel Editor.
 # 
 def defpanellist(file):
-       import parser
-       descrlist = parser.parse_file(open(file, 'r'))
+       import panelparser
+       descrlist = panelparser.parse_file(open(file, 'r'))
        panellist = []
        for descr in descrlist:
                panellist.append(build_panel(descr))