From: Ian Weller Date: Mon, 24 May 2010 22:20:42 +0000 (-0500) Subject: More restylizing crap (PEP 8 compliant) X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/b30dcd7f4a701370778956d4e1b60947a853f639?ds=sidebyside More restylizing crap (PEP 8 compliant) --- diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 088df16..4f5fc48 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -151,9 +151,11 @@ class PullCommand(CommandBase): filename = mw.api.pagename_to_filename(pagename) with file(os.path.join(self.metadir.root, filename + '.wiki'), 'w') as fd: - data = response[pageid]['revisions'][0]['*'].encode('utf-8') + data = response[pageid]['revisions'][0]['*'] + data = data.encode('utf-8') fd.write(data) + class StatusCommand(CommandBase): def __init__(self): @@ -223,14 +225,15 @@ class CommitCommand(CommandBase): } response = self.api.call(data) pageid = response['query']['pages'].keys()[0] - revid = response['query']['pages'][pageid]['revisions'][0]['revid'] - awaitedrevid = self.metadir.pages_get_rv_list( {'id': pageid } )[0] + revid = response['query']['pages'][pageid]['revisions'][0]\ + ['revid'] + awaitedrevid = self.metadir.pages_get_rv_list({'id': pageid})\ + [0] if revid != awaitedrevid: - print "warning: edit conflict detected on %s (%s -> %s) " \ - "-- skipping!" % (file , awaitedrevid, revid) + print 'warning: edit conflict detected on %s (%s -> %s) ' \ + '-- skipping!' % (file, awaitedrevid, revid) continue edittoken = response['query']['pages'][pageid]['edittoken'] - # FIXME use basetimestamp and starttimestamp filename = os.path.join(self.metadir.root, file) text = codecs.open(filename, 'r', 'utf-8').read() text = text.encode('utf-8') @@ -251,14 +254,14 @@ class CommitCommand(CommandBase): data['bot'] = 'bot' response = self.api.call(data) if response['edit']['result'] == 'Success': - if response['edit'].has_key('nochange'): - print "warning: no changes detected in %s - " \ - "skipping and removing ending LF" % file + if 'nochange' in response['edit']: + print 'warning: no changes detected in %s - ' \ + 'skipping and removing ending LF' % file self.metadir.clean_page(file[:-5]) continue if response['edit']['oldrevid'] != revid: - print "warning: edit conflict detected on %s -- " \ - "skipping!" % file + print 'warning: edit conflict detected on %s -- ' \ + 'skipping!' % file continue data = { 'action': 'query', diff --git a/src/mw/metadir.py b/src/mw/metadir.py index a08ddff..05dcdb8 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -84,7 +84,7 @@ class Metadir(object): 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): @@ -184,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