Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv14072/SimData
Modified Files:
Parse.py Compile.py
Log Message:
Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Parse.py 20 Aug 2003 02:47:10 -0000 1.12
--- Parse.py 17 Sep 2003 07:27:01 -0000 1.13
***************
*** 27,31 ****
from xml.sax import ContentHandler, ErrorHandler, make_parser
import xml.sax
! from gzip import GzipFile
from zipfile import ZipFile
import re
--- 27,38 ----
from xml.sax import ContentHandler, ErrorHandler, make_parser
import xml.sax
!
! # zlib is often misinstalled under windows, so don't require it.
! try:
! from gzip import GzipFileXX
! except Exception, e:
! GzipFile = None
! GzipError = str(e)
!
from zipfile import ZipFile
import re
***************
*** 808,811 ****
--- 815,820 ----
return obj
if path.endswith('.gz'):
+ if GzipFile is None:
+ raise IOError, "Unable to open '%s', since zlib appears to be missing or improperly installed (%s)." % (path, GzipError)
f = GzipFile(path, "rb")
else:
Index: Compile.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Compile.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compile.py 11 Apr 2003 18:06:37 -0000 1.2
--- Compile.py 17 Sep 2003 07:27:01 -0000 1.3
***************
*** 28,32 ****
if hasattr(sys, "setdlopenflags"):
sys.setdlopenflags(0x101)
- #sys.path.append("../../Source");
try:
import SimData
--- 28,31 ----
***************
*** 50,54 ****
while 1:
try:
! import CSP
break
except:
--- 49,53 ----
while 1:
try:
! import cCSP
break
except:
|
