From montanaro at users.sourceforge.net Fri Feb 6 04:53:03 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 06 Feb 2009 03:53:03 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3235] trunk/spambayes/spambayes/test/ test_sb_imapfilter.py Message-ID: Revision: 3235 http://spambayes.svn.sourceforge.net/spambayes/?rev=3235&view=rev Author: montanaro Date: 2009-02-06 03:53:03 +0000 (Fri, 06 Feb 2009) Log Message: ----------- Simple bugfix from Richie. Modified Paths: -------------- trunk/spambayes/spambayes/test/test_sb_imapfilter.py Modified: trunk/spambayes/spambayes/test/test_sb_imapfilter.py =================================================================== --- trunk/spambayes/spambayes/test/test_sb_imapfilter.py 2009-01-27 12:33:50 UTC (rev 3234) +++ trunk/spambayes/spambayes/test/test_sb_imapfilter.py 2009-02-06 03:53:03 UTC (rev 3235) @@ -327,7 +327,7 @@ def setUp(self): # shorten for testing so we don't wait forever IMAPSession.timeout = 5 - self.imap = IMAPSession("localhost", IMAP_PORT) + self.imap = IMAPSession("localhost:%d" % IMAP_PORT) def tearDown(self): try: @@ -728,7 +728,6 @@ self.assertEqual(msg3.as_string(), msg_correct.as_string()) def test_generate_id(self): - print "\nThis test takes slightly over a second." id1 = self.folder._generate_id() id2 = self.folder._generate_id() id3 = self.folder._generate_id() @@ -801,7 +800,6 @@ class InterfaceTest(unittest.TestCase): def setUp(self): - print "\nThis test takes slightly over one second." self.saved_server = options["imap", "server"] options["imap", "server"] = "" thread.start_new_thread(run, (True,)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 6 04:53:53 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 06 Feb 2009 03:53:53 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3236] trunk/spambayes/spambayes/dbmstorage.py Message-ID: Revision: 3236 http://spambayes.svn.sourceforge.net/spambayes/?rev=3236&view=rev Author: montanaro Date: 2009-02-06 03:53:53 +0000 (Fri, 06 Feb 2009) Log Message: ----------- missed a db185 ref Modified Paths: -------------- trunk/spambayes/spambayes/dbmstorage.py Modified: trunk/spambayes/spambayes/dbmstorage.py =================================================================== --- trunk/spambayes/spambayes/dbmstorage.py 2009-02-06 03:53:03 UTC (rev 3235) +++ trunk/spambayes/spambayes/dbmstorage.py 2009-02-06 03:53:53 UTC (rev 3236) @@ -34,7 +34,7 @@ if sys.version_info >= (2, 3): funcs.insert(0, open_dbhash) else: - funcs = [open_db3hash, open_dbhash, open_gdbm, open_db185hash] + funcs = [open_db3hash, open_dbhash, open_gdbm] for f in funcs: try: return f(*args) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 6 04:55:30 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 06 Feb 2009 03:55:30 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3237] trunk/spambayes/spambayes/test/test_sb_server. py Message-ID: Revision: 3237 http://spambayes.svn.sourceforge.net/spambayes/?rev=3237&view=rev Author: montanaro Date: 2009-02-06 03:55:29 +0000 (Fri, 06 Feb 2009) Log Message: ----------- Bug fixes from Richie. Modified Paths: -------------- trunk/spambayes/spambayes/test/test_sb_server.py Modified: trunk/spambayes/spambayes/test/test_sb_server.py =================================================================== --- trunk/spambayes/spambayes/test/test_sb_server.py 2009-02-06 03:53:53 UTC (rev 3236) +++ trunk/spambayes/spambayes/test/test_sb_server.py 2009-02-06 03:55:29 UTC (rev 3237) @@ -8,8 +8,8 @@ web ui is present. The -t option runs a fake POP3 server on port 8110. This is the -same server that the -z option uses, and may be separately run for -other testing purposes. +same server that test uses, and may be separately run for other +testing purposes. Usage: @@ -100,6 +100,9 @@ HEADER_EXAMPLE = '%s: xxxxxxxxxxxxxxxxxxxx\r\n' % \ options["Headers", "classification_header_name"] +# Our simulated slow POP3 server transmits about 100 characters per second. +PER_CHAR_DELAY = 0.01 + class TestListener(Dibbler.Listener): """Listener for TestPOP3Server. Works on port 8110, to co-exist with real POP3 servers.""" @@ -155,7 +158,7 @@ self.close() raise SystemExit elif command == 'SLOW': - self.push_delay = 1.0 + self.push_delay = PER_CHAR_DELAY else: handler = self.handlers.get(command, self.onUnknown) self.push_slowly(handler(command, args)) @@ -276,9 +279,14 @@ proxyReady.set() Dibbler.run() - threading.Thread(target=runTestServer).start() + testServerThread = threading.Thread(target=runTestServer) + testServerThread.setDaemon(True) + testServerThread.start() testServerReady.wait() - threading.Thread(target=runUIAndProxy).start() + + proxyThread = threading.Thread(target=runUIAndProxy) + proxyThread.setDaemon(True) + proxyThread.start() proxyReady.wait() # Connect to the proxy and the test server. @@ -328,18 +336,21 @@ response = response + proxy.recv(1000) assert response.find(options["Headers", "classification_header_name"]) >= 0 - # Check that the proxy times out when it should. - options["pop3proxy", "retrieval_timeout"] = 30 + # Check that the proxy times out when it should. The consequence here + # is that the first packet we receive from the proxy will contain a + # partial message, so we assert for that. At 100 characters per second + # with a 1-second timeout, the message needs to be significantly longer + # than 100 characters to ensure that the timeout fires, so we make sure + # we use a message that's at least 200 characters long. + assert len(spam1) >= 2 * (1/PER_CHAR_DELAY) + options["pop3proxy", "retrieval_timeout"] = 1 options["Headers", "include_evidence"] = False - assert spam1.find('\n\n') > options["pop3proxy", "retrieval_timeout"] - print "This test is rather slow..." proxy.send("slow\r\n") response = proxy.recv(100) assert response.find("OK") != -1 proxy.send("retr 1\r\n") response = proxy.recv(1000) assert len(response) < len(spam1) - print "Slow test done. Thanks for waiting!" # Smoke-test the HTML UI. httpServer = socket.socket(socket.AF_INET, socket.SOCK_STREAM) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 6 04:57:13 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 06 Feb 2009 03:57:13 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3238] trunk/spambayes/scripts/sb_imapfilter.py Message-ID: Revision: 3238 http://spambayes.svn.sourceforge.net/spambayes/?rev=3238&view=rev Author: montanaro Date: 2009-02-06 03:57:13 +0000 (Fri, 06 Feb 2009) Log Message: ----------- support --verbose to work with nose. Modified Paths: -------------- trunk/spambayes/scripts/sb_imapfilter.py Modified: trunk/spambayes/scripts/sb_imapfilter.py =================================================================== --- trunk/spambayes/scripts/sb_imapfilter.py 2009-02-06 03:55:29 UTC (rev 3237) +++ trunk/spambayes/scripts/sb_imapfilter.py 2009-02-06 03:57:13 UTC (rev 3238) @@ -1133,7 +1133,8 @@ def run(force_UI=False): try: - opts, args = getopt.getopt(sys.argv[1:], 'hbPtcvl:e:i:d:p:o:') + opts, args = getopt.getopt(sys.argv[1:], 'hbPtcvl:e:i:d:p:o:', + ["verbose"]) except getopt.error, msg: print >> sys.stderr, str(msg) + '\n\n' + __doc__ sys.exit() @@ -1158,7 +1159,7 @@ promptForPass = True elif opt == '-c': doClassify = True - elif opt == '-v': + elif opt in ('-v', '--verbose'): options["globals", "verbose"] = True elif opt == '-e': if arg == 'y': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 20 07:51:36 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 20 Feb 2009 06:51:36 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3239] trunk/spambayes/spambayes/test/test_FileCorpus .py Message-ID: Revision: 3239 http://spambayes.svn.sourceforge.net/spambayes/?rev=3239&view=rev Author: montanaro Date: 2009-02-20 06:51:36 +0000 (Fri, 20 Feb 2009) Log Message: ----------- Why is universal newline mode needed here? Modified Paths: -------------- trunk/spambayes/spambayes/test/test_FileCorpus.py Modified: trunk/spambayes/spambayes/test/test_FileCorpus.py =================================================================== --- trunk/spambayes/spambayes/test/test_FileCorpus.py 2009-02-06 03:57:13 UTC (rev 3238) +++ trunk/spambayes/spambayes/test/test_FileCorpus.py 2009-02-20 06:51:36 UTC (rev 3239) @@ -288,7 +288,7 @@ self.corpus.addMessage(msg) self.assertEqual(msg.directory, self.directory) fn = os.path.join(self.directory, "9") - f = open(fn) + f = open(fn, "rU") content = f.read() f.close() self.assertEqual(content, good1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 20 07:52:54 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 20 Feb 2009 06:52:54 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3240] trunk/spambayes/spambayes/tokenizer.py Message-ID: Revision: 3240 http://spambayes.svn.sourceforge.net/spambayes/?rev=3240&view=rev Author: montanaro Date: 2009-02-20 06:52:54 +0000 (Fri, 20 Feb 2009) Log Message: ----------- A different way of dealing with a missing cache which doesn't require later code to test it against None. Modified Paths: -------------- trunk/spambayes/spambayes/tokenizer.py Modified: trunk/spambayes/spambayes/tokenizer.py =================================================================== --- trunk/spambayes/spambayes/tokenizer.py 2009-02-20 06:51:36 UTC (rev 3239) +++ trunk/spambayes/spambayes/tokenizer.py 2009-02-20 06:52:54 UTC (rev 3240) @@ -25,7 +25,10 @@ cache = dnscache.cache(cachefile=options["Tokenizer", "lookup_ip_cache"]) cache.printStatsAtEnd = False except (IOError, ImportError): - cache = None + class cache: + @staticmethod + def lookup(*args): + return [] else: import atexit atexit.register(cache.close) @@ -1067,7 +1070,7 @@ url = urllib.unquote(url) scheme, netloc, path, params, query, frag = urlparse.urlparse(url) - if cache is not None and options["Tokenizer", "x-lookup_ip"]: + if options["Tokenizer", "x-lookup_ip"]: ips = cache.lookup(netloc) if not ips: pushclue("url-ip:lookup error") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 20 07:54:04 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 20 Feb 2009 06:54:04 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3241] trunk/spambayes/spambayes/test/test_sb_server. py Message-ID: Revision: 3241 http://spambayes.svn.sourceforge.net/spambayes/?rev=3241&view=rev Author: montanaro Date: 2009-02-20 06:54:04 +0000 (Fri, 20 Feb 2009) Log Message: ----------- Slight tweak to help running tests under nose. Modified Paths: -------------- trunk/spambayes/spambayes/test/test_sb_server.py Modified: trunk/spambayes/spambayes/test/test_sb_server.py =================================================================== --- trunk/spambayes/spambayes/test/test_sb_server.py 2009-02-20 06:52:54 UTC (rev 3240) +++ trunk/spambayes/spambayes/test/test_sb_server.py 2009-02-20 06:54:04 UTC (rev 3241) @@ -103,7 +103,7 @@ # Our simulated slow POP3 server transmits about 100 characters per second. PER_CHAR_DELAY = 0.01 -class TestListener(Dibbler.Listener): +class Listener(Dibbler.Listener): """Listener for TestPOP3Server. Works on port 8110, to co-exist with real POP3 servers.""" @@ -253,7 +253,7 @@ return "-ERR Unknown command: %s\r\n" % repr(command) -def test(): +def helper(): """Runs a self-test using TestPOP3Server, a minimal POP3 server that serves the example emails above. """ @@ -264,7 +264,7 @@ testServerReady = threading.Event() def runTestServer(): testSocketMap = {} - TestListener(socketMap=testSocketMap) + Listener(socketMap=testSocketMap) testServerReady.set() asyncore.loop(map=testSocketMap) @@ -369,7 +369,7 @@ pop3Server.sendall("kill\r\n") pop3Server.recv(100) -def run(): +def test_run(): # Read the arguments. try: opts, args = getopt.getopt(sys.argv[1:], 'ht') @@ -393,14 +393,14 @@ if runSelfTest: print "\nRunning self-test...\n" state.buildServerStrings() - test() + helper() print "Self-test passed." # ...else it would have asserted. elif state.runTestServer: print "Running a test POP3 server on port 8110..." - TestListener() + Listener() asyncore.loop() if __name__ == '__main__': - run() + test_run() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Fri Feb 20 07:57:02 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Fri, 20 Feb 2009 06:57:02 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3242] trunk/spambayes/scripts/sb_imapfilter.py Message-ID: Revision: 3242 http://spambayes.svn.sourceforge.net/spambayes/?rev=3242&view=rev Author: montanaro Date: 2009-02-20 06:57:02 +0000 (Fri, 20 Feb 2009) Log Message: ----------- print messages to sys.stderr. Only print some messages in verbose mode. Modified Paths: -------------- trunk/spambayes/scripts/sb_imapfilter.py Modified: trunk/spambayes/scripts/sb_imapfilter.py =================================================================== --- trunk/spambayes/scripts/sb_imapfilter.py 2009-02-20 06:54:04 UTC (rev 3241) +++ trunk/spambayes/scripts/sb_imapfilter.py 2009-02-20 06:57:02 UTC (rev 3242) @@ -166,7 +166,7 @@ timeout = 60 # seconds def __init__(self, server, debug=0, do_expunge = options["imap", "expunge"] ): - if server.find(':') > -1: + if ":" in server: server, port = server.split(':', 1) port = int(port) else: @@ -174,7 +174,7 @@ port = 993 else: port = 143 - + # There's a tricky situation where if use_ssl is False, but we # try to connect to a IMAP over SSL server, we will just hang # forever, waiting for a response that will never come. To @@ -187,10 +187,12 @@ try: BaseIMAP.__init__(self, server, port) except (BaseIMAP.error, socket.gaierror, socket.error): - print "Cannot connect to server %s on port %s" % (server, port) - if not hasattr(self, "ssl"): - print "If you are connecting to an SSL server, please " \ - "ensure that you have the 'Use SSL' option enabled." + if options["globals", "verbose"]: + print >> sys.stderr, "Cannot connect to server", server, "on port", port + if not hasattr(self, "ssl"): + print >> sys.stderr, ("If you are connecting to an SSL server," + "please ensure that you\n" + "have the 'Use SSL' option enabled.") self.connected = False else: self.connected = True @@ -333,7 +335,8 @@ except BadIMAPResponseError: # We want to keep going, so just print out a warning, and # return an empty list. - print "Could not retrieve folder list." + if options["globals", "verbose"]: + print >> sys.stderr, "Could not retrieve folder list." return [] folders = [] for fol in all_folders: @@ -359,9 +362,9 @@ # A bit of a hack, but we really need to know if this is # the case. if self.folder_delimiter == ',': - print "WARNING: Your imap server uses a comma as the " \ - "folder delimiter. This may cause unpredictable " \ - "errors." + print >> sys.stderr, ("WARNING: Your imap server uses a comma as the " + "folder delimiter. This may cause unpredictable " \ + "errors.") folders.append(fol[m.end()+4:].strip('"')) folders.sort() return folders @@ -721,12 +724,13 @@ data = self.imap_server.check_response("recent", response) if data[0] is not None: if options["globals", "verbose"]: - print "[imapfilter] found saved message", self.uid, - print "in iteration", i + print >> sys.stderr, "[imapfilter] found saved message", self.uid, + print >> sys.stderr, "in iteration", i break else: if options["globals", "verbose"]: - print "[imapfilter] can't find saved message after 100 iterations:", self.uid + print >> sys.stderr, ("[imapfilter] can't find saved message after" + "100 iterations:"), self.uid # raise BadIMAPResponseError("recent", "Cannot find saved message") # We need to update the UID, as it will have changed. @@ -866,7 +870,7 @@ else: newid = self._generate_id() if options["globals", "verbose"]: - print "[imapfilter] saving %s with new id:" % msg.uid, newid + print >> sys.stderr, "[imapfilter] saving", msg.uid, "with new id:", newid msg.setId(newid) # Unfortunately, we now have to re-save this message, so that # our id is stored on the IMAP server. The vast majority of @@ -952,7 +956,7 @@ cls = msg.GetClassification() if cls is None or hamfolder is not None: if options["globals", "verbose"]: - print "[imapfilter] classified as %s:" % cls, msg.uid + print >> sys.stderr, "[imapfilter] classified as %s:" % cls, msg.uid msg = msg.get_full_message() if msg.could_not_retrieve: @@ -963,7 +967,7 @@ # the errors and move it soon enough. if options["globals", "verbose"]: - print "[imapfilter] could not retrieve:", msg.uid + print >> sys.stderr, "[imapfilter] could not retrieve:", msg.uid continue (prob, clues) = classifier.spamprob(msg.tokenize(), @@ -977,24 +981,26 @@ if cls == options["Headers", "header_ham_string"]: if hamfolder: if options["globals", "verbose"]: - print "[imapfilter] moving to ham folder:", msg.uid + print >> sys.stderr, "[imapfilter] moving to ham folder:", + print >> sys.stderr, msg.uid msg.MoveTo(hamfolder) # Otherwise, we leave ham alone. count["ham"] += 1 elif cls == options["Headers", "header_spam_string"]: if options["globals", "verbose"]: - print "[imapfilter] moving to spam folder:", msg.uid + print >> sys.stderr, "[imapfilter] moving to spam folder:", + print >> sys.stderr, msg.uid msg.MoveTo(spamfolder) count["spam"] += 1 else: if options["globals", "verbose"]: - print "[imapfilter] moving to unsure folder:", msg.uid + print >> sys.stderr, "[imapfilter] moving to unsure folder:", msg.uid msg.MoveTo(unsurefolder) count["unsure"] += 1 msg.Save() else: if options["globals", "verbose"]: - print "[imapfilter] already classified:", msg.uid + print >> sys.stderr, "[imapfilter] already classified:", msg.uid return count @@ -1023,44 +1029,44 @@ try: self.imap_server.SelectFolder(fol) except BadIMAPResponseError: - print "Skipping %s, as it cannot be selected." % (fol,) + print >> sys.stderr, "Skipping", fol, "as it cannot be selected." continue if options['globals', 'verbose']: - print " Training %s folder %s" % \ - (["ham", "spam"][is_spam], fol) + print >> sys.stderr, (" Training %s folder %s" % + (["ham", "spam"][is_spam], fol)) folder = IMAPFolder(fol, self.imap_server, self.stats) num_trained = folder.Train(self.classifier, is_spam) total_trained += num_trained if options['globals', 'verbose']: - print "\n %s trained." % (num_trained,) + print >> sys.stderr, "\n ", num_trained, "trained." if total_trained: self.classifier.store() if options["globals", "verbose"]: - print "Training took %.4f seconds, %s messages were trained." \ - % (time.time() - t, total_trained) + print >> sys.stderr, ("Training took %.4f seconds, %s messages were trained." + % (time.time() - t, total_trained)) def Filter(self): assert self.imap_server, "Cannot do anything without IMAP server." if not self.spam_folder: spam_folder_name = options["imap", "spam_folder"] if options["globals", "verbose"]: - print "[imapfilter] spam folder:", spam_folder_name + print >> sys.stderr, "[imapfilter] spam folder:", spam_folder_name self.spam_folder = IMAPFolder( spam_folder_name, self.imap_server, self.stats) if not self.unsure_folder: unsure_folder_name = options["imap", "unsure_folder"] if options["globals", "verbose"]: - print "[imapfilter] unsure folder:", unsure_folder_name + print >> sys.stderr, "[imapfilter] unsure folder:", unsure_folder_name self.unsure_folder = IMAPFolder( unsure_folder_name, self.imap_server, self.stats) ham_folder_name = options["imap", "ham_folder"] if options["globals", "verbose"]: - print "[imapfilter] ham folder:", ham_folder_name + print >> sys.stderr, "[imapfilter] ham folder:", ham_folder_name if ham_folder_name and not self.ham_folder: self.ham_folder = IMAPFolder(ham_folder_name, self.imap_server, @@ -1078,18 +1084,18 @@ try: self.imap_server.SelectFolder(self.spam_folder.name) except BadIMAPResponseError: - print "Cannot select spam folder. Please check configuration." + print >> sys.stderr, "Cannot select spam folder. Please check configuration." sys.exit(-1) try: self.imap_server.SelectFolder(self.unsure_folder.name) except BadIMAPResponseError: - print "Cannot select unsure folder. Please check configuration." + print >> sys.stderr, "Cannot select unsure folder. Please check configuration." sys.exit(-1) if self.ham_folder: try: self.imap_server.SelectFolder(self.ham_folder.name) except BadIMAPResponseError: - print "Cannot select ham folder. Please check configuration." + print >> sys.stderr, "Cannot select ham folder. Please check configuration." sys.exit(-1) for filter_folder in options["imap", "filter_folders"]: @@ -1097,7 +1103,7 @@ try: self.imap_server.SelectFolder(filter_folder) except BadIMAPResponseError: - print "Cannot select %s, skipping." % (filter_folder,) + print >> sys.stderr, "Cannot select", filter_folder, "... skipping." continue folder = IMAPFolder(filter_folder, self.imap_server, self.stats) @@ -1108,9 +1114,9 @@ if options["globals", "verbose"]: if count is not None: - print "\nClassified %s ham, %s spam, and %s unsure." % \ - (count["ham"], count["spam"], count["unsure"]) - print "Classifying took %.4f seconds." % (time.time() - t,) + print >> sys.stderr, ("\nClassified %s ham, %s spam, and %s unsure." % + (count["ham"], count["spam"], count["unsure"])) + print >> sys.stderr, "Classifying took %.4f seconds." % (time.time() - t,) def servers(promptForPass = False): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mhammond at users.sourceforge.net Sat Feb 21 07:19:36 2009 From: mhammond at users.sourceforge.net (mhammond at users.sourceforge.net) Date: Sat, 21 Feb 2009 06:19:36 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3243] trunk/spambayes/Outlook2000/addin.py Message-ID: Revision: 3243 http://spambayes.svn.sourceforge.net/spambayes/?rev=3243&view=rev Author: mhammond Date: 2009-02-21 06:19:36 +0000 (Sat, 21 Feb 2009) Log Message: ----------- make an assertion do what it *looks* like it does Modified Paths: -------------- trunk/spambayes/Outlook2000/addin.py Modified: trunk/spambayes/Outlook2000/addin.py =================================================================== --- trunk/spambayes/Outlook2000/addin.py 2009-02-20 06:57:02 UTC (rev 3242) +++ trunk/spambayes/Outlook2000/addin.py 2009-02-21 06:19:36 UTC (rev 3243) @@ -405,8 +405,8 @@ # then it should be trained as such. self.manager.LogDebug(2, "OnItemAdd event for SPAM folder", self, "with item", item.Subject.encode("mbcs", "ignore")) - assert(not self.manager.config.training.train_manual_spam, - "The folder shouldn't be hooked if this is False") + assert not self.manager.config.training.train_manual_spam, \ + "The folder shouldn't be hooked if this is False" # XXX - Theoretically we could get "not found" exception here, # but we have never guarded for it, and never seen it. If it does # happen life will go on, so for now we continue to ignore it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mhammond at users.sourceforge.net Sat Feb 21 07:20:36 2009 From: mhammond at users.sourceforge.net (mhammond at users.sourceforge.net) Date: Sat, 21 Feb 2009 06:20:36 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3244] trunk/spambayes/windows/py2exe/gen_py Message-ID: Revision: 3244 http://spambayes.svn.sourceforge.net/spambayes/?rev=3244&view=rev Author: mhammond Date: 2009-02-21 06:20:35 +0000 (Sat, 21 Feb 2009) Log Message: ----------- remove deprecated param from generated files Modified Paths: -------------- trunk/spambayes/windows/py2exe/gen_py/office-9.py trunk/spambayes/windows/py2exe/gen_py/outlook-9.py Modified: trunk/spambayes/windows/py2exe/gen_py/office-9.py =================================================================== --- trunk/spambayes/windows/py2exe/gen_py/office-9.py 2009-02-21 06:19:36 UTC (rev 3243) +++ trunk/spambayes/windows/py2exe/gen_py/office-9.py 2009-02-21 06:20:35 UTC (rev 3244) @@ -1482,7 +1482,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret _prop_map_get_ = { @@ -1500,7 +1500,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', None, UnicodeToString=0) + ret = Dispatch(ret, '__call__', None) return ret # str(ob) and int(ob) will use __call__ @@ -1570,7 +1570,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret _prop_map_get_ = { @@ -1588,7 +1588,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', None, UnicodeToString=0) + ret = Dispatch(ret, '__call__', None) return ret # str(ob) and int(ob) will use __call__ @@ -1662,7 +1662,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((16396, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C033A-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C033A-0000-0000-C000-000000000046}') return ret def SetAppModal(self, varfModal=defaultNamedNotOptArg): @@ -1685,7 +1685,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((16396, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C033A-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C033A-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -1803,7 +1803,7 @@ ret = self._oleobj_.InvokeTypes(1610874887, LCID, 1, (9, 0), ((12, 17), (12, 17), (12, 17), (12, 17), (12, 17)),Type , Id, Tag, Visible, Recursive) if ret is not None: - ret = Dispatch(ret, 'FindControl', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'FindControl', '{000C0308-0000-0000-C000-000000000046}') return ret # The method GetaccDefaultAction is actually a property, but must be used as a method to correctly pass the arguments @@ -1879,7 +1879,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -1967,7 +1967,7 @@ ret = self._oleobj_.InvokeTypes(1610874886, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}') return ret def Delete(self, Temporary=defaultNamedOptArg): @@ -2033,7 +2033,7 @@ ret = self._oleobj_.InvokeTypes(1610874902, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}') return ret def Reserved1(self): @@ -2078,7 +2078,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -2175,7 +2175,7 @@ ret = self._oleobj_.InvokeTypes(1610809344, LCID, 1, (9, 0), ((12, 17), (12, 17), (12, 17), (12, 17), (12, 17)),Type , Id, Parameter, Before, Temporary) if ret is not None: - ret = Dispatch(ret, 'Add', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{000C0308-0000-0000-C000-000000000046}') return ret # Result is of type CommandBarControl @@ -2184,7 +2184,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0308-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -2201,7 +2201,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0308-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -2242,7 +2242,7 @@ ret = self._oleobj_.InvokeTypes(1610874886, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}') return ret def Delete(self, Temporary=defaultNamedOptArg): @@ -2308,7 +2308,7 @@ ret = self._oleobj_.InvokeTypes(1610874902, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}') return ret def Reserved1(self): @@ -2353,7 +2353,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -2699,7 +2699,7 @@ def ConvertToShape(self): ret = self._oleobj_.InvokeTypes(11, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'ConvertToShape', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ConvertToShape', '{000C031C-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -2719,7 +2719,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C031C-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -2735,7 +2735,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C031C-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -2857,7 +2857,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((16396, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0358-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0358-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -2873,7 +2873,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((16396, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0358-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0358-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -2975,7 +2975,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -3365,7 +3365,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0333-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0333-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -3384,7 +3384,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0333-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0333-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -3473,7 +3473,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0341-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0341-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -3489,7 +3489,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0341-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0341-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -3570,7 +3570,7 @@ def Duplicate(self): ret = self._oleobj_.InvokeTypes(12, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Duplicate', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Duplicate', '{000C031C-0000-0000-C000-000000000046}') return ret def Flip(self, FlipCmd=defaultNamedNotOptArg): @@ -3614,7 +3614,7 @@ def Ungroup(self): ret = self._oleobj_.InvokeTypes(23, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Ungroup', '{000C031D-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Ungroup', '{000C031D-0000-0000-C000-000000000046}') return ret def ZOrder(self, ZOrderCmd=defaultNamedNotOptArg): @@ -3718,7 +3718,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0318-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0318-0000-0000-C000-000000000046}') return ret def SetEditingType(self, Index=defaultNamedNotOptArg, EditingType=defaultNamedNotOptArg): @@ -3746,7 +3746,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0318-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0318-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -3800,7 +3800,7 @@ def Duplicate(self): ret = self._oleobj_.InvokeTypes(14, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Duplicate', '{000C031D-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Duplicate', '{000C031D-0000-0000-C000-000000000046}') return ret def Flip(self, FlipCmd=defaultNamedNotOptArg): @@ -3811,7 +3811,7 @@ def Group(self): ret = self._oleobj_.InvokeTypes(19, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Group', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Group', '{000C031C-0000-0000-C000-000000000046}') return ret def IncrementLeft(self, Increment=defaultNamedNotOptArg): @@ -3831,7 +3831,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C031C-0000-0000-C000-000000000046}') return ret def PickUp(self): @@ -3841,7 +3841,7 @@ def Regroup(self): ret = self._oleobj_.InvokeTypes(21, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Regroup', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Regroup', '{000C031C-0000-0000-C000-000000000046}') return ret def RerouteConnections(self): @@ -3866,7 +3866,7 @@ def Ungroup(self): ret = self._oleobj_.InvokeTypes(27, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Ungroup', '{000C031D-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Ungroup', '{000C031D-0000-0000-C000-000000000046}') return ret def ZOrder(self, ZOrderCmd=defaultNamedNotOptArg): @@ -3941,7 +3941,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C031C-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -3983,7 +3983,7 @@ ret = self._oleobj_.InvokeTypes(10, LCID, 1, (9, 0), ((3, 1), (4, 1), (4, 1), (4, 1), (4, 1)),Type , Left, Top, Width, Height) if ret is not None: - ret = Dispatch(ret, 'AddCallout', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddCallout', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -3992,7 +3992,7 @@ ret = self._oleobj_.InvokeTypes(11, LCID, 1, (9, 0), ((3, 1), (4, 1), (4, 1), (4, 1), (4, 1)),Type , BeginX, BeginY, EndX, EndY) if ret is not None: - ret = Dispatch(ret, 'AddConnector', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddConnector', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4000,7 +4000,7 @@ ret = self._oleobj_.InvokeTypes(12, LCID, 1, (9, 0), ((12, 1),),SafeArrayOfPoints ) if ret is not None: - ret = Dispatch(ret, 'AddCurve', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddCurve', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4009,7 +4009,7 @@ ret = self._oleobj_.InvokeTypes(13, LCID, 1, (9, 0), ((3, 1), (4, 1), (4, 1), (4, 1), (4, 1)),Orientation , Left, Top, Width, Height) if ret is not None: - ret = Dispatch(ret, 'AddLabel', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddLabel', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4017,7 +4017,7 @@ ret = self._oleobj_.InvokeTypes(14, LCID, 1, (9, 0), ((4, 1), (4, 1), (4, 1), (4, 1)),BeginX , BeginY, EndX, EndY) if ret is not None: - ret = Dispatch(ret, 'AddLine', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddLine', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4027,7 +4027,7 @@ , LinkToFile, SaveWithDocument, Left, Top, Width , Height) if ret is not None: - ret = Dispatch(ret, 'AddPicture', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddPicture', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4035,7 +4035,7 @@ ret = self._oleobj_.InvokeTypes(16, LCID, 1, (9, 0), ((12, 1),),SafeArrayOfPoints ) if ret is not None: - ret = Dispatch(ret, 'AddPolyline', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddPolyline', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4044,7 +4044,7 @@ ret = self._oleobj_.InvokeTypes(17, LCID, 1, (9, 0), ((3, 1), (4, 1), (4, 1), (4, 1), (4, 1)),Type , Left, Top, Width, Height) if ret is not None: - ret = Dispatch(ret, 'AddShape', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddShape', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4054,7 +4054,7 @@ , Text, FontName, FontSize, FontBold, FontItalic , Left, Top) if ret is not None: - ret = Dispatch(ret, 'AddTextEffect', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddTextEffect', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4063,7 +4063,7 @@ ret = self._oleobj_.InvokeTypes(19, LCID, 1, (9, 0), ((3, 1), (4, 1), (4, 1), (4, 1), (4, 1)),Orientation , Left, Top, Width, Height) if ret is not None: - ret = Dispatch(ret, 'AddTextbox', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddTextbox', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type FreeformBuilder @@ -4071,7 +4071,7 @@ ret = self._oleobj_.InvokeTypes(20, LCID, 1, (9, 0), ((3, 1), (4, 1), (4, 1)),EditingType , X1, Y1) if ret is not None: - ret = Dispatch(ret, 'BuildFreeform', '{000C0315-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'BuildFreeform', '{000C0315-0000-0000-C000-000000000046}') return ret # Result is of type Shape @@ -4079,7 +4079,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C031C-0000-0000-C000-000000000046}') return ret # Result is of type ShapeRange @@ -4087,7 +4087,7 @@ ret = self._oleobj_.InvokeTypes(21, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Range', '{000C031D-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Range', '{000C031D-0000-0000-C000-000000000046}') return ret def SelectAll(self): @@ -4110,7 +4110,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C031C-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C031C-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -4285,7 +4285,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0913-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0913-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -4300,7 +4300,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0913-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0913-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -4341,7 +4341,7 @@ ret = self._oleobj_.InvokeTypes(1610874886, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}') return ret def Delete(self, Temporary=defaultNamedOptArg): @@ -4410,7 +4410,7 @@ ret = self._oleobj_.InvokeTypes(1610874902, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}') return ret # The method QueryControlInterface is actually a property, but must be used as a method to correctly pass the arguments @@ -4423,7 +4423,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'QueryControlInterface', None, UnicodeToString=0) + ret = Dispatch(ret, 'QueryControlInterface', None) return ret def Reserved1(self): @@ -4472,7 +4472,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -4571,7 +4571,7 @@ ret = self._oleobj_.InvokeTypes(1610874886, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}') return ret def CopyFace(self): @@ -4640,7 +4640,7 @@ ret = self._oleobj_.InvokeTypes(1610874902, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}') return ret def PasteFace(self): @@ -4688,7 +4688,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -4855,7 +4855,7 @@ ret = self._oleobj_.InvokeTypes(1610874886, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Copy', '{000C0308-0000-0000-C000-000000000046}') return ret def Delete(self, Temporary=defaultNamedOptArg): @@ -4927,7 +4927,7 @@ ret = self._oleobj_.InvokeTypes(1610874902, LCID, 1, (9, 0), ((12, 17), (12, 17)),Bar , Before) if ret is not None: - ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Move', '{000C0308-0000-0000-C000-000000000046}') return ret def RemoveItem(self, Index=defaultNamedNotOptArg): @@ -4981,7 +4981,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): @@ -5142,7 +5142,7 @@ ret = self._oleobj_.InvokeTypes(1610809346, LCID, 1, (9, 0), ((12, 17), (12, 17), (12, 17), (12, 17)),Name , Position, MenuBar, Temporary) if ret is not None: - ret = Dispatch(ret, 'Add', '{000C0304-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{000C0304-0000-0000-C000-000000000046}') return ret # Result is of type CommandBar @@ -5151,7 +5151,7 @@ ret = self._oleobj_.InvokeTypes(1610809366, LCID, 1, (9, 0), ((12, 17), (12, 17), (12, 17), (12, 17), (12, 17)),TbidOrName , Position, MenuBar, Temporary, TbtrProtection) if ret is not None: - ret = Dispatch(ret, 'AddEx', '{000C0304-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'AddEx', '{000C0304-0000-0000-C000-000000000046}') return ret # Result is of type CommandBarControl @@ -5159,7 +5159,7 @@ ret = self._oleobj_.InvokeTypes(1610809352, LCID, 1, (9, 0), ((12, 17), (12, 17), (12, 17), (12, 17)),Type , Id, Tag, Visible) if ret is not None: - ret = Dispatch(ret, 'FindControl', '{000C0308-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'FindControl', '{000C0308-0000-0000-C000-000000000046}') return ret # Result is of type CommandBarControls @@ -5167,7 +5167,7 @@ ret = self._oleobj_.InvokeTypes(1610809365, LCID, 1, (9, 0), ((12, 17), (12, 17), (12, 17), (12, 17)),Type , Id, Tag, Visible) if ret is not None: - ret = Dispatch(ret, 'FindControls', '{000C0306-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'FindControls', '{000C0306-0000-0000-C000-000000000046}') return ret # The method IdsString is actually a property, but must be used as a method to correctly pass the arguments @@ -5181,7 +5181,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{000C0304-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{000C0304-0000-0000-C000-000000000046}') return ret def ReleaseFocus(self): @@ -5221,7 +5221,7 @@ ret = self._oleobj_.InvokeTypes(0, LCID, 2, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, '__call__', '{000C0304-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, '__call__', '{000C0304-0000-0000-C000-000000000046}') return ret # str(ob) and int(ob) will use __call__ @@ -5386,7 +5386,7 @@ ret = self._oleobj_.InvokeTypes(-5002, LCID, 2, (9, 0), ((12, 1),),varChild ) if ret is not None: - ret = Dispatch(ret, 'accChild', None, UnicodeToString=0) + ret = Dispatch(ret, 'accChild', None) return ret def accDoDefaultAction(self, varChild=defaultNamedOptArg): Modified: trunk/spambayes/windows/py2exe/gen_py/outlook-9.py =================================================================== --- trunk/spambayes/windows/py2exe/gen_py/outlook-9.py 2009-02-21 06:19:36 UTC (rev 3243) +++ trunk/spambayes/windows/py2exe/gen_py/outlook-9.py 2009-02-21 06:20:35 UTC (rev 3244) @@ -288,7 +288,7 @@ def Execute(self): ret = self._oleobj_.InvokeTypes(106, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Execute', None, UnicodeToString=0) + ret = Dispatch(ret, 'Execute', None) return ret _prop_map_get_ = { @@ -326,7 +326,7 @@ def Add(self): ret = self._oleobj_.InvokeTypes(100, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063043-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063043-0000-0000-C000-000000000046}') return ret # Result is of type Action @@ -334,7 +334,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063043-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063043-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -371,35 +371,35 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((8, 1), (12, 17), (12, 17)),Type , Name, Address) if ret is not None: - ret = Dispatch(ret, 'Add', '{0006304B-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{0006304B-0000-0000-C000-000000000046}') return ret # Result is of type AddressEntry def GetFirst(self): ret = self._oleobj_.InvokeTypes(86, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetFirst', '{0006304B-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetFirst', '{0006304B-0000-0000-C000-000000000046}') return ret # Result is of type AddressEntry def GetLast(self): ret = self._oleobj_.InvokeTypes(88, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetLast', '{0006304B-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetLast', '{0006304B-0000-0000-C000-000000000046}') return ret # Result is of type AddressEntry def GetNext(self): ret = self._oleobj_.InvokeTypes(87, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetNext', '{0006304B-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetNext', '{0006304B-0000-0000-C000-000000000046}') return ret # Result is of type AddressEntry def GetPrevious(self): ret = self._oleobj_.InvokeTypes(89, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetPrevious', '{0006304B-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetPrevious', '{0006304B-0000-0000-C000-000000000046}') return ret # Result is of type AddressEntry @@ -407,7 +407,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{0006304B-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{0006304B-0000-0000-C000-000000000046}') return ret def Sort(self, Property=defaultNamedOptArg, Order=defaultNamedOptArg): @@ -514,7 +514,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063049-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063049-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -624,7 +624,7 @@ ret = self._oleobj_.InvokeTypes(101, LCID, 1, (9, 0), ((12, 1), (12, 17), (12, 17), (12, 17)),Source , Type, Position, DisplayName) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063007-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063007-0000-0000-C000-000000000046}') return ret # Result is of type Attachment @@ -632,7 +632,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063007-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063007-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -688,7 +688,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{0006304D-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{0006304D-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -1101,7 +1101,7 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((9, 1),),Item ) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063089-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063089-0000-0000-C000-000000000046}') return ret # Result is of type Link @@ -1109,7 +1109,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063089-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063089-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -1149,7 +1149,7 @@ ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), ((9, 1),),DestinationFolder ) if ret is not None: - ret = Dispatch(ret, 'CopyTo', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'CopyTo', '{00063006-0000-0000-C000-000000000046}') return ret def Delete(self): @@ -1163,7 +1163,7 @@ ret = self._oleobj_.InvokeTypes(12545, LCID, 1, (9, 0), ((12, 17),),DisplayMode ) if ret is not None: - ret = Dispatch(ret, 'GetExplorer', '{00063003-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetExplorer', '{00063003-0000-0000-C000-000000000046}') return ret def MoveTo(self, DestinationFolder=defaultNamedNotOptArg): @@ -1458,14 +1458,14 @@ ret = self._oleobj_.InvokeTypes(300, LCID, 1, (9, 0), ((12, 17),),Name ) if ret is not None: - ret = Dispatch(ret, 'Add', None, UnicodeToString=0) + ret = Dispatch(ret, 'Add', None) return ret def Item(self, Index=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -1501,7 +1501,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret _prop_map_get_ = { @@ -1565,7 +1565,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -1646,7 +1646,7 @@ ret = self._oleobj_.InvokeTypes(111, LCID, 1, (9, 0), ((8, 1),),Name ) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063045-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063045-0000-0000-C000-000000000046}') return ret # Result is of type Recipient @@ -1654,7 +1654,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063045-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063045-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -1699,7 +1699,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'GetOccurrence', '{00061030-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetOccurrence', '{00061030-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -1751,7 +1751,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret _prop_map_get_ = { @@ -1831,7 +1831,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Item', '{00063084-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063084-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -1864,7 +1864,7 @@ ret = self._oleobj_.InvokeTypes(102, LCID, 1, (9, 0), ((8, 1), (3, 1), (12, 17), (12, 17)),Name , Type, AddToFolderFields, DisplayFormat) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063042-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063042-0000-0000-C000-000000000046}') return ret # Result is of type UserProperty @@ -1872,7 +1872,7 @@ ret = self._oleobj_.InvokeTypes(103, LCID, 1, (9, 0), ((8, 1), (12, 17)),Name , Custom) if ret is not None: - ret = Dispatch(ret, 'Find', '{00063042-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Find', '{00063042-0000-0000-C000-000000000046}') return ret # Result is of type UserProperty @@ -1880,7 +1880,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063042-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063042-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -1957,41 +1957,41 @@ def ActiveExplorer(self): ret = self._oleobj_.InvokeTypes(273, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'ActiveExplorer', '{00063003-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ActiveExplorer', '{00063003-0000-0000-C000-000000000046}') return ret # Result is of type _Inspector def ActiveInspector(self): ret = self._oleobj_.InvokeTypes(274, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'ActiveInspector', '{00063005-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ActiveInspector', '{00063005-0000-0000-C000-000000000046}') return ret def ActiveWindow(self): ret = self._oleobj_.InvokeTypes(287, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'ActiveWindow', None, UnicodeToString=0) + ret = Dispatch(ret, 'ActiveWindow', None) return ret def CreateItem(self, ItemType=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(266, LCID, 1, (9, 0), ((3, 1),),ItemType ) if ret is not None: - ret = Dispatch(ret, 'CreateItem', None, UnicodeToString=0) + ret = Dispatch(ret, 'CreateItem', None) return ret def CreateItemFromTemplate(self, TemplatePath=defaultNamedNotOptArg, InFolder=defaultNamedOptArg): ret = self._oleobj_.InvokeTypes(267, LCID, 1, (9, 0), ((8, 1), (12, 17)),TemplatePath , InFolder) if ret is not None: - ret = Dispatch(ret, 'CreateItemFromTemplate', None, UnicodeToString=0) + ret = Dispatch(ret, 'CreateItemFromTemplate', None) return ret def CreateObject(self, ObjectName=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(277, LCID, 1, (9, 0), ((8, 1),),ObjectName ) if ret is not None: - ret = Dispatch(ret, 'CreateObject', None, UnicodeToString=0) + ret = Dispatch(ret, 'CreateObject', None) return ret # Result is of type _NameSpace @@ -1999,7 +1999,7 @@ ret = self._oleobj_.InvokeTypes(272, LCID, 1, (9, 0), ((8, 1),),Type ) if ret is not None: - ret = Dispatch(ret, 'GetNamespace', '{00063002-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetNamespace', '{00063002-0000-0000-C000-000000000046}') return ret def Quit(self): @@ -2047,7 +2047,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -2066,21 +2066,21 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'ForwardAsVcal', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ForwardAsVcal', '{00061033-0000-0000-C000-000000000046}') return ret # Result is of type RecurrencePattern def GetRecurrencePattern(self): ret = self._oleobj_.InvokeTypes(61604, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetRecurrencePattern', '{00063044-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetRecurrencePattern', '{00063044-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -2096,7 +2096,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Respond', '{00061036-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Respond', '{00061036-0000-0000-C000-000000000046}') return ret def Save(self): @@ -2233,7 +2233,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -2252,14 +2252,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'ForwardAsVcard', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ForwardAsVcard', '{00061033-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -2656,7 +2656,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -2671,14 +2671,14 @@ ret = self._oleobj_.InvokeTypes(63749, LCID, 1, (9, 0), ((3, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'GetMember', '{00063045-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetMember', '{00063045-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -2769,7 +2769,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -2783,7 +2783,7 @@ ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -2915,7 +2915,7 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((12, 1), (3, 17)),Folder , DisplayMode) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063003-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063003-0000-0000-C000-000000000046}') return ret # Result is of type Explorer @@ -2928,7 +2928,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Item', '{00063050-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063050-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -2961,35 +2961,35 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((8, 1), (12, 17)),Name , Type) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063006-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder def GetFirst(self): ret = self._oleobj_.InvokeTypes(86, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetFirst', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetFirst', '{00063006-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder def GetLast(self): ret = self._oleobj_.InvokeTypes(88, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetLast', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetLast', '{00063006-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder def GetNext(self): ret = self._oleobj_.InvokeTypes(87, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetNext', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetNext', '{00063006-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder def GetPrevious(self): ret = self._oleobj_.InvokeTypes(89, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetPrevious', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetPrevious', '{00063006-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder @@ -2997,7 +2997,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063006-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -3126,7 +3126,7 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((9, 1),),Item ) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063005-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063005-0000-0000-C000-000000000046}') return ret # Result is of type Inspector @@ -3139,7 +3139,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Item', '{00063058-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063058-0000-0000-C000-000000000046}') return ret _prop_map_get_ = { @@ -3171,51 +3171,51 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((12, 17),),Type ) if ret is not None: - ret = Dispatch(ret, 'Add', None, UnicodeToString=0) + ret = Dispatch(ret, 'Add', None) return ret def Find(self, Filter=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(98, LCID, 1, (9, 0), ((8, 1),),Filter ) if ret is not None: - ret = Dispatch(ret, 'Find', None, UnicodeToString=0) + ret = Dispatch(ret, 'Find', None) return ret def FindNext(self): ret = self._oleobj_.InvokeTypes(99, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'FindNext', None, UnicodeToString=0) + ret = Dispatch(ret, 'FindNext', None) return ret def GetFirst(self): ret = self._oleobj_.InvokeTypes(86, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetFirst', None, UnicodeToString=0) + ret = Dispatch(ret, 'GetFirst', None) return ret def GetLast(self): ret = self._oleobj_.InvokeTypes(88, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetLast', None, UnicodeToString=0) + ret = Dispatch(ret, 'GetLast', None) return ret def GetNext(self): ret = self._oleobj_.InvokeTypes(87, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetNext', None, UnicodeToString=0) + ret = Dispatch(ret, 'GetNext', None) return ret def GetPrevious(self): ret = self._oleobj_.InvokeTypes(89, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetPrevious', None, UnicodeToString=0) + ret = Dispatch(ret, 'GetPrevious', None) return ret def Item(self, Index=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', None, UnicodeToString=0) + ret = Dispatch(ret, 'Item', None) return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -3230,7 +3230,7 @@ ret = self._oleobj_.InvokeTypes(100, LCID, 1, (9, 0), ((8, 1),),Filter ) if ret is not None: - ret = Dispatch(ret, 'Restrict', '{00063041-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Restrict', '{00063041-0000-0000-C000-000000000046}') return ret def SetColumns(self, Columns=defaultNamedNotOptArg): @@ -3276,7 +3276,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -3295,14 +3295,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Forward', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Forward', '{00061033-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -3317,7 +3317,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}') return ret # Result is of type MailItem @@ -3329,7 +3329,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'ReplyAll', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ReplyAll', '{00061033-0000-0000-C000-000000000046}') return ret def Save(self): @@ -3434,7 +3434,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -3453,14 +3453,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Forward', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Forward', '{00061033-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -3475,7 +3475,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}') return ret # Result is of type MailItem @@ -3487,7 +3487,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'ReplyAll', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ReplyAll', '{00061033-0000-0000-C000-000000000046}') return ret def Save(self): @@ -3631,7 +3631,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -3650,7 +3650,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Forward', '{00061036-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Forward', '{00061036-0000-0000-C000-000000000046}') return ret # Result is of type AppointmentItem @@ -3663,14 +3663,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'GetAssociatedAppointment', '{00061030-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetAssociatedAppointment', '{00061030-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -3685,7 +3685,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}') return ret # Result is of type MailItem @@ -3697,7 +3697,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'ReplyAll', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'ReplyAll', '{00061033-0000-0000-C000-000000000046}') return ret def Save(self): @@ -3811,7 +3811,7 @@ ret = self._oleobj_.InvokeTypes(8458, LCID, 1, (9, 0), ((8, 1),),RecipientName ) if ret is not None: - ret = Dispatch(ret, 'CreateRecipient', '{00063045-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'CreateRecipient', '{00063045-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder @@ -3819,7 +3819,7 @@ ret = self._oleobj_.InvokeTypes(8459, LCID, 1, (9, 0), ((3, 1),),FolderType ) if ret is not None: - ret = Dispatch(ret, 'GetDefaultFolder', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetDefaultFolder', '{00063006-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder @@ -3827,14 +3827,14 @@ ret = self._oleobj_.InvokeTypes(8456, LCID, 1, (9, 0), ((8, 1), (12, 17)),EntryIDFolder , EntryIDStore) if ret is not None: - ret = Dispatch(ret, 'GetFolderFromID', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetFolderFromID', '{00063006-0000-0000-C000-000000000046}') return ret def GetItemFromID(self, EntryIDItem=defaultNamedNotOptArg, EntryIDStore=defaultNamedOptArg): ret = self._oleobj_.InvokeTypes(8457, LCID, 1, (9, 0), ((8, 1), (12, 17)),EntryIDItem , EntryIDStore) if ret is not None: - ret = Dispatch(ret, 'GetItemFromID', None, UnicodeToString=0) + ret = Dispatch(ret, 'GetItemFromID', None) return ret # Result is of type Recipient @@ -3842,7 +3842,7 @@ ret = self._oleobj_.InvokeTypes(8455, LCID, 1, (9, 0), ((8, 1),),EntryID ) if ret is not None: - ret = Dispatch(ret, 'GetRecipientFromID', '{00063045-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetRecipientFromID', '{00063045-0000-0000-C000-000000000046}') return ret # Result is of type MAPIFolder @@ -3850,7 +3850,7 @@ ret = self._oleobj_.InvokeTypes(8460, LCID, 1, (9, 0), ((9, 1), (3, 1)),Recipient , FolderType) if ret is not None: - ret = Dispatch(ret, 'GetSharedDefaultFolder', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetSharedDefaultFolder', '{00063006-0000-0000-C000-000000000046}') return ret def Logoff(self): @@ -3864,7 +3864,7 @@ def PickFolder(self): ret = self._oleobj_.InvokeTypes(8462, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'PickFolder', '{00063006-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'PickFolder', '{00063006-0000-0000-C000-000000000046}') return ret def RefreshRemoteHeaders(self): @@ -3905,7 +3905,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -3919,7 +3919,7 @@ ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -3978,7 +3978,7 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((8, 1), (12, 17)),Name , Index) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063073-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063073-0000-0000-C000-000000000046}') return ret # Result is of type OutlookBarGroup @@ -3986,7 +3986,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063073-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063073-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -4059,7 +4059,7 @@ ret = self._oleobj_.InvokeTypes(95, LCID, 1, (9, 0), ((12, 1), (8, 1), (12, 17)),Target , Name, Index) if ret is not None: - ret = Dispatch(ret, 'Add', '{00063075-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Add', '{00063075-0000-0000-C000-000000000046}') return ret # Result is of type OutlookBarShortcut @@ -4067,7 +4067,7 @@ ret = self._oleobj_.InvokeTypes(81, LCID, 1, (9, 0), ((12, 1),),Index ) if ret is not None: - ret = Dispatch(ret, 'Item', '{00063075-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Item', '{00063075-0000-0000-C000-000000000046}') return ret def Remove(self, Index=defaultNamedNotOptArg): @@ -4109,7 +4109,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4128,14 +4128,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Forward', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Forward', '{00061033-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def Post(self): @@ -4153,7 +4153,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Reply', '{00061033-0000-0000-C000-000000000046}') return ret def Save(self): @@ -4236,7 +4236,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4250,7 +4250,7 @@ ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -4333,7 +4333,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4347,7 +4347,7 @@ ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -4450,7 +4450,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Assign', '{00061032-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Assign', '{00061032-0000-0000-C000-000000000046}') return ret def CancelResponseState(self): @@ -4466,7 +4466,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4480,7 +4480,7 @@ def GetRecurrencePattern(self): ret = self._oleobj_.InvokeTypes(61604, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'GetRecurrencePattern', '{00063044-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetRecurrencePattern', '{00063044-0000-0000-C000-000000000046}') return ret def MarkComplete(self): @@ -4490,7 +4490,7 @@ ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -4506,7 +4506,7 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'Respond', '{00061032-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'Respond', '{00061032-0000-0000-C000-000000000046}') return ret def Save(self): @@ -4525,7 +4525,7 @@ def StatusReport(self): ret = self._oleobj_.InvokeTypes(62994, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'StatusReport', None, UnicodeToString=0) + ret = Dispatch(ret, 'StatusReport', None) return ret _prop_map_get_ = { @@ -4647,7 +4647,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4667,14 +4667,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -4753,7 +4753,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4773,14 +4773,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -4859,7 +4859,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4879,14 +4879,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): @@ -4965,7 +4965,7 @@ def Copy(self): ret = self._oleobj_.InvokeTypes(61490, LCID, 1, (9, 0), (),) if ret is not None: - ret = Dispatch(ret, 'Copy', None, UnicodeToString=0) + ret = Dispatch(ret, 'Copy', None) return ret def Delete(self): @@ -4985,14 +4985,14 @@ ret = ret.QueryInterface(pythoncom.IID_IDispatch) except pythoncom.error: return ret - ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}', UnicodeToString=0) + ret = Dispatch(ret, 'GetAssociatedTask', '{00061032-0000-0000-C000-000000000046}') return ret def Move(self, DestFldr=defaultNamedNotOptArg): ret = self._oleobj_.InvokeTypes(61492, LCID, 1, (9, 0), ((9, 1),),DestFldr ) if ret is not None: - ret = Dispatch(ret, 'Move', None, UnicodeToString=0) + ret = Dispatch(ret, 'Move', None) return ret def PrintOut(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mhammond at users.sourceforge.net Sat Feb 21 07:23:18 2009 From: mhammond at users.sourceforge.net (mhammond at users.sourceforge.net) Date: Sat, 21 Feb 2009 06:23:18 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3245] trunk/spambayes/windows/py2exe/setup_all.py Message-ID: Revision: 3245 http://spambayes.svn.sourceforge.net/spambayes/?rev=3245&view=rev Author: mhammond Date: 2009-02-21 06:23:18 +0000 (Sat, 21 Feb 2009) Log Message: ----------- * Don't distribute powrprof.dll, which we try to do when built on vista. * Pull the entire email package in. * Use .pyo files in binary builds. * Correct location of gocr (my old CVS dir structure was 'unusual' :) Modified Paths: -------------- trunk/spambayes/windows/py2exe/setup_all.py Modified: trunk/spambayes/windows/py2exe/setup_all.py =================================================================== --- trunk/spambayes/windows/py2exe/setup_all.py 2009-02-21 06:20:35 UTC (rev 3244) +++ trunk/spambayes/windows/py2exe/setup_all.py 2009-02-21 06:23:18 UTC (rev 3245) @@ -47,20 +47,21 @@ "spambayes.languages.fr,spambayes.languages.es.DIALOGS," \ "spambayes.languages.es_AR.DIALOGS," \ "spambayes.languages.fr.DIALOGS," \ - "PIL", + "PIL,email", excludes = "Tkinter," # side-effect of PIL and markh doesn't have it :) "win32ui,pywin,pywin.debugger," # *sob* - these still appear # Keep zope out else outlook users lose training. "ZODB,ZEO,zope,persistent,BTrees", includes = "dialogs.resources.dialogs,weakref," # Outlook dynamic dialogs "BmpImagePlugin,JpegImagePlugin", # PIL modules not auto found - dll_excludes = "dapi.dll,mapi32.dll," + dll_excludes = "dapi.dll,mapi32.dll,powrprof.dll," "tk84.dll,tcl84.dll", # No Tkinter == no tk/tcl dlls typelibs = [ ('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0, 'gen_py/outlook-9.py'), ('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1, 'gen_py/office-9.py'), ('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}', 0, 1, 0, 'gen_py/addin-designer.py'), - ] + ], + optimize = 1, ) # These must be the same IDs as in the dialogs. We really should just extract @@ -95,9 +96,9 @@ # A "register" utility for Outlook. This should not be necessary, as # 'regsvr32 dllname' does exactly the same thing. However, Inno Setup -# version 4 appears to, upon uninstall, do something that prevents the -# files used by the unregister process to be deleted. Unregistering via -# this EXE solves the problem. +# registers "in process", and as Python doesn't completely clean up as its +# DLL is unloaded, we end up with the situation files remain in use. +# Unregistering via this EXE solves the problem. outlook_addin_register = dict( script = os.path.join(sb_top_dir, r"Outlook2000\addin.py"), dest_base = "bin/outlook_addin_register", @@ -179,7 +180,7 @@ ["", [os.path.join(sb_top_dir, r"LICENSE.txt")]], # We insist gocr.exe is in the 'spambayes' package dir (we can make # this smarter as necessary) - ["bin", [os.path.join(sb_top_dir, "spambayes", "gocr.exe")]], + ["bin", [os.path.join(sb_top_dir, "gocr.exe")]], # Our .txt file with info on gocr itself. ["bin", [os.path.join(sb_top_dir, "windows", "py2exe", "gocr.txt")]], ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Mon Feb 23 08:18:36 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Mon, 23 Feb 2009 07:18:36 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3246] trunk/spambayes/README-DEVEL.txt Message-ID: Revision: 3246 http://spambayes.svn.sourceforge.net/spambayes/?rev=3246&view=rev Author: montanaro Date: 2009-02-23 07:18:35 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Update copyright. Add short section about running currently incomplete set of unit tests. Modified Paths: -------------- trunk/spambayes/README-DEVEL.txt Modified: trunk/spambayes/README-DEVEL.txt =================================================================== --- trunk/spambayes/README-DEVEL.txt 2009-02-21 06:23:18 UTC (rev 3245) +++ trunk/spambayes/README-DEVEL.txt 2009-02-23 07:18:35 UTC (rev 3246) @@ -1,4 +1,4 @@ -Copyright (C) 2002-2007 Python Software Foundation; All Rights Reserved +Copyright (C) 2002-2009 Python Software Foundation; All Rights Reserved The Python Software Foundation (PSF) holds copyright on all material in this project. You may use it under the terms of the PSF license; @@ -33,6 +33,26 @@ The SpamBayes project source code is hosted at SourceForge (http://spambayes.sourceforge.net/). Access is via Subversion. +Running Unit Tests +================== + +SpamBayes has a currently incomplete set of unit tests, not all of which +pass, due, in part, to bit rot. We are working on getting the unit tests to +run using the `nose `_ +package. After downloading and installing nose, you can run the current +unit tests on Unix-like systems like so from the SpamBayes top-level +directory:: + + TMPDIR=/tmp BAYESCUSTOMIZE= nosetests2.7 -v . 2>&1 \ + | sed -e "s:$(pwd)/::" \ + -e "s:$(python -c 'import sys ; print sys.exec_prefix')/::" \ + | tee failing-unit-tests.txt + +The file, failing-unit-tests.txt, is checked into the Subversion repository +at the top level using Python from Subversion (currently 2.7a0). You can +look at it for any failing unit tests and work to get them passing, or write +new tests. + Primary Core Files ================== Options.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Mon Feb 23 08:21:55 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Mon, 23 Feb 2009 07:21:55 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3247] trunk/spambayes/spambayes/test/ test_sb_imapfilter.py Message-ID: Revision: 3247 http://spambayes.svn.sourceforge.net/spambayes/?rev=3247&view=rev Author: montanaro Date: 2009-02-23 07:21:52 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Use threading module instead of thread module. Modified Paths: -------------- trunk/spambayes/spambayes/test/test_sb_imapfilter.py Modified: trunk/spambayes/spambayes/test/test_sb_imapfilter.py =================================================================== --- trunk/spambayes/spambayes/test/test_sb_imapfilter.py 2009-02-23 07:18:35 UTC (rev 3246) +++ trunk/spambayes/spambayes/test/test_sb_imapfilter.py 2009-02-23 07:21:52 UTC (rev 3247) @@ -6,7 +6,7 @@ import email import types import socket -import thread +import threading import imaplib import unittest import asyncore @@ -347,7 +347,6 @@ self.assert_(self.imap.logged_in) def testBadLogin(self): - print "\nYou should see a message indicating that login failed." self.assertRaises(LoginFailure, self.imap.login, IMAP_USERNAME, "wrong password") @@ -802,7 +801,9 @@ def setUp(self): self.saved_server = options["imap", "server"] options["imap", "server"] = "" - thread.start_new_thread(run, (True,)) + self._server = threading.Thread(target=run, args=(True,)) + self._server.setDaemon(True) + self._server.start() # Wait for it to be ready. time.sleep(1) @@ -843,5 +844,8 @@ def runTestServer(): TestListener() asyncore.loop() - thread.start_new_thread(runTestServer, ()) + server = threading.Thread(target=runTestServer, args=()) + server.setDaemon(True) + server.start() + time.sleep(2) sb_test_support.unittest_main(argv=sys.argv + ['suite']) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From montanaro at users.sourceforge.net Mon Feb 23 08:22:55 2009 From: montanaro at users.sourceforge.net (montanaro at users.sourceforge.net) Date: Mon, 23 Feb 2009 07:22:55 +0000 Subject: [Spambayes-checkins] SF.net SVN: spambayes:[3248] trunk/spambayes/README-DEVEL.txt Message-ID: Revision: 3248 http://spambayes.svn.sourceforge.net/spambayes/?rev=3248&view=rev Author: montanaro Date: 2009-02-23 07:22:54 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Remove specific version in nosetests command. Modified Paths: -------------- trunk/spambayes/README-DEVEL.txt Modified: trunk/spambayes/README-DEVEL.txt =================================================================== --- trunk/spambayes/README-DEVEL.txt 2009-02-23 07:21:52 UTC (rev 3247) +++ trunk/spambayes/README-DEVEL.txt 2009-02-23 07:22:54 UTC (rev 3248) @@ -43,7 +43,7 @@ unit tests on Unix-like systems like so from the SpamBayes top-level directory:: - TMPDIR=/tmp BAYESCUSTOMIZE= nosetests2.7 -v . 2>&1 \ + TMPDIR=/tmp BAYESCUSTOMIZE= nosetests -v . 2>&1 \ | sed -e "s:$(pwd)/::" \ -e "s:$(python -c 'import sys ; print sys.exec_prefix')/::" \ | tee failing-unit-tests.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.