[Python-checkins] python/dist/src/Tools/bgen/bgen scantools.py,1.29,1.30
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
2002年8月05日 08:32:33 -0700
Update of /cvsroot/python/python/dist/src/Tools/bgen/bgen
In directory usw-pr-cvs1:/tmp/cvs-serv814/Tools/bgen/bgen
Modified Files:
scantools.py
Log Message:
Fixed to run better in unix-Python, and to cater for bgenlocations
possibly being missing.
Index: scantools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/scantools.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** scantools.py 4 Aug 2002 21:55:25 -0000 1.29
--- scantools.py 5 Aug 2002 15:32:30 -0000 1.30
***************
*** 26,30 ****
MacOS = None
! from bgenlocations import CREATOR, INCLUDEDIR
Error = "scantools.Error"
--- 26,34 ----
MacOS = None
! try:
! from bgenlocations import CREATOR, INCLUDEDIR
! except ImportError:
! CREATOR = None
! INCLUDEDIR = os.curdir
Error = "scantools.Error"
***************
*** 237,241 ****
def initpaths(self):
! self.includepath = [':', INCLUDEDIR]
def initpatterns(self):
--- 241,245 ----
def initpaths(self):
! self.includepath = [os.curdir, INCLUDEDIR]
def initpatterns(self):
***************
*** 264,268 ****
def initosspecifics(self):
! if MacOS:
self.filetype = 'TEXT'
self.filecreator = CREATOR
--- 268,272 ----
def initosspecifics(self):
! if MacOS and CREATOR:
self.filetype = 'TEXT'
self.filecreator = CREATOR