[HT2HTML-devel] CVS: ht2html HTParser.py,2.1,2.2 PDOGenerator.py,2.25,2.26

[A.M. K. <aku...@us...>]

Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8828

Modified Files:
	HTParser.py PDOGenerator.py 
Log Message:
Add parameter for not using default values from the index.html; don't use defaults for content-type.  (Arguably other fields, such as title & encoding, also shouldn't get default values from the index.ht.)

Index: HTParser.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/HTParser.py,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** HTParser.py	29 Jul 2003 15:34:26 -0000	2.1
--- HTParser.py	3 Nov 2004 10:36:23 -0000	2.2
***************
*** 60,67 ****
  
      # might be using an older rfc822
!     def get(self, name, default=None):
          if rfc822.Message.has_key(self, name):
              return self.getheader(name)
!         elif self.__extraheaders.has_key(name):
              return self.__extraheaders[name]
          else:
--- 60,67 ----
  
      # might be using an older rfc822
!     def get(self, name, default=None, use_defaults=True):
          if rfc822.Message.has_key(self, name):
              return self.getheader(name)
!         elif use_defaults and self.__extraheaders.has_key(name):
              return self.__extraheaders[name]
          else:

Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -d -r2.25 -r2.26
*** PDOGenerator.py	15 Oct 2004 18:03:57 -0000	2.25
--- PDOGenerator.py	3 Nov 2004 10:36:23 -0000	2.26
***************
*** 119,123 ****
  
      def get_content_type(self):
!         return self.__parser.get('content-type')
  
      def get_encoding(self):
--- 119,123 ----
  
      def get_content_type(self):
!         return self.__parser.get('content-type', use_defaults=False)
  
      def get_encoding(self):