Mercurial > p > roundup > code
diff website/issues/extensions/spambayes.py @ 5408:e46ce04d5bbc
Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.
New roundup/anypy/xmlrpc_.py added. Manual patch.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 00:16:00 +0000 |
| parents | 0942fe89e82e |
| children |
line wrap: on
line diff
--- a/website/issues/extensions/spambayes.py Wed Jul 25 00:14:40 2018 +0000 +++ b/website/issues/extensions/spambayes.py Wed Jul 25 00:16:00 2018 +0000 @@ -1,8 +1,9 @@ import re, math from roundup.cgi.actions import Action from roundup.cgi.exceptions import * +from roundup.anypy import xmlrpc_ -import xmlrpclib, socket +import socket REVPAT = re.compile(r'(r[0-9]+\b|rev(ision)? [0-9]+\b)') @@ -26,11 +27,11 @@ def train_spambayes(db, content, tokens, is_spam): spambayes_uri = db.config.detectors['SPAMBAYES_URI'] - server = xmlrpclib.ServerProxy(spambayes_uri, verbose=False) + server = xmlrpc_.client.ServerProxy(spambayes_uri, verbose=False) try: server.train({'content':content}, tokens, {}, is_spam) return (True, None) - except (socket.error, xmlrpclib.Error) as e: + except (socket.error, xmlrpc_.client.Error) as e: return (False, str(e))
