Fix a few of the more sane pylint warnings

diff --git a/bluechips/config/middleware.py b/bluechips/config/middleware.py
index 2d0769a040f7135827618532ea400e7f4de829c3..33d06a918d460c5168e477c60efb12dfbd35b8ad 100644 (file)
--- 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 f3373ddc398ba93fcb3c6ebbc512d80be532189a..9c0358f80056c95fbac0178dc7c4e40ddd7fd114 100644 (file)
--- 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 3511d8e382dd7911aeefd5b13fd6b87e82f4cbe7..2d838c43795b148c6b6a2c5f103f8c5ee3e2a2b0 100644 (file)
--- 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 53392c87060df3d7c5b303e3b256946331541f17..e8b2985a07446718079eca982f2baef6fff3a6e8 100644 (file)
--- 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 a25f1d12df768e845a426a76321c4671d4e4734a..3c71c6ed15d54a75ae4056a1c81a8c101be98826 100644 (file)
--- 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 4147eb3744e3d79f0c9067418997debbe67b3fe1..b2cf417f2de491dd18d27000660511e5db09e267 100644 (file)
--- 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