PEP 8 compliance

diff --git a/src/mw/cli.py b/src/mw/cli.py
index 52df23b658101c7a7d909e6c1ed8ad3466fc03c8..c16791e7a9e3e6763ededc496dc95d8b6723f8e7 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -61,7 +61,7 @@ class CLI(object):
         # determine what the subcommand is
         if len(sys.argv) > 1:
             if sys.argv[1] in self.all_commands:
         # determine what the subcommand is
         if len(sys.argv) > 1:
             if sys.argv[1] in self.all_commands:

-                the_command = sys.argv[1] # SWEET ACTION
+                the_command = sys.argv[1]  # SWEET ACTION

             elif sys.argv[1] in ['--help', '-h', 'help']:
                 self.usage()
             else:
             elif sys.argv[1] in ['--help', '-h', 'help']:
                 self.usage()
             else:

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 9efffd4a2883a68476d1723befe4f446170b81b3..03c558176d86027fbcb68cf39de6ddba92dac99a 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -44,7 +44,7 @@ class CommandBase(object):
 
     def main(self):
         (self.options, self.args) = self.parser.parse_args()
 
     def main(self):
         (self.options, self.args) = self.parser.parse_args()

-        self.args = self.args[1:] # don't need the first thing
+        self.args = self.args[1:]  # don't need the first thing

         self._do_command()
 
     def _do_command(self):
         self._do_command()
 
     def _do_command(self):


@@ -121,11 +121,13 @@ class LogoutCommand(CommandBase):
         except OSError:
             pass
 
         except OSError:
             pass
 

+

 class PullCategoryMembersCommand(CommandBase):
 
     def __init__(self):
         usage = '[options] PAGENAME ...'
 class PullCategoryMembersCommand(CommandBase):
 
     def __init__(self):
         usage = '[options] PAGENAME ...'

-        CommandBase.__init__(self, 'pullcat', 'add remote pages to repo belonging to the given category', usage)
+        CommandBase.__init__(self, 'pullcat', 'add remote pages to repo '
+                             'belonging to the given category', usage)

 
     def _do_command(self):
         self._die_if_no_init()
 
     def _do_command(self):
         self._die_if_no_init()


@@ -133,20 +135,19 @@ class PullCategoryMembersCommand(CommandBase):
         pages = []
         pages += self.args
         for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:
         pages = []
         pages += self.args
         for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:

-#http://commons.wikimedia.org/w/api.php?action=query&format=xmlfm&generator=categorymembers&gcmlimit=500&gcmtitle=Category:User:Esby
-              data = {
-                      'action': 'query',
-                      'gcmtitle': '|'.join(these_pages),
-                      'generator' : 'categorymembers',
-                      'gcmlimit' : 500
-              }
+            data = {
+                'action': 'query',
+                'gcmtitle': '|'.join(these_pages),
+                'generator': 'categorymembers',
+                'gcmlimit': 500
+            }

         response = self.api.call(data)['query']['pages']
         for pageid in response.keys():
         response = self.api.call(data)['query']['pages']
         for pageid in response.keys():

-          pagename = response[pageid]['title']
-          print pagename
-          pullc = PullCommand()
-          pullc.args = [pagename.encode('utf-8')]
-          pullc._do_command()
+            pagename = response[pageid]['title']
+            print pagename
+            pullc = PullCommand()
+            pullc.args = [pagename.encode('utf-8')]
+            pullc._do_command()

 
 
 class PullCommand(CommandBase):
 
 
 class PullCommand(CommandBase):


@@ -255,16 +256,16 @@ class CommitCommand(CommandBase):
                         'titles': mw.metadir.filename_to_pagename(file[:-5]),
                 }
                 response = self.api.call(data)
                         'titles': mw.metadir.filename_to_pagename(file[:-5]),
                 }
                 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]
+                pages = response['query']['pages']
+                pageid = pages.keys()[0]
+                revid = 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
                 if revid != awaitedrevid:
                     print 'warning: edit conflict detected on %s (%s -> %s) ' \
                             '-- skipping!' % (file, awaitedrevid, revid)
                     continue

-                edittoken = response['query']['pages'][pageid]['edittoken']
+                edittoken = pages['pages'][pageid]['edittoken']

                 filename = os.path.join(self.metadir.root, file)
                 text = codecs.open(filename, 'r', 'utf-8').read()
                 text = text.encode('utf-8')
                 filename = os.path.join(self.metadir.root, file)
                 text = codecs.open(filename, 'r', 'utf-8').read()
                 text = text.encode('utf-8')

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 07043c6ebd005c4310259577a49f7b6fae106e5c..abcd6874d5059244a54a108bf2486b701e04f7a5 100644 (file)
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -61,7 +61,7 @@ class Metadir(object):
             os.mkdir(self.location, 0755)
         # metadir versioning
         fd = file(os.path.join(self.location, 'version'), 'w')
             os.mkdir(self.location, 0755)
         # metadir versioning
         fd = file(os.path.join(self.location, 'version'), 'w')

-        fd.write('1') # XXX THIS API VERSION NOT LOCKED IN YET
+        fd.write('1')  # XXX THIS API VERSION NOT LOCKED IN YET

         fd.close()
         # create config
         self.config = ConfigParser.RawConfigParser()
         fd.close()
         # create config
         self.config = ConfigParser.RawConfigParser()