diff --git a/convo.py b/convo.py index 0495b17..96c786a 100644 --- a/convo.py +++ b/convo.py @@ -345,6 +345,10 @@ class PesterText(QtGui.QTextEdit): "%s: " % (initials)] lexmsg.append(colorEnd("")) self.append("" + time + convertTags(lexmsg) + "") + #self.append('' + # + '' + # + '' + # + ''); if chum is me: window.chatlog.log(parent.chum.handle, lexmsg) else: diff --git a/parsetools.py b/parsetools.py index c11d9b5..388b51e 100644 --- a/parsetools.py +++ b/parsetools.py @@ -1,6 +1,5 @@ import re import random -from os.path import abspath from copy import copy from datetime import timedelta from PyQt4 import QtGui @@ -22,8 +21,6 @@ quirkloader = PythonQuirks() _functionre = re.compile(r"%s" % quirkloader.funcre()) _groupre = re.compile(r"\\([0-9]+)") -_path = abspath('.') - def reloadQuirkFunctions(): quirkloader.load() global _functionre @@ -139,7 +136,7 @@ class smiley(object): self.string = string def convert(self, format): if format == "html": - return "%s" % (_path, smiledict[self.string], self.string, self.string) + return "%s" % (smiledict[self.string], self.string, self.string) else: return self.string class mecmd(object): @@ -371,7 +368,7 @@ def img2smiley(string): string = unicode(string) def imagerep(mo): return reverse_smiley[mo.group(1)] - string = re.sub(r'', imagerep, string) + string = re.sub(r'', imagerep, string) return string smiledict = {