From 2699c75f1d264d5d960289e4a11b687a87bb9943 Mon Sep 17 00:00:00 2001 From: Ian Weller Date: Tue, 22 Dec 2009 03:25:40 -0600 Subject: [PATCH] PEP 8 and code cleanup --- src/mw/api.py | 3 +++ src/mw/cli.py | 4 ++-- src/mw/clicommands.py | 10 +++++++++- src/mw/metadir.py | 5 +++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/mw/api.py b/src/mw/api.py index c6958c2..cd91365 100644 --- a/src/mw/api.py +++ b/src/mw/api.py @@ -23,7 +23,9 @@ from StringIO import StringIO import urllib import urllib2 + class API(object): + 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 + def filename_to_pagename(name): name = name.replace('!', '/') name = name.replace('_', ' ') diff --git a/src/mw/cli.py b/src/mw/cli.py index 238f72e..54fbd77 100644 --- a/src/mw/cli.py +++ b/src/mw/cli.py @@ -16,13 +16,13 @@ # with this program. If not, see . ### -import inspect import mw.clicommands import os import sys -from pprint import pprint + class CLI(object): + 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 9360822..bc9683c 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -24,7 +24,9 @@ from optparse import OptionParser, OptionGroup import os import sys + class CommandBase(object): + 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() + def _do_command(self): + pass + def _login(self): user = raw_input('Username: ') passwd = getpass.getpass() @@ -65,6 +70,7 @@ class CommandBase(object): class InitCommand(CommandBase): + 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): + 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 - 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), @@ -113,6 +120,7 @@ class PullCommand(CommandBase): class StatusCommand(CommandBase): + 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 67e0b09..643024e 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -20,9 +20,10 @@ import ConfigParser import json import os import sys -import time + class Metadir(object): + 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 - (head, tail) = os.path.split(root) + head = os.path.split(root)[0] if head == root: self.root = os.getcwd() break -- 2.39.5