Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset
In directory sc8-pr-cvs1:/tmp/cvs-serv27926/happydoclib/docset
Modified Files:
docset_MultiHTMLFile.py
Log Message:
Refactor some of this code into the base class.
Index: docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_MultiHTMLFile.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** docset_MultiHTMLFile.py 18 Nov 2002 13:45:58 -0000 1.1
--- docset_MultiHTMLFile.py 1 Dec 2002 22:37:17 -0000 1.2
***************
*** 78,82 ****
def getOutputFilenameForPackageTreeNode(self, packageTreeNode):
! filename = base.MultiFileDocSet.getOutputFilenameForPackageTreeNode(self, packageTreeNode)
if packageTreeNode.values():
--- 78,86 ----
def getOutputFilenameForPackageTreeNode(self, packageTreeNode):
! trace.into('MultiHTMLFileDocSet', 'getOutputFilenameForPackageTreeNode')
! filename = base.MultiFileDocSet.getOutputFilenameForPackageTreeNode(
! self,
! packageTreeNode,
! )
if packageTreeNode.values():
***************
*** 90,112 ****
#
filename_with_extension = '%s.html' % filename
-
- return filename_with_extension
! def writeDirectory(self, packageTreeNode):
! trace.into('MultiHTMLFileDocSet', 'writeDirectory',
! packageTreeNode=packageTreeNode,
! )
!
! canonical_path = packageTreeNode.getPath(1)
! canonical_filename = apply(os.path.join, canonical_path)
! output_filename = self.getOutputFilenameForPackageTreeNode(packageTreeNode)
!
! self.statusMessage('Directory : "%s"\n to: "%s"' % (
! canonical_filename,
! output_filename,
! ))
!
! trace.outof()
! return
def writePythonFile(self, packageTreeNode):
--- 94,100 ----
#
filename_with_extension = '%s.html' % filename
! trace.outof(filename_with_extension)
! return filename_with_extension
def writePythonFile(self, packageTreeNode):
***************
*** 114,117 ****
--- 102,115 ----
packageTreeNode=packageTreeNode,
)
+
+ node_name = packageTreeNode.getName()
+ if node_name == '__init__.py':
+ #
+ # Skip the __init__.py file, since it will
+ # be handled as part of the package.
+ #
+ trace.write('skipping __init__.py')
+ trace.outof()
+ return
canonical_path = packageTreeNode.getPath(1)
***************
*** 143,197 ****
trace.outof()
return
-
- def writeCB(self, packageTreeNode):
- trace.into('MultiHTMLFileDocSet', 'writeCB',
- packageTreeNode=packageTreeNode,
- )
- node_name = packageTreeNode.getName()
-
- extension = os.path.splitext(node_name)[1]
-
- if packageTreeNode.values():
- #
- # Directory node
- #
- self.writeDirectory(packageTreeNode)
-
- elif node_name == '__init__.py':
- #
- # Skip the __init__.py file, since it will
- # be handled as part of the package.
- #
- trace.write('skipping __init__.py')
- pass
-
- else:
- #
- # Anything past here looks like a file.
- #
-
- if extension == '.py':
- #
- # Filename ends in .py, so it is a Python file.
- #
- self.writePythonFile(packageTreeNode)
-
- elif extension in ('.txt', '.stx'):
- #
- # Filename ends in .txt or .stx so it is
- # a text file.
- #
- self.writePlainTextFile(packageTreeNode)
-
- else:
- #
- # Unrecognized file, skipped.
- #
- node_path = packageTreeNode.getPath()
- filename = apply(os.path.join, node_path)
- self.statusMessage('Skiping unrecognized file %s' % filename,
- 2)
-
- trace.outof()
- return
-
--- 141,142 ----
|
