X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/731ebcb5bb71d65d81065a34caa627081b5e0731..b30dcd7f4a701370778956d4e1b60947a853f639:/src/mw/metadir.py diff --git a/src/mw/metadir.py b/src/mw/metadir.py index 3b7828d..05dcdb8 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -78,16 +78,13 @@ class Metadir(object): # create cache/pages/ os.mkdir(os.path.join(self.location, 'cache', 'pages'), 0755) - - def clean_page(self, pagename): filename = mw.api.pagename_to_filename(pagename) + '.wiki' cur_content = codecs.open(filename, 'r', 'utf-8').read() - if ( (len(cur_content) != 0) and (cur_content[-1] == '\n') ): - cur_content = cur_content[:-1] - + if len(cur_content) != 0 and cur_content[-1] == '\n': + cur_content = cur_content[:-1] fd = file(filename, 'w') - fd.write(cur_content.encode('utf-8')) + fd.write(cur_content.encode('utf-8')) fd.close() def pagedict_add(self, pagename, pageid, currentrv): @@ -187,9 +184,11 @@ class Metadir(object): oldrvid = self.pages_get_rv_list(pageid)[-1] oldrv = self.pages_get_rv(pageid, oldrvid) oldname = 'a/%s (revision %i)' % (filename, oldrvid) - old = [i + '\n' for i in oldrv['content'].encode('utf-8').split('\n')] + old = [i + '\n' for i in \ + oldrv['content'].encode('utf-8').split('\n')] if newrvid == 0: - cur_content = codecs.open(filename, 'r', 'utf-8').read().encode('utf-8') + cur_content = codecs.open(filename, 'r', 'utf-8').read() + cur_content = cur_content.encode('utf-8') if (len(cur_content) != 0) and (cur_content[-1] == '\n'): cur_content = cur_content[:-1] newname = 'b/%s (working copy)' % filename