Revision: 3207
http://spambayes.svn.sourceforge.net/spambayes/?rev=3207&view=rev
Author: montanaro
Date: 2008-11-25 03:37:57 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
use safepickle functions, pylint nits
Modified Paths:
--------------
trunk/spambayes/utilities/HistToGNU.py
trunk/spambayes/utilities/convert_config_file.py
trunk/spambayes/utilities/convert_db.py
trunk/spambayes/utilities/extractmessages.py
trunk/spambayes/utilities/hammer.py
trunk/spambayes/utilities/loosecksum.py
trunk/spambayes/utilities/mboxcount.py
trunk/spambayes/utilities/mkreversemap.py
trunk/spambayes/utilities/split.py
trunk/spambayes/utilities/splitn.py
trunk/spambayes/utilities/splitndirs.py
Modified: trunk/spambayes/utilities/HistToGNU.py
===================================================================
--- trunk/spambayes/utilities/HistToGNU.py 2008-11-25 03:29:21 UTC (rev
3206)
+++ trunk/spambayes/utilities/HistToGNU.py 2008-11-25 03:37:57 UTC (rev
3207)
@@ -18,14 +18,13 @@
set xrange [0.0:100.0]
"""
-dataSetOptions="smooth unique"
+dataSetOptions = "smooth unique"
-from spambayes.Options import options
-from spambayes.TestDriver import Hist
-
import sys
-import cPickle as pickle
+from spambayes.Options import options
+from spambayes.safepickle import pickle_read, pickle_write
+
program = sys.argv[0]
def usage(code, msg=''):
@@ -38,7 +37,7 @@
def loadHist(path):
"""Load the histogram pickle object"""
- return pickle.load(file(path))
+ return pickle_read(path)
def outputHist(hist, f=sys.stdout):
"""Output the Hist object to file f"""
@@ -49,7 +48,7 @@
def plot(files):
"""given a list of files, create gnu-plot file"""
- import cStringIO, os
+ import cStringIO
cmd = cStringIO.StringIO()
cmd.write(globalOptions)
args = []
Modified: trunk/spambayes/utilities/convert_config_file.py
===================================================================
--- trunk/spambayes/utilities/convert_config_file.py 2008-11-25 03:29:21 UTC
(rev 3206)
+++ trunk/spambayes/utilities/convert_config_file.py 2008-11-25 03:37:57 UTC
(rev 3207)
@@ -45,7 +45,7 @@
try:
opts, args = getopt.getopt(sys.argv[1:], 'vhf:')
except getopt.error, msg:
- print >>sys.stderr, str(msg) + '\n\n' + __doc__
+ print >> sys.stderr, str(msg) + '\n\n' + __doc__
sys.exit()
filename = "bayescustomize.ini"
@@ -53,7 +53,7 @@
for opt, arg in opts:
if opt == '-h':
- print >>sys.stderr, __doc__
+ print >> sys.stderr, __doc__
sys.exit()
elif opt == '-f':
filename = arg
@@ -64,7 +64,6 @@
if verbose:
print "Loading defaults"
o.load_defaults()
- alts = []
if verbose:
print "Updating file:", filename
if os.path.exists(filename):
Modified: trunk/spambayes/utilities/convert_db.py
===================================================================
--- trunk/spambayes/utilities/convert_db.py 2008-11-25 03:29:21 UTC (rev
3206)
+++ trunk/spambayes/utilities/convert_db.py 2008-11-25 03:37:57 UTC (rev
3207)
@@ -41,13 +41,13 @@
try:
opts, args = getopt.getopt(sys.argv[1:], 'ht:T:n:N:')
except getopt.error, msg:
- print >>sys.stderr, str(msg) + '\n\n' + __doc__
+ print >> sys.stderr, str(msg) + '\n\n' + __doc__
sys.exit()
old_name = old_type = new_name = new_type = None
for opt, arg in opts:
if opt == '-h':
- print >>sys.stderr, __doc__
+ print >> sys.stderr, __doc__
sys.exit()
elif opt == '-t':
old_type = arg
Modified: trunk/spambayes/utilities/extractmessages.py
===================================================================
--- trunk/spambayes/utilities/extractmessages.py 2008-11-25 03:29:21 UTC
(rev 3206)
+++ trunk/spambayes/utilities/extractmessages.py 2008-11-25 03:37:57 UTC
(rev 3207)
@@ -23,11 +23,11 @@
import sys
import getopt
import re
-import cPickle as pickle
import locale
from email.Header import make_header, decode_header
from spambayes.mboxutils import getmbox
+from spambayes.safepickle import pickle_read, pickle_write
prog = sys.argv[0]
@@ -115,7 +115,7 @@
return 1
try:
- mapd = pickle.load(file(mapfile))
+ mapd = pickle_read(mapfile)
except IOError:
usage("Mapfile %s does not exist" % mapfile)
return 1
Modified: trunk/spambayes/utilities/hammer.py
===================================================================
--- trunk/spambayes/utilities/hammer.py 2008-11-25 03:29:21 UTC (rev 3206)
+++ trunk/spambayes/utilities/hammer.py 2008-11-25 03:37:57 UTC (rev 3207)
@@ -3,7 +3,7 @@
# Part of the SpamBayes project. Released under the Python Software
# Foundation license; see http://www.python.org/
-import os, sys, re, random, textwrap
+import os, re, random, textwrap
from spambayes import storage
from spambayes import tokenizer
Modified: trunk/spambayes/utilities/loosecksum.py
===================================================================
--- trunk/spambayes/utilities/loosecksum.py 2008-11-25 03:29:21 UTC (rev
3206)
+++ trunk/spambayes/utilities/loosecksum.py 2008-11-25 03:37:57 UTC (rev
3207)
@@ -26,10 +26,8 @@
import getopt
import sys
-import email.Parser
import md5
import re
-import time
import binascii
from spambayes.mboxutils import getmbox
Modified: trunk/spambayes/utilities/mboxcount.py
===================================================================
--- trunk/spambayes/utilities/mboxcount.py 2008-11-25 03:29:21 UTC (rev
3206)
+++ trunk/spambayes/utilities/mboxcount.py 2008-11-25 03:37:57 UTC (rev
3207)
@@ -29,7 +29,6 @@
import sys
import mailbox
-import email
import getopt
import glob
Modified: trunk/spambayes/utilities/mkreversemap.py
===================================================================
--- trunk/spambayes/utilities/mkreversemap.py 2008-11-25 03:29:21 UTC (rev
3206)
+++ trunk/spambayes/utilities/mkreversemap.py 2008-11-25 03:37:57 UTC (rev
3207)
@@ -17,13 +17,12 @@
import sys
import getopt
-import anydbm
-import cPickle as pickle
from spambayes.mboxutils import getmbox
from spambayes.tokenizer import tokenize
from spambayes.Options import options
from spambayes.classifier import Classifier
+from spambayes.safepickle import pickle_read, pickle_write
prog = sys.argv[0]
@@ -99,13 +98,13 @@
return 1
try:
- mapd = pickle.load(file(mapfile))
+ mapd = pickle_read(mapfile)
except IOError:
mapd = {}
for f in args:
mapmessages(f, mboxtype, mapd)
- pickle.dump(mapd, file(mapfile, "w"))
+ pickle_write(mapfile, mapd)
if __name__ == "__main__":
sys.exit(main(sys.argv[1:]))
Modified: trunk/spambayes/utilities/split.py
===================================================================
--- trunk/spambayes/utilities/split.py 2008-11-25 03:29:21 UTC (rev 3206)
+++ trunk/spambayes/utilities/split.py 2008-11-25 03:37:57 UTC (rev 3207)
@@ -28,7 +28,6 @@
import sys
import random
import mailbox
-import email
import getopt
from spambayes import mboxutils
Modified: trunk/spambayes/utilities/splitn.py
===================================================================
--- trunk/spambayes/utilities/splitn.py 2008-11-25 03:29:21 UTC (rev 3206)
+++ trunk/spambayes/utilities/splitn.py 2008-11-25 03:37:57 UTC (rev 3207)
@@ -42,7 +42,6 @@
import sys
import random
import mailbox
-import email
import getopt
from spambayes import mboxutils
Modified: trunk/spambayes/utilities/splitndirs.py
===================================================================
--- trunk/spambayes/utilities/splitndirs.py 2008-11-25 03:29:21 UTC (rev
3206)
+++ trunk/spambayes/utilities/splitndirs.py 2008-11-25 03:37:57 UTC (rev
3207)
@@ -47,8 +47,6 @@
import sys
import os
import random
-import mailbox
-import email
import getopt
import glob
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
