* Lib/sgi/flp.py: fix caching bug (always write the whole file to

	the cache!)

diff --git a/Lib/irix5/flp.py b/Lib/irix5/flp.py
index bc4a8ab00f199db1ece7be1053b5897b692fb2d9..84c40aa0ba4812d78bc4dd6da4ac4375cf65035a 100755 (executable)
--- a/Lib/irix5/flp.py
+++ b/Lib/irix5/flp.py
@@ -23,22 +23,12 @@ error = 'flp.error'
 #
 def parse_form(filename, formname):
     forms = checkcache(filename)
-    if forms != None:
-       if forms.has_key(formname):
-           return forms[formname]
-    else:
-       forms = {}
-    fp = _open_formfile(filename)
-    nforms = _parse_fd_header(fp)
-    for i in range(nforms):
-       form = _parse_fd_form(fp, formname)
-       if form <> None:
-           break
+    if forms is None:
+       forms = parse_forms(filename)
+    if forms.has_key(formname):
+       return forms[formname]
     else:
        raise error, 'No such form in fd file'
-    forms[formname] = form
-    writecache(filename, forms)
-    return form
 
 #
 # Externally visible function. Load all forms.

diff --git a/Lib/plat-irix5/flp.py b/Lib/plat-irix5/flp.py
index bc4a8ab00f199db1ece7be1053b5897b692fb2d9..84c40aa0ba4812d78bc4dd6da4ac4375cf65035a 100755 (executable)
--- a/Lib/plat-irix5/flp.py
+++ b/Lib/plat-irix5/flp.py
@@ -23,22 +23,12 @@ error = 'flp.error'
 #
 def parse_form(filename, formname):
     forms = checkcache(filename)
-    if forms != None:
-       if forms.has_key(formname):
-           return forms[formname]
-    else:
-       forms = {}
-    fp = _open_formfile(filename)
-    nforms = _parse_fd_header(fp)
-    for i in range(nforms):
-       form = _parse_fd_form(fp, formname)
-       if form <> None:
-           break
+    if forms is None:
+       forms = parse_forms(filename)
+    if forms.has_key(formname):
+       return forms[formname]
     else:
        raise error, 'No such form in fd file'
-    forms[formname] = form
-    writecache(filename, forms)
-    return form
 
 #
 # Externally visible function. Load all forms.