From 74d234f880ee6b3c510227ea94459b81a79755db Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Sun, 20 Jul 2008 14:53:35 +0000 Subject: [PATCH] Fix a few of the more sane pylint warnings --- bluechips/config/middleware.py | 3 +-- bluechips/controllers/status.py | 2 +- bluechips/lib/subclass.py | 8 +++++--- bluechips/lib/totals.py | 18 +++++++++--------- bluechips/model/__init__.py | 10 +++++----- bluechips/model/expenditure.py | 4 ++-- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/bluechips/config/middleware.py b/bluechips/config/middleware.py index 2d0769a..33d06a9 100644 --- a/bluechips/config/middleware.py +++ b/bluechips/config/middleware.py @@ -5,8 +5,7 @@ from paste.registry import RegistryManager from paste.urlparser import StaticURLParser from paste.deploy.converters import asbool from pylons import config -from pylons.middleware import ErrorHandler, StaticJavascripts, \ - StatusCodeRedirect +from pylons.middleware import ErrorHandler, StatusCodeRedirect from pylons.wsgiapp import PylonsApp from routes.middleware import RoutesMiddleware from paste import httpexceptions diff --git a/bluechips/controllers/status.py b/bluechips/controllers/status.py index f3373dd..9c0358f 100644 --- a/bluechips/controllers/status.py +++ b/bluechips/controllers/status.py @@ -29,7 +29,7 @@ class StatusController(BaseController): this_month = date.today().replace(day=1) last_month = (date.today() - timedelta(days=30)).replace(day=1) - c.year_total, c.this_year_total, c.this_month_total =\ + c.year_total, c.this_year_total, c.this_month_total = \ [self._total(model.expenditures.c.date >= i) for i in [year, this_year, this_month]] diff --git a/bluechips/lib/subclass.py b/bluechips/lib/subclass.py index 3511d8e..2d838c4 100644 --- a/bluechips/lib/subclass.py +++ b/bluechips/lib/subclass.py @@ -3,11 +3,13 @@ Create subclasses that call out to their "superclass" for all methods but return the "subclass's" type """ -def wrapper(c, func): - return (lambda self,*args: c(getattr(self.value, func)(*map(self.value.__class__, args)))) +def wrapper(cls, func): + return (lambda self, *args: cls(getattr(self.value, func)(*map(self.value.__class__, args)))) class SmartSubclass(object): - def __init__(self, superclass, exclude=[]): + def __init__(self, superclass, exclude=None): + if exclude is None: + exclude = [] self.superclass = superclass self.exclude = exclude def __call__(self, name, bases, dict): diff --git a/bluechips/lib/totals.py b/bluechips/lib/totals.py index 53392c8..e8b2985 100644 --- a/bluechips/lib/totals.py +++ b/bluechips/lib/totals.py @@ -21,11 +21,11 @@ def debts(): # house users = meta.Session.query(model.User) - debts = {} + debts_dict = {} # First, credit everyone for expenditures they've made for user in users: - debts[user] = Currency(-sum(map((lambda x: x.amount), user.expenditures))) + debts_dict[user] = Currency(-sum(map((lambda x: x.amount), user.expenditures))) # Next, debit everyone for expenditures that they have an # investment in (i.e. splits) @@ -35,7 +35,7 @@ def debts(): group_by(model.Split.user_id) for split, total_cents in total_splits: - debts[split.user] += total_cents + debts_dict[split.user] += total_cents # Finally, move transfers around appropriately # @@ -48,11 +48,11 @@ def debts(): total_credits = transfer_q.group_by(model.Transfer.creditor_id) for transfer, total_amount in total_debits: - debts[transfer.debtor] -= total_amount + debts_dict[transfer.debtor] -= total_amount for transfer, total_amount in total_credits: - debts[transfer.creditor] += total_amount + debts_dict[transfer.creditor] += total_amount - return debts + return debts_dict def settle(debts_dict): # This algorithm has been shamelessly stolen from Nelson Elhage's @@ -65,7 +65,7 @@ def settle(debts_dict): owes_list = [debt for debt in debts_list if debt['amount'] > 0] owed_list = [debt for debt in debts_list if debt['amount'] < 0] - settle = [] + settle_list = [] while len(owes_list) > 0 and len(owed_list) > 0: owes = owes_list[0] @@ -88,13 +88,13 @@ def settle(debts_dict): owes_list.pop(0) val = owes['amount'] - settle.append((owes['who'], owed['who'], val)) + settle_list.append((owes['who'], owed['who'], val)) if len(owes_list) > 0: raise DirtyBooks, ("People still owe money", owes_list) if len(owed_list) > 0: raise DirtyBooks, ("People are still owed money", owed_list) - return settle + return settle_list __all__ = ['debts', 'settle'] diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py index a25f1d1..3c71c6e 100644 --- a/bluechips/model/__init__.py +++ b/bluechips/model/__init__.py @@ -2,11 +2,11 @@ import sqlalchemy as sa from sqlalchemy import orm -from user import * -from expenditure import * -from split import * -from subitem import * -from transfer import * +from bluechips.model.user import User +from bluechips.model.expenditure import Expenditure +from bluechips.model.split import Split +from bluechips.model.subitem import Subitem +from bluechips.model.transfer import Transfer from bluechips.model import meta from bluechips.model import types diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py index 4147eb3..b2cf417 100644 --- a/bluechips/model/expenditure.py +++ b/bluechips/model/expenditure.py @@ -1,5 +1,5 @@ -from user import User -from split import Split +from bluechips.model.user import User +from bluechips.model.split import Split from bluechips.model import meta from bluechips.model.types import Currency from decimal import Decimal -- 2.45.2