mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix: Exit dumps bluh

Browse source
This commit is contained in:
Kiooeht 2011-07-06 20:46:03 -07:00
parent 18d1536bc9
commit f6b800a482
3 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO.mkdn
View file

@ -30,6 +30,7 @@ Bugs
* Closing a timeclone doesn't actually cease for everyone else * Closing a timeclone doesn't actually cease for everyone else
* Alt characters break quirks * Alt characters break quirks
* +q(~) and +a(&) do weird things * +q(~) and +a(&) do weird things
* Kill Zalgo
Windows Bugs Windows Bugs
------------ ------------

21
dataobjs.py
View file

@ -232,23 +232,10 @@ class PesterProfile(object):
def idlemsg(self, syscolor, verb): def idlemsg(self, syscolor, verb):
return "<c=%s>-- %s <c=%s>[%s]</c> %s --</c>" % (syscolor.name(), self.handle, self.colorhtml(), self.initials(), verb) return "<c=%s>-- %s <c=%s>[%s]</c> %s --</c>" % (syscolor.name(), self.handle, self.colorhtml(), self.initials(), verb)
def memoclosemsg(self, syscolor, initials, verb): def memoclosemsg(self, syscolor, initials, verb):
msg = "<c=%s><c=%s>" % (syscolor.name(), self.colorhtml()) if type(initials) == type(list()):
for i,n in initials.iteritems(): return "<c=%s><c=%s>%s</c> %s.</c>" % (syscolor.name(), self.colorhtml(), ", ".join(initials), verb)
msg += i else:
if len(n) == 1: return "<c=%s><c=%s>%s%s%s</c> %s.</c>" % (syscolor.name(), self.colorhtml(), initials.pcf, self.initials(), initials.number, verb)
if n[0] != 0:
msg += str(n[0])
elif len(n) > 1:
n.sort()
msg += str(n[0])
last = n[0]
pos = 1
while n[pos] == last+1:
last += 1
msg += "%s-%s" % (min(n), max(n))
msg += ", "
return msg[:-2] + "</c> %s.</c>" % (verb)
def memoopenmsg(self, syscolor, td, timeGrammar, verb, channel): def memoopenmsg(self, syscolor, td, timeGrammar, verb, channel):
(temporal, pcf, when) = (timeGrammar.temporal, timeGrammar.pcf, timeGrammar.when) (temporal, pcf, when) = (timeGrammar.temporal, timeGrammar.pcf, timeGrammar.when)
timetext = timeDifference(td) timetext = timeDifference(td)

8
memos.py
View file

@ -791,15 +791,11 @@ class PesterMemo(PesterConvo):
self.userlist.takeItem(self.userlist.row(c)) self.userlist.takeItem(self.userlist.row(c))
if not self.times.has_key(h): if not self.times.has_key(h):
self.times[h] = TimeTracker(timedelta(0)) self.times[h] = TimeTracker(timedelta(0))
allinitials = {} allinitials = []
while self.times[h].getTime() is not None: while self.times[h].getTime() is not None:
t = self.times[h] t = self.times[h]
grammar = t.getGrammar() grammar = t.getGrammar()
#allinitials.append("%s%s%s" % (grammar.pcf, chum.initials(), grammar.number)) allinitials.append("%s%s%s" % (grammar.pcf, chum.initials(), grammar.number))
if "%s%s" % (grammar.pcf, chum.initials()) in allinitials:
allinitials["%s%s" % (grammar.pcf, chum.initials())].append(int(grammar.number) if grammar.number.isdigit() else 0)
else:
allinitials["%s%s" % (grammar.pcf, chum.initials())] = [int(grammar.number) if grammar.number.isdigit() else 0]
self.times[h].removeTime(t.getTime()) self.times[h].removeTime(t.getTime())
msg = chum.memoclosemsg(systemColor, allinitials, self.mainwindow.theme["convo/text/closememo"]) msg = chum.memoclosemsg(systemColor, allinitials, self.mainwindow.theme["convo/text/closememo"])
self.textArea.append(convertTags(msg)) self.textArea.append(convertTags(msg))