spambayes/testtools fpfn.py,1.4,1.5

Update of /cvsroot/spambayes/spambayes/testtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30621/testtools

Modified Files:
	fpfn.py 
Log Message:
Minor corrections to previous checkin.

Index: fpfn.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/testtools/fpfn.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fpfn.py	26 Apr 2005 06:28:45 -0000	1.4
--- fpfn.py	27 Apr 2005 00:29:59 -0000	1.5
***************
*** 95,100 ****
                  answer = raw_input('(S)pam, (R)emove or (L)eave : ').lower()
                  if answer == 's':
!                     os.rename(x, os.path.join("Data", "Spam",
!                                               "reservoir", x))
                  elif answer == 'r':
                      os.remove(x)
--- 95,100 ----
                  answer = raw_input('(S)pam, (R)emove or (L)eave : ').lower()
                  if answer == 's':
!                     os.rename(x, os.path.join("Data", "Spam", "reservoir",
!                                               os.path.basename(x)))
                  elif answer == 'r':
                      os.remove(x)
***************
*** 111,116 ****
                  answer = raw_input('(H)am, (R)emove or (L)eave : ').lower()
                  if answer == 'h':
!                     os.rename(x, os.path.join("Data", "Ham",
!                                               "reservoir", x))
                  elif answer == 'r':
                      os.remove(x)
--- 111,116 ----
                  answer = raw_input('(H)am, (R)emove or (L)eave : ').lower()
                  if answer == 'h':
!                     os.rename(x, os.path.join("Data", "Ham", "reservoir",
!                                               os.path.basename(x)))
                  elif answer == 'r':
                      os.remove(x)
***************
*** 131,139 ****
                      # but not change ham/spam, depending on what it was.
                      if answer == 'h':
!                         os.rename(x, os.path.join("Data", "Ham",
!                                                   "reservoir", x))
                      elif answer == 's':
!                         os.rename(x, os.path.join("Data", "Sam",
!                                                   "reservoir", x))
                      elif answer == 'r':
                          os.remove(x)
--- 131,139 ----
                      # but not change ham/spam, depending on what it was.
                      if answer == 'h':
!                         os.rename(x, os.path.join("Data", "Ham", "reservoir",
!                                                   os.path.basename(x)))
                      elif answer == 's':
!                         os.rename(x, os.path.join("Data", "Spam", "reservoir",
!                                                   os.path.basename(x)))
                      elif answer == 'r':
                          os.remove(x)