Pushing a bunch of random stuff.
This commit is contained in:
parent
45efe177bb
commit
a500cead3b
3 changed files with 12 additions and 13 deletions
|
@ -1,7 +1,5 @@
|
|||
# Written by Scaevolus 2010
|
||||
from util import hook, http
|
||||
from util.text import multiword_replace
|
||||
from util.execute import eval_py
|
||||
from util import hook, http, text, execute
|
||||
import string
|
||||
import sqlite3
|
||||
import re
|
||||
|
@ -137,7 +135,7 @@ def factoid(inp, say=None, db=None, bot=None, me=None, conn=None, input=None):
|
|||
code = data[4:].strip()
|
||||
variables = 'input="""%s"""; nick="%s"; chan="%s"; bot_nick="%s";' % (arguments.replace('"', '\\"'),
|
||||
input.nick, input.chan, input.conn.nick)
|
||||
result = eval_py(variables + code)
|
||||
result = execute.eval_py(variables + code)
|
||||
elif data.startswith("<url>"):
|
||||
url = data[5:].strip()
|
||||
try:
|
||||
|
@ -148,7 +146,7 @@ def factoid(inp, say=None, db=None, bot=None, me=None, conn=None, input=None):
|
|||
result = data
|
||||
|
||||
# factoid postprocessors
|
||||
result = multiword_replace(result, shortcodes)
|
||||
result = text.multiword_replace(result, shortcodes)
|
||||
|
||||
if result.startswith("<act>"):
|
||||
result = result[5:].strip()
|
||||
|
|
Reference in a new issue