Revision: 3182
http://spambayes.svn.sourceforge.net/spambayes/?rev=3182&view=rev
Author: montanaro
Date: 2008-11-25 01:47:48 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
pylint nits
Modified Paths:
--------------
trunk/spambayes/spambayes/XMLRPCPlugin.py
Modified: trunk/spambayes/spambayes/XMLRPCPlugin.py
===================================================================
--- trunk/spambayes/spambayes/XMLRPCPlugin.py 2008-11-25 01:46:17 UTC (rev
3181)
+++ trunk/spambayes/spambayes/XMLRPCPlugin.py 2008-11-25 01:47:48 UTC (rev
3182)
@@ -45,6 +45,7 @@
import threading
import xmlrpclib
+import time
from email import Message, message_from_string
from SimpleXMLRPCServer import SimpleXMLRPCServer
@@ -52,6 +53,8 @@
from spambayes.Options import _, options
from spambayes.tokenizer import tokenize
import spambayes.message
+from spambayes import storage
+from spambayes import FileCorpus
class XMLRPCUI(PluginUI):
plugin_map = (
@@ -82,9 +85,9 @@
raise xmlrpclib.Fault(404, '"%s" is not supported' % method)
def train(self, form_dict, extra_tokens, attachments, is_spam=True):
- newdict={}
+ newdict = {}
for (i, k) in form_dict.items():
- if type(k)==unicode:
+ if isinstance(k, unicode):
k = k.encode("utf-8")
newdict[i] = k
mime_message = form_to_mime(newdict, extra_tokens, attachments)
@@ -104,7 +107,6 @@
msg_text = msg_text.encode("utf-8")
msg = message_from_string(msg_text,
_class=spambayes.message.SBHeaderMessage)
- tokens = tokenize(msg)
if is_spam:
desired_corpus = "spamCorpus"
else:
@@ -117,7 +119,7 @@
setattr(self, desired_corpus, corpus)
self.msg_name_func = self.state.getNewMessageName
else:
- if isSpam:
+ if is_spam:
fn = storage.get_pathname_option("Storage",
"spam_cache")
else:
@@ -130,7 +132,8 @@
factory = FileCorpus.FileMessageFactory()
age = options["Storage", "cache_expiry_days"]*24*60*60
corpus = FileCorpus.ExpiryFileCorpus(age, factory, fn,
- '[0123456789\-]*',
cacheSize=20)
+ '[0123456789\-]*',
+ cacheSize=20)
setattr(self, desired_corpus, corpus)
class UniqueNamer(object):
count = -1
@@ -159,9 +162,9 @@
def score(self, form_dict, extra_tokens, attachments):
"""Score a dictionary + extra tokens."""
- newdict={}
+ newdict = {}
for (i, k) in form_dict.items():
- if isinstance(k,unicode):
+ if isinstance(k, unicode):
k = k.encode("utf-8")
newdict[i] = k
mime_message = form_to_mime(newdict, extra_tokens, attachments)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Spambayes-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/spambayes-checkins
