[Spambayes-checkins] spambayes hammiefilter.py,1.13,1.14 mailsort.py,1.4,1.5 mboxtrain.py,1.3,1.4 pop3proxy.py,1.47,1.48 unheader.py,1.9,1.10

Tue Jan 28 19:23:36 EST 2003

Update of /cvsroot/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv9465

Modified Files:
	hammiefilter.py mailsort.py mboxtrain.py pop3proxy.py 
	unheader.py 
Log Message:
Whitespace n11n
(if localization can be l10n, normalization can be n11n :)

Index: hammiefilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiefilter.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** hammiefilter.py	23 Jan 2003 20:15:31 -0000	1.13
--- hammiefilter.py	29 Jan 2003 03:23:34 -0000	1.14
***************
*** 8,12 ****
  ##   :0 fw
  ##   | hammiefilter.py
! ## 
  ## Then, you can set up your MUA to pipe ham and spam to it, one at a
  ## time, by calling it with either the -g or -s options, respectively.
--- 8,12 ----
  ##   :0 fw
  ##   | hammiefilter.py
! ##
  ## Then, you can set up your MUA to pipe ham and spam to it, one at a
  ## time, by calling it with either the -g or -s options, respectively.
***************
*** 177,179 ****
  if __name__ == "__main__":
      main()
- 
--- 177,178 ----

Index: mailsort.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/mailsort.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mailsort.py	20 Jan 2003 03:39:52 -0000	1.4
--- mailsort.py	29 Jan 2003 03:23:34 -0000	1.5
***************
*** 165,170 ****
      else:
          raise RuntimeError # shouldn't get here
!     
!     
  if __name__ == "__main__":
      main()
--- 165,170 ----
      else:
          raise RuntimeError # shouldn't get here
! 
! 
  if __name__ == "__main__":
      main()

Index: mboxtrain.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/mboxtrain.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mboxtrain.py	14 Jan 2003 05:38:19 -0000	1.3
--- mboxtrain.py	29 Jan 2003 03:23:34 -0000	1.4
***************
*** 52,56 ****
          # We'll be unable to represent this as text :(
          return False
!     
      if is_spam:
          spamtxt = "spam"
--- 52,56 ----
          # We'll be unable to represent this as text :(
          return False
! 
      if is_spam:
          spamtxt = "spam"
***************
*** 90,94 ****
          counter += 1
          cfn = os.path.join(path, "cur", fn)
!         tfn = os.path.join(path, "tmp", 
                             "%d.%d_%d.%s" % (time.time(), pid,
                                              counter, host))
--- 90,94 ----
          counter += 1
          cfn = os.path.join(path, "cur", fn)
!         tfn = os.path.join(path, "tmp",
                             "%d.%d_%d.%s" % (time.time(), pid,
                                              counter, host))
***************
*** 127,131 ****
      fcntl.flock(f, fcntl.LOCK_EX)
      mbox = mailbox.PortableUnixMailbox(f, mboxutils.get_message)
!     
      outf = os.tmpfile()
      counter = 0
--- 127,131 ----
      fcntl.flock(f, fcntl.LOCK_EX)
      mbox = mailbox.PortableUnixMailbox(f, mboxutils.get_message)
! 
      outf = os.tmpfile()
      counter = 0
***************
*** 173,180 ****
      counter = 0
      trained = 0
!     
      for fn in glob.glob(os.path.join(path, "[0-9]*")):
          counter += 1
!         
          cfn = fn
          tfn = os.path.join(path, "spambayes.tmp")
--- 173,180 ----
      counter = 0
      trained = 0
! 
      for fn in glob.glob(os.path.join(path, "[0-9]*")):
          counter += 1
! 
          cfn = fn
          tfn = os.path.join(path, "spambayes.tmp")
***************
*** 190,194 ****
          f.write(msg.as_string())
          f.close()
!         
          # XXX: This will raise an exception on Windows.  Do any Windows
          # people actually use MH directories?
--- 190,194 ----
          f.write(msg.as_string())
          f.close()
! 
          # XXX: This will raise an exception on Windows.  Do any Windows
          # people actually use MH directories?
***************
*** 208,212 ****
      else:
          raise ValueError("Unable to determine mailbox type: " + path)
!     

  def usage(code, msg=''):
--- 208,212 ----
      else:
          raise ValueError("Unable to determine mailbox type: " + path)
! 

  def usage(code, msg=''):
***************
*** 222,226 ****

      global loud
!     
      try:
          opts, args = getopt.getopt(sys.argv[1:], 'hfqd:D:g:s:')
--- 222,226 ----

      global loud
! 
      try:
          opts, args = getopt.getopt(sys.argv[1:], 'hfqd:D:g:s:')

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** pop3proxy.py	28 Jan 2003 07:27:45 -0000	1.47
--- pop3proxy.py	29 Jan 2003 03:23:34 -0000	1.48
***************
*** 1207,1224 ****
  # Option-parsing helper functions
  def _addressAndPort(s):
!    """Decode a string representing a port to bind to, with optional address."""
!    s = s.strip()
!    if ':' in s:
!      addr, port = s.split(':')
!      return addr, int(port)
!    else:
!      return '', int(s)

  def _addressPortStr((addr, port)):
!   """Encode a string representing a port to bind to, with optional address."""
!   if not addr:
!     return str(port)
!   else:
!     return '%s:%d' % (addr, port)

--- 1207,1224 ----
  # Option-parsing helper functions
  def _addressAndPort(s):
!     """Decode a string representing a port to bind to, with optional address."""
!     s = s.strip()
!     if ':' in s:
!         addr, port = s.split(':')
!         return addr, int(port)
!     else:
!         return '', int(s)

  def _addressPortStr((addr, port)):
!     """Encode a string representing a port to bind to, with optional address."""
!     if not addr:
!         return str(port)
!     else:
!         return '%s:%d' % (addr, port)

Index: unheader.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/unheader.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** unheader.py	14 Jan 2003 05:38:19 -0000	1.9
--- unheader.py	29 Jan 2003 03:23:34 -0000	1.10
***************
*** 1,9 ****
  #!/usr/bin/env python
  """
!     unheader.py: cleans headers from email messages. By default, this 
      removes SpamAssassin headers, specify a pattern with -p to supply
      new headers to remove.

!     This is often needed because existing spamassassin headers can 
      provide killer spam clues, for all the wrong reasons.
  """
--- 1,9 ----
  #!/usr/bin/env python
  """
!     unheader.py: cleans headers from email messages. By default, this
      removes SpamAssassin headers, specify a pattern with -p to supply
      new headers to remove.

!     This is often needed because existing spamassassin headers can
      provide killer spam clues, for all the wrong reasons.
  """