[RSS 2.0 -feed ja worddiff Panu Kalliokoski **20090306125229] { hunk ./fs.py 86 - diff = os.popen( "diff -u %s %s" % ( old, curr ), 'rt' ) - return diff.readlines() + diff = os.popen( "./worddiff -m %s %s" % ( old, curr ), 'rt' ) + content = diff.read() + diff.close() + return content hunk ./piki.py 30 -from time import localtime, strftime +from time import localtime, strftime, asctime hunk ./piki.py 187 - print '' + print '' hunk ./piki.py 190 - print 'RSS of recent changes in %s' % \ - logo_string + print 'Recent changes in %s' % logo_string hunk ./piki.py 600 - if mtime: - mdate = strftime( date_fmt, localtime( mtime )) - mtime = strftime( changed_time_fmt, localtime( mtime )) - else: mdate, mtime = '?', '' - return ('%s - %s\n%s%s\n' + - 'Muokattu %s:\n%s\n\n') % \ - ( word, mdate, get_scriptname(), urlquote(word), - mtime, self.diffs() ) - - def diffs(self): - diff = filter( lambda s: s[0] in '+@', self.f.file_diffs() ) - res = ''.join( map( htmlquote, diff[1:25] )) - if len(diff) > 25: res = res + '...' - return res + if mtime: pubdate = "%s" % asctime(mtime) + else: pubdate = '' + return ('%s\n%s%s#%s\n' + + '%s\n%s\n') % \ + ( word, get_scriptname() + urlquote(word), + get_scriptname(), mtime, self.f.file_diffs(), pubdate ) }