[Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.36,1.37

Ka-Ping Yee ping@users.sourceforge.net
Fri, 13 Apr 2001 08:00:29 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv11989

Modified Files:
	pydoc.py 
Log Message:
Use nturl2path to generate a file: URL to source files in Windows.


Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** pydoc.py	2001/04/13 13:57:31	1.36
--- pydoc.py	2001/04/13 15:00:27	1.37
***************
*** 485,489 ****
          try:
              path = inspect.getabsfile(object)
!             filelink = '<a href="file:%s">%s</a>' % (path, path)
          except TypeError:
              filelink = '(built-in)'
--- 485,493 ----
          try:
              path = inspect.getabsfile(object)
!             url = path
!             if sys.platform == 'win32':
!                 import nturl2path
!                 url = nturl2path.pathname2url(path)
!             filelink = '<a href="file:%s">%s</a>' % (url, path)
          except TypeError:
              filelink = '(built-in)'
***************
*** 1474,1480 ****
  
      def isnewpackage(self, (dir, package)):
!         inode = os.stat(dir)[1] # detect circular symbolic links
          if not (os.path.islink(dir) and inode in self.inodes):
!             self.inodes.append(inode)
              return ispackage(dir)
  
--- 1478,1484 ----
  
      def isnewpackage(self, (dir, package)):
!         inode = os.path.exists(dir) and os.stat(dir)[1]
          if not (os.path.islink(dir) and inode in self.inodes):
!             self.inodes.append(inode) # detect circular symbolic links
              return ispackage(dir)