From 24e77d429de289383070219872f364ad2059354c Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 25 Mar 1992 14:53:05 +0000 Subject: [PATCH] Commented out debug print statements; be a little more clever about strings containing backslashes. --- Lib/irix5/flp.py | 14 ++++++++++---- Lib/plat-irix5/flp.py | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Lib/irix5/flp.py b/Lib/irix5/flp.py index e67e995bc6d..e6608f8053c 100755 --- a/Lib/irix5/flp.py +++ b/Lib/irix5/flp.py @@ -67,7 +67,7 @@ def checkcache(filename): try: fp = open(cachename, 'r') except IOError: - print 'flp: no cache file', cachename + #print 'flp: no cache file', cachename return None try: if fp.read(4) != MAGIC: @@ -76,9 +76,9 @@ def checkcache(filename): cache_mtime = rdlong(fp) file_mtime = getmtime(filename) if cache_mtime != file_mtime: - print 'flp: outdated cache file', cachename + #print 'flp: outdated cache file', cachename return None - print 'flp: valid cache file', cachename + #print 'flp: valid cache file', cachename altforms = marshal.load(fp) forms = {} for name in altforms.keys(): @@ -139,7 +139,7 @@ def writecache(filename, forms): fp.seek(0) fp.write(MAGIC) fp.close() - print 'flp: wrote cache file', cachename + #print 'flp: wrote cache file', cachename # # Internal: Locate form file (using PYTHONPATH) and open file @@ -218,6 +218,12 @@ def make(self, dict): # Internal parsing routines. # def _parse_string(str): + if '\\' in str: + s = '\'' + str + '\'' + try: + return eval(s) + except: + pass return str def _parse_num(str): diff --git a/Lib/plat-irix5/flp.py b/Lib/plat-irix5/flp.py index e67e995bc6d..e6608f8053c 100755 --- a/Lib/plat-irix5/flp.py +++ b/Lib/plat-irix5/flp.py @@ -67,7 +67,7 @@ def checkcache(filename): try: fp = open(cachename, 'r') except IOError: - print 'flp: no cache file', cachename + #print 'flp: no cache file', cachename return None try: if fp.read(4) != MAGIC: @@ -76,9 +76,9 @@ def checkcache(filename): cache_mtime = rdlong(fp) file_mtime = getmtime(filename) if cache_mtime != file_mtime: - print 'flp: outdated cache file', cachename + #print 'flp: outdated cache file', cachename return None - print 'flp: valid cache file', cachename + #print 'flp: valid cache file', cachename altforms = marshal.load(fp) forms = {} for name in altforms.keys(): @@ -139,7 +139,7 @@ def writecache(filename, forms): fp.seek(0) fp.write(MAGIC) fp.close() - print 'flp: wrote cache file', cachename + #print 'flp: wrote cache file', cachename # # Internal: Locate form file (using PYTHONPATH) and open file @@ -218,6 +218,12 @@ def make(self, dict): # Internal parsing routines. # def _parse_string(str): + if '\\' in str: + s = '\'' + str + '\'' + try: + return eval(s) + except: + pass return str def _parse_num(str):