opendev/meetbot
Code Issues Proposed changes

Fix a problem with supybot-based config

Browse Source 
- This is caused by use of @property in the supybot-based config.

darcs-hash:20090708200038-82ea9-85daca15dc89dfa862d26f9d8acc5d9fc48bc8a7.gz
This commit is contained in:
Richard Darst
2009-07-08 13:00:38 -07:00
parent d17797eaaa
commit 08449b8989
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
items.py
View File

@@ -77,13 +77,15 @@ class _BaseItem(object):
while rstref in M.rst_refs:
rstref = rstref_orig + inbase(count)
count += 1
link = M.config.basename+'.log.html'
link = self.logURL(M)
M.rst_urls.append(".. _%s: %s"%(rstref, link+"#"+self.anchor))
M.rst_refs[rstref] = True
return rstref
@property
def anchor(self):
return 'l-'+str(self.linenum)
def logURL(self, M):
return M.config.basename+'.log.html'
class Topic(_BaseItem):
itemtype = 'TOPIC'
@@ -100,7 +102,7 @@ class Topic(_BaseItem):
repl = self.get_replacements()
repl['nick'] = writers.html(self.nick)
repl['topic'] = writers.html(self.topic)
repl['link'] = M.config.basename+'.log.html'
repl['link'] = self.logURL(M)
return self.html_template%repl
def rst(self, M):
self.rstref = self.makeRSTref(M)
@@ -108,7 +110,7 @@ class Topic(_BaseItem):
if repl['topic']=='': repl['topic']=' '
else: repl['topic']=writers.rst(self.topic)
repl['nick'] = writers.rst(self.nick)
repl['link'] = M.config.basename+'.log.html'
repl['link'] = self.logURL(M)
return self.rst_template%repl
class GenericItem(_BaseItem):
@@ -124,14 +126,14 @@ class GenericItem(_BaseItem):
repl = self.get_replacements()
repl['nick'] = writers.html(self.nick)
repl['line'] = writers.html(self.line)
repl['link'] = M.config.basename+'.log.html'
repl['link'] = self.logURL(M)
return self.html_template%repl
def rst(self, M):
self.rstref = self.makeRSTref(M)
repl = self.get_replacements()
repl['nick'] = writers.rst(self.nick)
repl['line'] = writers.rst(self.line)
repl['link'] = M.config.basename+'.log.html'
repl['link'] = self.logURL(M)
return self.rst_template%repl
@@ -174,14 +176,13 @@ class Link(_BaseItem):
repl['url'] = writers.html(self.url)
repl['url_readable'] = writers.html(self.url)
repl['line'] = writers.html(self.line)
repl['link'] = M.config.basename+'.log.html'
self.link = M.config.basename+'.log.html'
repl['link'] = self.logURL(M)
return self.html_template%repl
def rst(self, M):
self.rstref = self.makeRSTref(M)
repl = self.get_replacements()
repl['nick'] = writers.rst(self.nick)
repl['line'] = writers.rst(self.line)
repl['link'] = M.config.basename+'.log.html'
repl['link'] = self.logURL(M)
#repl['url'] = writers.rst(self.url)
return self.rst_template%repl

2
meeting.py
View File

@@ -134,7 +134,7 @@ class Config(object):
return path
@property
def basename(self):
return os.path.basename(self.filename())
return os.path.basename(self.M.config.filename())
writer_map = {
'.log.html':writers.HTMLlog,