money_manager wrapper attempt fails for managers associated on "objects"

MANIFEST

@@ -0,0 +1,8 @@
+setup.py
+djmoney/__init__.py
+djmoney/forms/__init__.py
+djmoney/forms/fields.py
+djmoney/forms/widgets.py
+djmoney/models/__init__.py
+djmoney/models/fields.py
+djmoney/models/managers.py

README.md

@@ -17,20 +17,21 @@ Via py-moneyed, django-moneyed gets:
 Installation
 ------------
 
-Django-money currently needs a special version of py-moneyed to work (2011-05-15). This will be resolved as soon as 
-my fork of it is approved and merged into py-moneyed main branch.
+Django-money currently needs py-moneyed v0.4 (or later) to work.
 
-Until then, install py-moneyed from here:
+You can install django-money by doing:
 
-    git clone https://jakewins@github.com/jakewins/py-moneyed.git
-    cd py-moneyed
-    python setup.py install
+	pip install django-money
 
-And then, install py-moneyed like so:
+This will automatically install the appropriate dependencies.
 
-    git clone https://jakewins@github.com/jakewins/django-money.git
-    cd django-money
-    python setup.py install
+You can obtain the source code for django-money from here:
+
+	https://github.com/reinbach/django-money
+
+And the source for py-moneyed from here:
+
+    https://github.com/limist/py-moneyed
 
 Model usage
 -----
@@ -43,7 +44,7 @@ Use as normal model fields
 
     class BankAccount(models.Model):
 
-        balance = MoneyField(max_digits=10, decimal_places=2, default_currency=moneyed.USD)
+        balance = MoneyField(max_digits=10, decimal_places=2, default_currency='USD')
 
 
 Searching for models with money fields:
@@ -58,6 +59,28 @@ Searching for models with money fields:
     BankAccount.objects.filter(balance__gt=Money(1, USD))
     # Returns the "account" object
 
+If you use South to handle model migration, things will "Just Work" out of the box.
+South is an optional dependency and things will work fine without it.
+
+Adding a new Currency
+---------------------
+
+Currencies are listed on moneyed, and this modules use this to provide a choice
+list on the admin, also for validation.
+
+To add a new currency available on all the project, you can simple add this two
+lines on your `settings.py` file
+
+    from moneyed import add_currency
+    add_currency(code='BOB', numeric='068', name='Peso boliviano', countries=('BOLIVIA',))
+
+To restrict the currencies listed on the project set a `CURRENCIES` variable with
+a list of Currency codes on `settings.py`
+
+    CURRENCIES = ('USD', 'BOB')
+
+**The list has to contain valid Currency codes**
+
 Important note on model managers
 --------------------------------
 
@@ -85,5 +108,3 @@ you also need to manually decorate those custom methods, like so:
        @understand_money
        def my_custom_method(*args,**kwargs):
            # Awesome stuff
-
-

djmoney/__init__.py

@@ -0,0 +1,70 @@
+from django.db import models
+from django.utils.encoding import smart_unicode
+from django.utils import formats
+from django.utils import timezone
+
+from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.admin.util import lookup_field
+from django.utils.safestring import mark_safe
+from django.utils.html import conditional_escape
+from django.db.models.fields.related import ManyToManyRel
+
+from django.contrib.admin import util as admin_util
+
+
+def djmoney_display_for_field(value, field):
+    from django.contrib.admin.templatetags.admin_list import _boolean_icon
+    from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
+
+    try:
+        if field.flatchoices:
+            return dict(field.flatchoices).get(value, EMPTY_CHANGELIST_VALUE)
+        # NullBooleanField needs special-case null-handling, so it comes
+        # before the general null test.
+        elif isinstance(field, models.BooleanField) or isinstance(field, models.NullBooleanField):
+            return _boolean_icon(value)
+        elif value is None:
+            return EMPTY_CHANGELIST_VALUE
+        elif isinstance(field, models.DateTimeField):
+            return formats.localize(timezone.localtime(value))
+        elif isinstance(field, models.DateField) or isinstance(field, models.TimeField):
+            return formats.localize(value)
+        elif isinstance(field, models.DecimalField):
+            return formats.number_format(value, field.decimal_places)
+        elif isinstance(field, models.FloatField):
+            return formats.number_format(value)
+        else:
+            return smart_unicode(value)
+    except:
+            return smart_unicode(value)
+admin_util.display_for_field = djmoney_display_for_field
+
+def djmoney_contents(self):
+    from django.contrib.admin.templatetags.admin_list import _boolean_icon
+    from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
+    field, obj, model_admin = self.field['field'], self.form.instance, self.model_admin
+
+    try:
+        f, attr, value = lookup_field(field, obj, model_admin)
+    except (AttributeError, ValueError, ObjectDoesNotExist):
+        result_repr = EMPTY_CHANGELIST_VALUE
+    else:
+        if f is None:
+            boolean = getattr(attr, "boolean", False)
+            if boolean:
+                result_repr = _boolean_icon(value)
+            else:
+                result_repr = smart_unicode(value)
+                if getattr(attr, "allow_tags", False):
+                    result_repr = mark_safe(result_repr)
+        else:
+            if value is None:
+                result_repr = EMPTY_CHANGELIST_VALUE
+            elif isinstance(f.rel, ManyToManyRel):
+                result_repr = ", ".join(map(unicode, value.all()))
+            else:
+                result_repr = djmoney_display_for_field(value, f)
+    return conditional_escape(result_repr)
+
+from django.contrib.admin.helpers import AdminReadonlyField
+AdminReadonlyField.contents = djmoney_contents

djmoney/forms/fields.py

@@ -5,6 +5,7 @@
 
 __all__ = ('MoneyField',)
 
+
 class MoneyField(forms.DecimalField):
 
     def __init__(self, currency_widget=None, *args, **kwargs):

djmoney/forms/widgets.py

@@ -1,13 +1,21 @@
 from django import forms
+from django.conf import settings
 from moneyed import Money, CURRENCIES, DEFAULT_CURRENCY_CODE
 from decimal import Decimal
 import operator
 
 __all__ = ('InputMoneyWidget', 'CurrencySelectWidget',)
 
+PROJECT_CURRENCIES = getattr(settings, 'CURRENCIES', None)
+
+if PROJECT_CURRENCIES:
+    CURRENCY_CHOICES = [(code, CURRENCIES[code].name) for code in PROJECT_CURRENCIES]
+else:
     CURRENCY_CHOICES = [(c.code, c.name) for i, c in CURRENCIES.items() if c.code != DEFAULT_CURRENCY_CODE]
+
 CURRENCY_CHOICES.sort(key=operator.itemgetter(1))
 
+
 class CurrencySelectWidget(forms.Select):
     def __init__(self, attrs=None, choices=CURRENCY_CHOICES):
         super(CurrencySelectWidget, self).__init__(attrs, choices)

djmoney/models/fields.py

@@ -11,19 +11,25 @@
 currency_field_name = lambda name: "%s_currency" % name
 SUPPORTED_LOOKUPS = ('exact', 'lt', 'gt', 'lte', 'gte')
 
+
 class NotSupportedLookup(Exception):
     def __init__(self, lookup):
         self.lookup = lookup
+
     def __str__(self):
         return "Lookup '%s' is not supported for MoneyField" % self.lookup
 
+
 class MoneyFieldProxy(object):
     def __init__(self, field):
         self.field = field
         self.currency_field_name = currency_field_name(self.field.name)
 
     def _money_from_obj(self, obj):
-        return Money(obj.__dict__[self.field.name], obj.__dict__[self.currency_field_name])
+        amount = obj.__dict__[self.field.name]
+        if amount is None:
+            return None
+        return Money(amount, obj.__dict__[self.currency_field_name])
 
     def __get__(self, obj, type=None):
         if obj is None:
@@ -37,12 +43,15 @@ def __set__(self, obj, value):
             obj.__dict__[self.field.name] = value.amount
             setattr(obj, self.currency_field_name, smart_unicode(value.currency))
         else:
-            if value: value = str(value)
+            if value:
+                value = str(value)
             obj.__dict__[self.field.name] = self.field.to_python(value)
 
 
 class CurrencyField(models.CharField):
 
+    description = "A field which stores currency."
+
     def __init__(self, verbose_name=None, name=None, default=DEFAULT_CURRENCY, **kwargs):
         if isinstance(default, Currency):
             default = default.code
@@ -52,8 +61,11 @@ def __init__(self, verbose_name=None, name=None, default=DEFAULT_CURRENCY, **kwa
     def get_internal_type(self):
         return "CharField"
 
+
 class MoneyField(models.DecimalField):
 
+    description = "A field which stores both the currency and amount of money."
+
     def __init__(self, verbose_name=None, name=None,
                  max_digits=None, decimal_places=None,
                  default=Decimal("0.0"), default_currency=DEFAULT_CURRENCY, **kwargs):
@@ -90,23 +102,21 @@ def contribute_to_class(self, cls, name):
 
         from managers import money_manager
 
-        if hasattr(cls, '_default_manager'):
+        if getattr(cls, '_default_manager', None):
             cls._default_manager = money_manager(cls._default_manager)
-        elif hasattr(cls, 'objects'):
-            cls.objects = money_manager(cls._default_manager)
         else:
             cls.objects = money_manager(models.Manager)
 
-    def get_db_prep_save(self, value):
+    def get_db_prep_save(self, value, connection):
         if isinstance(value, Money):
             value = value.amount
-        return super(MoneyField, self).get_db_prep_save(value)
+        return super(MoneyField, self).get_db_prep_save(value, connection)
 
-    def get_db_prep_lookup(self, lookup_type, value):
+    def get_db_prep_lookup(self, lookup_type, value, connection, prepared=False):
         if not lookup_type in SUPPORTED_LOOKUPS:
             raise NotSupportedLookup(lookup_type)
-        value = self.get_db_prep_save(value)
-        return super(MoneyField, self).get_db_prep_lookup(lookup_type, value)
+        value = self.get_db_prep_save(value, connection)
+        return super(MoneyField, self).get_db_prep_lookup(lookup_type, value, connection, prepared)
 
     def get_default(self):
         if isinstance(self.default, Money):
@@ -119,17 +129,23 @@ def formfield(self, **kwargs):
         defaults.update(kwargs)
         return super(MoneyField, self).formfield(**defaults)
 
+    def value_to_string(self, obj):
+        return obj.__dict__[self.attname].amount
+
+
 ## South support
 try:
     from south.modelsinspector import add_introspection_rules
 
     rules = [
         ((MoneyField,),
          [],  # No positional args
-         {'default_currency':('default_currency',{})}),
+         {'default': ('default', {'default': Decimal('0.0')}),
+          'default_currency': ('default_currency', {'default': DEFAULT_CURRENCY})}),
         ((CurrencyField,),
          [],  # No positional args
-         {}), # No new keyword args
+         {'default': ('default', {'default': DEFAULT_CURRENCY.code}),
+          'max_length': ('max_length', {'default': 3})}),
     ]
 
     add_introspection_rules(rules, ["^djmoney\.models"])

djmoney/models/managers.py

@@ -1,7 +1,7 @@
-
 from django.utils.encoding import smart_unicode
 from fields import currency_field_name
 
+
 def _expand_money_params(kwargs):
     from moneyed import Money
     from django.db.models.sql.constants import LOOKUP_SEP, QUERY_TERMS
@@ -20,6 +20,7 @@ def _expand_money_params(kwargs):
     kwargs.update(to_append)
     return kwargs
 
+
 def understands_money(func):
     '''
     Used to wrap a queryset method with logic to expand
@@ -39,11 +40,13 @@ def decorator(*args, **kwargs):
 RELEVANT_QUERYSET_METHODS = ['dates', 'distinct', 'extra', 'get', 'get_or_create', 'filter', 'complex_filter',
                              'exclude', 'in_bulk', 'iterator', 'latest', 'order_by', 'select_related', 'values']
 
+
 def add_money_comprehension_to_queryset(qs):
     # Decorate each relevant method with understand_money in the queryset given
     map(lambda attr: setattr(qs, attr, understands_money(getattr(qs, attr))), RELEVANT_QUERYSET_METHODS)
     return qs
 
+
 def money_manager(manager):
     '''
     Wraps a model managers get_query_set method so that each query set it returns
@@ -53,6 +56,7 @@ def money_manager(manager):
     use other managers special managers while still doing money queries.
     '''
     old_get_query_set = manager.get_query_set
+
     def get_query_set(*args, **kwargs):
         return add_money_comprehension_to_queryset(old_get_query_set(*args, **kwargs))
 

setup.py

@@ -13,23 +13,19 @@
 
 
 setup(name="django-money",
-      version="0.1",
-      description="Adds support for using money and currency fields in django models and forms. Uses py-moneyed as money implementation, based on python-money django implementation.",
-      url="https://github.com/jakewins/django-money",
+      version="0.2",
+      description="Adds support for using money and currency fields in django models and forms. Uses py-moneyed as the money implementation.",
+      url="https://github.com/reinbach/django-money",
       packages=["djmoney",
                 "djmoney.forms",
                 "djmoney.models"],
-      # Commented out, waiting for pull request to be fulfilled: https://github.com/limist/py-moneyed/pull/1 
-      #install_requires=['setuptools',
-      #                  'Django >= 1.2',
-      #                  'py-moneyed > 0.3'],
-      package_dir={"": ""},
+      install_requires=['setuptools',
+                        'Django >= 1.2',
+                        'py-moneyed > 0.3'],
       cmdclass=cmdclass,
       classifiers=["Development Status :: 5 - Production/Stable",
                    "Intended Audience :: Developers",
                    "License :: OSI Approved :: BSD License",
                    "Operating System :: OS Independent",
                    "Programming Language :: Python",
                    "Framework :: Django", ])
-
-

tests/__init__.py

@@ -1,3 +1,2 @@
-
 from model_tests import *
 from form_tests import *

tests/form_tests.py

@@ -54,4 +54,3 @@ def testSave(self):
         retrieved = ModelWithVanillaMoneyField.objects.get(pk=model.pk)
 
         self.assertEqual(Money(10, moneyed.SEK), retrieved.money)
-

tests/model_tests.py

@@ -9,6 +9,7 @@
 import moneyed
 from testapp.models import ModelWithVanillaMoneyField, ModelRelatedToModelWithMoney
 
+
 class VanillaMoneyFieldTestCase(TestCase):
 
     def testSaving(self):

tests/runtests.py

@@ -3,9 +3,12 @@
 
 @author: jake
 '''
-import sys, os, unittest
+import sys
+import os
+import unittest
 import django.conf
 
+
 def setup():
     test_folder = os.path.abspath(os.path.dirname(__file__))
     src_folder = os.path.abspath(test_folder + "/../")