[Happydoc-checkins] CVS: HappyDoc/happydoclib/formatter fileformatterbase.py,1.6,1.7

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

Update of /cvsroot/happydoc/HappyDoc/happydoclib/formatter
In directory usw-pr-cvs1:/tmp/cvs-serv30664/happydoclib/formatter

Modified Files:
	fileformatterbase.py 
Log Message:
Changed path handling to be more platform-neutral.


Index: fileformatterbase.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/formatter/fileformatterbase.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fileformatterbase.py	2002/02/02 14:58:42	1.6
--- fileformatterbase.py	2002/02/03 18:49:26	1.7
***************
*** 220,229 ****
              # Root node for docset
              #
!             output_subdir = os.sep + happydoclib.path.removePrefix(docset_base_directory, output_base)
              happydoclib.TRACE.writeVar(output_subdir=output_subdir)
              if output_subdir != output_base:
!                 if output_subdir[0] == '/':
                      output_subdir=output_subdir[1:]
!                     happydoclib.TRACE.writeVar(output_subdir=output_subdir)
                  obj_output_sub_path = happydoclib.path.join(output_subdir, obj_output_name)
                  happydoclib.TRACE.writeVar(obj_output_sub_path=obj_output_sub_path)
--- 220,234 ----
              # Root node for docset
              #
!             output_subdir = happydoclib.path.removePrefix(docset_base_directory, output_base)
              happydoclib.TRACE.writeVar(output_subdir=output_subdir)
+             if os.name != 'nt':
+                 happydoclib.TRACE.write('adding prefix for os %s' % os.name)
+                 output_subdir = '%s%s' % (os.sep, output_subdir)
+             happydoclib.TRACE.writeVar(output_subdir=output_subdir)
              if output_subdir != output_base:
!                 happydoclib.TRACE.write('output_subdir and output_base do not match')
!                 if output_subdir[0] == os.sep:
                      output_subdir=output_subdir[1:]
!                 happydoclib.TRACE.writeVar(output_subdir=output_subdir)
                  obj_output_sub_path = happydoclib.path.join(output_subdir, obj_output_name)
                  happydoclib.TRACE.writeVar(obj_output_sub_path=obj_output_sub_path)
***************
*** 233,236 ****
--- 238,242 ----
                  name = happydoclib.path.join(output_base, obj_output_sub_path)
              else:
+                 happydoclib.TRACE.write('output_subdir and output_base do match')
                  name = happydoclib.path.join(output_base, obj_output_name)
  
***************
*** 428,431 ****
--- 434,450 ----
          return
  
+     def testGetFullOutputNameForObjectNone(self):
+         info_obj = None
+         expected = os.sep + os.path.join('docset',
+                                          'base',
+                                          'directory',
+                                          'index.test'
+                                          )
+         actual = self.formatter.getFullOutputNameForObject(info_obj)
+         assert expected == actual, \
+                'Output name for object does not match ("%s" vs "%s")' % \
+                (expected, actual)
+         return
+     
      def testGetFullOutputNameForObjectFullyQualifiedNameOneParent(self):
          import happydoclib.happydom