[Happydoc-checkins] CVS: HappyDoc3/happydoclib/parseinfo __init__.py,1.2,1.3

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo
In directory sc8-pr-cvs1:/tmp/cvs-serv23890/happydoclib/parseinfo

Modified Files:
	__init__.py 
Log Message:
Fix tests to include expected global values.


Index: __init__.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	1 Dec 2002 22:38:38 -0000	1.2
--- __init__.py	7 Dec 2002 17:04:01 -0000	1.3
***************
*** 127,130 ****
--- 127,131 ----
  _parser_options = {
      'include_comments':1,
+     'docStringFormat':'StructuredText',
      }
  
***************
*** 351,355 ****
      def testExtractVariablesFromModule(self):
          expected_values = {
-             'include_comments':1,
              'TestInt':1,
              'TestString':"String",
--- 352,355 ----
***************
*** 357,360 ****
--- 357,361 ----
              'url': 'a=A&b=B',
              }
+         expected_values.update(_parser_options)
          module_values = self.parsed_module.getConfigurationValues()
  
***************
*** 375,380 ****
      def testExtractVariablesFromModuleWithException(self):
          expected_values = {
-             'include_comments':1,
              }
          module_values = self.parsed_module.getConfigurationValues()
          self.failUnlessEqual(module_values, expected_values)
--- 376,381 ----
      def testExtractVariablesFromModuleWithException(self):
          expected_values = {
              }
+         expected_values.update(_parser_options)
          module_values = self.parsed_module.getConfigurationValues()
          self.failUnlessEqual(module_values, expected_values)