[Python-checkins] python/dist/src/Doc/tools py2texi.el,1.8,1.9

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv15603

Modified Files:
	py2texi.el 
Log Message:
Make the "path math" more robust, and support both relative and
absolute paths as input.


Index: py2texi.el
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/py2texi.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** py2texi.el	16 Jul 2003 03:44:48 -0000	1.8
--- py2texi.el	28 Sep 2003 03:10:09 -0000	1.9
***************
*** 570,576 ****
        (setq dirs py2texi-dirs)
        (while (and (not includefile) dirs)
! 	(setq includefile (concat path (car dirs) filename))
  	(unless (file-exists-p includefile)
! 	  (setq includefile nil)
  	  (setq dirs (cdr dirs))))
        (if includefile
--- 570,580 ----
        (setq dirs py2texi-dirs)
        (while (and (not includefile) dirs)
! 	(setq includefile
!               (concat (file-name-as-directory (car dirs)) filename))
!         (if (not (file-name-absolute-p includefile))
!             (setq includefile
!                   (concat (file-name-as-directory path) includefile)))
  	(unless (file-exists-p includefile)
!           (setq includefile nil)
  	  (setq dirs (cdr dirs))))
        (if includefile