PEP 8 and code cleanup

diff --git a/src/mw/api.py b/src/mw/api.py
index c6958c28b52f0052de2536c144fcab600b91c12d..cd913658696bb0bbeb26d5e7a2f82c2755653513 100644 (file)
--- a/src/mw/api.py
+++ b/src/mw/api.py
@@ -23,7 +23,9 @@ from StringIO import StringIO
 import urllib
 import urllib2
 
 import urllib
 import urllib2
 

+

 class API(object):
 class API(object):

+

     def __init__(self, api_url):
         self.api_url = api_url
         self.cookiejar = cookielib.CookieJar()
     def __init__(self, api_url):
         self.api_url = api_url
         self.cookiejar = cookielib.CookieJar()


@@ -62,6 +64,7 @@ def pagename_to_filename(name):
     name = name.replace('/', '!')
     return name
 
     name = name.replace('/', '!')
     return name
 

+

 def filename_to_pagename(name):
     name = name.replace('!', '/')
     name = name.replace('_', ' ')
 def filename_to_pagename(name):
     name = name.replace('!', '/')
     name = name.replace('_', ' ')

diff --git a/src/mw/cli.py b/src/mw/cli.py
index 238f72ed9b518264f17e2ea28bfed8719577dc6e..54fbd7734a8e2be938d436a41e61f93ac48cb7e4 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -16,13 +16,13 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 

-import inspect

 import mw.clicommands
 import os
 import sys
 import mw.clicommands
 import os
 import sys

-from pprint import pprint
+

 
 class CLI(object):
 
 class CLI(object):

+

     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         self.commands = {}
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         self.commands = {}

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 936082205bd3ee102ad714a12fe7d84e86ae0e46..bc9683cdc1dd8902b8a1dcbdc9cd45f27e2ecdf1 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -24,7 +24,9 @@ from optparse import OptionParser, OptionGroup
 import os
 import sys
 
 import os
 import sys
 

+

 class CommandBase(object):
 class CommandBase(object):

+

     def __init__(self, name, description, usage=None):
         self.me = os.path.basename(sys.argv[0])
         self.description = description
     def __init__(self, name, description, usage=None):
         self.me = os.path.basename(sys.argv[0])
         self.description = description


@@ -45,6 +47,9 @@ class CommandBase(object):
         self.args = self.args[1:] # don't need the first thing
         self._do_command()
 
         self.args = self.args[1:] # don't need the first thing
         self._do_command()
 

+    def _do_command(self):
+        pass
+

     def _login(self):
         user = raw_input('Username: ')
         passwd = getpass.getpass()
     def _login(self):
         user = raw_input('Username: ')
         passwd = getpass.getpass()


@@ -65,6 +70,7 @@ class CommandBase(object):
 
 
 class InitCommand(CommandBase):
 
 
 class InitCommand(CommandBase):

+

     def __init__(self):
         usage = '%prog init API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)
     def __init__(self):
         usage = '%prog init API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)


@@ -78,6 +84,7 @@ class InitCommand(CommandBase):
 
 
 class PullCommand(CommandBase):
 
 
 class PullCommand(CommandBase):

+

     def __init__(self):
         usage = '%prog fetch [options] PAGENAME ...'
         CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
     def __init__(self):
         usage = '%prog fetch [options] PAGENAME ...'
         CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)


@@ -87,7 +94,7 @@ class PullCommand(CommandBase):
         self._api_setup()
         pages = []
         pages += self.args
         self._api_setup()
         pages = []
         pages += self.args

-        for these_pages in [pages[i:i+25] for i in range(0, len(pages), 25)]:
+        for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:

             data = {
                     'action': 'query',
                     'titles': '|'.join(these_pages),
             data = {
                     'action': 'query',
                     'titles': '|'.join(these_pages),


@@ -113,6 +120,7 @@ class PullCommand(CommandBase):
 
 
 class StatusCommand(CommandBase):
 
 
 class StatusCommand(CommandBase):

+

     def __init__(self):
         CommandBase.__init__(self, 'status', 'check repo status')
         self.shortcuts.append('st')
     def __init__(self):
         CommandBase.__init__(self, 'status', 'check repo status')
         self.shortcuts.append('st')

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 67e0b0950a58b95c20cf8b11542c0a4346e1234c..643024ecc9e7d3d8831360b749e8a615ec9800f2 100644 (file)
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -20,9 +20,10 @@ import ConfigParser
 import json
 import os
 import sys
 import json
 import os
 import sys

-import time
+

 
 class Metadir(object):
 
 class Metadir(object):

+

     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         root = os.getcwd()
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         root = os.getcwd()


@@ -30,7 +31,7 @@ class Metadir(object):
             if '.mw' in os.listdir(root):
                 self.root = root
                 break
             if '.mw' in os.listdir(root):
                 self.root = root
                 break

-            (head, tail) = os.path.split(root)
+            head = os.path.split(root)[0]

             if head == root:
                 self.root = os.getcwd()
                 break
             if head == root:
                 self.root = os.getcwd()
                 break