From montanaro at users.sourceforge.net  Wed Nov  7 03:02:54 2007
From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net)
Date: Tue, 06 Nov 2007 18:02:54 -0800
Subject: [Spambayes-checkins] SF.net SVN: spambayes: [3169] trunk/spambayes
Message-ID: <E1IpaFq-0005dI-RF@sc8-pr-svn2.sourceforge.net>

Revision: 3169
          http://spambayes.svn.sourceforge.net/spambayes/?rev=3169&view=rev
Author:   montanaro
Date:     2007-11-06 18:02:54 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
remove unused imports - hopefully i have not missed any import side effects

Modified Paths:
--------------
    trunk/spambayes/contrib/spamcounts.py
    trunk/spambayes/spambayes/Corpus.py
    trunk/spambayes/spambayes/Dibbler.py
    trunk/spambayes/spambayes/FileCorpus.py
    trunk/spambayes/spambayes/ImapUI.py
    trunk/spambayes/spambayes/MoinSecurityPolicy.py
    trunk/spambayes/spambayes/Stats.py
    trunk/spambayes/spambayes/UserInterface.py
    trunk/spambayes/spambayes/cdb_classifier.py
    trunk/spambayes/spambayes/hammiebulk.py
    trunk/spambayes/spambayes/oe_mailbox.py
    trunk/spambayes/spambayes/smtpproxy.py
    trunk/spambayes/spambayes/tokenizer.py

Modified: trunk/spambayes/contrib/spamcounts.py
===================================================================
--- trunk/spambayes/contrib/spamcounts.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/contrib/spamcounts.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -21,7 +21,6 @@
 import sets
 import os
 import shelve
-import pickle
 import csv
 
 from spambayes.Options import options, get_pathname_option

Modified: trunk/spambayes/spambayes/Corpus.py
===================================================================
--- trunk/spambayes/spambayes/Corpus.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/Corpus.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -91,7 +91,7 @@
 
 import sys           # for output of docstring
 import time
-import types
+
 from spambayes.Options import options
 
 SPAM = True

Modified: trunk/spambayes/spambayes/Dibbler.py
===================================================================
--- trunk/spambayes/spambayes/Dibbler.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/Dibbler.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -169,7 +169,7 @@
 except ImportError:
     import StringIO
 
-import os, sys, re, time, traceback, md5, base64
+import sys, re, time, traceback, md5, base64
 import socket, asyncore, asynchat, cgi, urlparse, webbrowser
 
 try:

Modified: trunk/spambayes/spambayes/FileCorpus.py
===================================================================
--- trunk/spambayes/spambayes/FileCorpus.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/FileCorpus.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -48,8 +48,7 @@
 
 from spambayes import Corpus
 from spambayes import message
-from spambayes import storage
-import sys, os, gzip, fnmatch, getopt, time, stat
+import os, gzip, fnmatch, time, stat
 from spambayes.Options import options
 
 class FileCorpus(Corpus.Corpus):

Modified: trunk/spambayes/spambayes/ImapUI.py
===================================================================
--- trunk/spambayes/spambayes/ImapUI.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/ImapUI.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -41,9 +41,7 @@
     # Maintain compatibility with Python 2.2
     True, False = 1, 0
 
-import re
 import cgi
-import types
 
 import UserInterface
 from spambayes.Options import options, optionsPathname, _

Modified: trunk/spambayes/spambayes/MoinSecurityPolicy.py
===================================================================
--- trunk/spambayes/spambayes/MoinSecurityPolicy.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/MoinSecurityPolicy.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -38,7 +38,6 @@
 
 import os
 import atexit
-import urllib
 import urlparse
 
 from MoinMoin.security import Permissions
@@ -49,7 +48,7 @@
 from MoinMoin.PageEditor import PageEditor
 
 from spambayes import hammie, storage
-from spambayes.tokenizer import log2, Tokenizer, numeric_entity_re, \
+from spambayes.tokenizer import Tokenizer, numeric_entity_re, \
      numeric_entity_replacer, crack_urls, breaking_entity_re, html_re, \
      tokenize_word
 
@@ -133,7 +132,6 @@
 ##        self.mail_admins_about(editor.request, editor.page_name, score)
 
     def force_revert(self, pagename, request):
-        from MoinMoin.PageEditor import PageEditor
         rev = int(request.form['rev'][0])
         revstr = '%08d' % rev
         oldpg = Page(request, pagename, rev=rev)

Modified: trunk/spambayes/spambayes/Stats.py
===================================================================
--- trunk/spambayes/spambayes/Stats.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/Stats.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -40,10 +40,9 @@
     True, False = 1, 0
 
 import time
-import types
 
 from spambayes.message import STATS_START_KEY, STATS_STORAGE_KEY
-from spambayes.message import database_type, open_storage, Message
+from spambayes.message import Message
 
 try:
     _

Modified: trunk/spambayes/spambayes/UserInterface.py
===================================================================
--- trunk/spambayes/spambayes/UserInterface.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/UserInterface.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -86,7 +86,6 @@
 import PyMeldLite
 import Dibbler
 import tokenizer
-from spambayes import Stats
 from spambayes import Version
 from spambayes import storage
 from spambayes import FileCorpus

Modified: trunk/spambayes/spambayes/cdb_classifier.py
===================================================================
--- trunk/spambayes/spambayes/cdb_classifier.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/cdb_classifier.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -7,7 +7,6 @@
 """
 
 from spambayes import cdb
-from spambayes.tokenizer import tokenize
 from spambayes.classifier import Classifier
 
 class CdbClassifier(Classifier):

Modified: trunk/spambayes/spambayes/hammiebulk.py
===================================================================
--- trunk/spambayes/spambayes/hammiebulk.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/hammiebulk.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -50,7 +50,7 @@
 import getopt
 
 from spambayes.Options import options, get_pathname_option
-from spambayes import classifier, mboxutils, hammie, Corpus, storage
+from spambayes import mboxutils, hammie, Corpus, storage
 
 Corpus.Verbose = True
 

Modified: trunk/spambayes/spambayes/oe_mailbox.py
===================================================================
--- trunk/spambayes/spambayes/oe_mailbox.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/oe_mailbox.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -49,12 +49,9 @@
     # Some functions will not work, but some will.
     win32api = win32con = win32gui = shell = shellcon = None
 
-import hammie
 import oe_mailbox
 import mboxutils
 
-from spambayes.Options import options
-
 ###########################################################################
 ## DBX FILE HEADER
 ###########################################################################

Modified: trunk/spambayes/spambayes/smtpproxy.py
===================================================================
--- trunk/spambayes/spambayes/smtpproxy.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/smtpproxy.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -122,15 +122,10 @@
 import string
 import re
 import socket
-import asyncore
-import asynchat
-import getopt
 import sys
-import os
 import email
 
 from spambayes import Dibbler
-from spambayes import storage
 from spambayes import message
 from spambayes.tokenizer import textparts
 from spambayes.tokenizer import try_to_repair_damaged_base64

Modified: trunk/spambayes/spambayes/tokenizer.py
===================================================================
--- trunk/spambayes/spambayes/tokenizer.py	2007-10-22 02:51:07 UTC (rev 3168)
+++ trunk/spambayes/spambayes/tokenizer.py	2007-11-07 02:02:54 UTC (rev 3169)
@@ -10,7 +10,6 @@
 import email.Errors
 import re
 import math
-import time
 import os
 import binascii
 import urlparse


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.