[Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.25, 1.26 ProxyUI.py, 1.30, 1.31 ServerUI.py, 1.2, 1.3

[Mark Hammond]

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

Modified Files:
	ImapUI.py ProxyUI.py ServerUI.py 
Log Message:
Fix [ 856628 ] reload(Options) fails in windows binary
Instead of reload(Options), we call the new load_options function.


Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ImapUI.py	11 Dec 2003 18:42:41 -0000	1.25
--- ImapUI.py	14 Dec 2003 01:36:49 -0000	1.26
***************
*** 155,162 ****
          """Called by the config page when the user saves some new options, or
          restores the defaults."""
!         # Reload the options.
          self.classifier.store()
          import Options
!         reload(Options)
          global options
          from Options import options
--- 155,162 ----
          """Called by the config page when the user saves some new options, or
          restores the defaults."""
!         # Re-read the options.
          self.classifier.store()
          import Options
!         Options.load_options()
          global options
          from Options import options

Index: ProxyUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ProxyUI.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ProxyUI.py	11 Dec 2003 18:43:17 -0000	1.30
--- ProxyUI.py	14 Dec 2003 01:36:49 -0000	1.31
***************
*** 685,692 ****
          """Called by the config page when the user saves some new options, or
          restores the defaults."""
!         # Reload the options.
          global state
          import Options
!         reload(Options)
          global options
          from Options import options
--- 685,692 ----
          """Called by the config page when the user saves some new options, or
          restores the defaults."""
!         # Re-read the options.
          global state
          import Options
!         Options.load_options()
          global options
          from Options import options

Index: ServerUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ServerUI.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServerUI.py	24 Sep 2003 05:28:53 -0000	1.2
--- ServerUI.py	14 Dec 2003 01:36:49 -0000	1.3
***************
*** 94,98 ****
          self.state.bayes.store()
          import Options
!         reload(Options)
          global options
          from Options import options
--- 94,98 ----
          self.state.bayes.store()
          import Options
!         Options.load_options()
          global options
          from Options import options