Normalize code spacing and style

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index f4b9813938540b0bbfd33cfb04df24f33f4897b1..bd215bd8e4c61811306b6ed100fead00dd4097f5 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -149,8 +149,10 @@ class PullCommand(CommandBase):
                 self.metadir.pages_add_rv(int(pageid),
                                           response[pageid]['revisions'][0])
                 filename = mw.api.pagename_to_filename(pagename)
                 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]['*'].encode('utf-8')
+                    fd.write(data)

 
 class StatusCommand(CommandBase):
 
 
 class StatusCommand(CommandBase):
 


@@ -224,8 +226,8 @@ class CommitCommand(CommandBase):
                 revid = response['query']['pages'][pageid]['revisions'][0]['revid']
                 awaitedrevid = self.metadir.pages_get_rv_list( {'id': pageid } )[0]                
                 if revid != awaitedrevid :
                 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
+                    print "Ignoring %s - Edition conflict detected %s - %s " % ( file , awaitedrevid, revid)
+                    continue

                 edittoken = response['query']['pages'][pageid]['edittoken']
                 # FIXME use basetimestamp and starttimestamp
                 filename = os.path.join(self.metadir.root, file)
                 edittoken = response['query']['pages'][pageid]['edittoken']
                 # FIXME use basetimestamp and starttimestamp
                 filename = os.path.join(self.metadir.root, file)


@@ -248,13 +250,14 @@ class CommitCommand(CommandBase):
                     data['bot'] = 'bot'
                 response = self.api.call(data)
                 if response['edit']['result'] == 'Success':
                     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 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

                     data = {
                             'action': 'query',
                             'revids': response['edit']['newrevid'],
                     data = {
                             'action': 'query',
                             'revids': response['edit']['newrevid'],

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 3b7828dfb5194e4e7e0a79c779549231ec48d006..a08ddff28fe94a48d986cf587d7e803d8b360b91 100644 (file)
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -78,14 +78,11 @@ class Metadir(object):
         # create cache/pages/
         os.mkdir(os.path.join(self.location, 'cache', 'pages'), 0755)
 
         # 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()
     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.close()
         fd = file(filename, 'w')
         fd.write(cur_content.encode('utf-8'))   
         fd.close()