More restylizing crap (PEP 8 compliant)

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index f4b9813938540b0bbfd33cfb04df24f33f4897b1..4f5fc48ab7c2ea060701e00a6fb57bff89ab2c7e 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -149,8 +149,12 @@ class PullCommand(CommandBase):
                 self.metadir.pages_add_rv(int(pageid),
                                           response[pageid]['revisions'][0])
                 filename = mw.api.pagename_to_filename(pagename)
-                with file(os.path.join(self.metadir.root, filename + '.wiki'), 'w') as fd:
-                  fd.write(response[pageid]['revisions'][0]['*'].encode('utf-8'))
+                with file(os.path.join(self.metadir.root, filename + '.wiki'),
+                          'w') as fd:
+                    data = response[pageid]['revisions'][0]['*']
+                    data = data.encode('utf-8')
+                    fd.write(data)
+
 
 class StatusCommand(CommandBase):
 
@@ -221,13 +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]                
-                if revid != awaitedrevid :
-                     print "Ignoring %s - Edition conflict detected %s - %s " % ( file , awaitedrevid, revid)
-                     continue
+                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)
+                    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')
@@ -248,13 +254,15 @@ class CommitCommand(CommandBase):
                     data['bot'] = 'bot'
                 response = self.api.call(data)
                 if response['edit']['result'] == 'Success':
-                    if response['edit'].has_key('nochange') :
-                      print "Ignoring %s - No changes were detected - Removing ending lf" %  file 
-                      self.metadir.clean_page(file[:-5])
-                      continue
-                    if response['edit']['oldrevid'] != revid :
-                      print "Ignoring %s - Colision detected " % file
-                      continue
+                    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
+                        continue
                     data = {
                             'action': 'query',
                             'revids': response['edit']['newrevid'],
@@ -266,5 +274,5 @@ class CommitCommand(CommandBase):
                     self.metadir.pages_add_rv(int(pageid),
                                               response[pageid]['revisions'][0])
                 else:
-                    print 'committing %s failed: %s' % \
+                    print 'error: committing %s failed: %s' % \
                             (file, response['edit']['result'])