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

	the cache!)

2 files changed, 8 insertions, 28 deletions

diff --git a/Lib/irix5/flp.py b/Lib/irix5/flp.py
index bc4a8ab..84c40aa 100755
--- 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 bc4a8ab..84c40aa 100755
--- 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.