Skip to content

Commit

Permalink
Bunped version to 1.0.4 final
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoa committed May 3, 2012
1 parent 0e7e7bb commit b49c8d1
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions categories/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
'major': 1,
'minor': 0,
'micro': 4,
'releaselevel': 'beta',
'serial': 2
'releaselevel': 'final',
'serial': 1
}

def get_version(short=False):
Expand All @@ -22,36 +22,36 @@ def get_version(short=False):

try:
import fields

from django.db.models import FieldDoesNotExist

class AlreadyRegistered(Exception):
"""
An attempt was made to register a model more than once.
"""
pass

# The field registry keeps track of the individual fields created.
# {'app.model.field': Field(**extra_params)}
# Useful for doing a schema migration
field_registry = {}

# The model registry keeps track of which models have one or more fields
# registered.
# {'app': [model1, model2]}
# Useful for admin alteration
model_registry = {}

def register_m2m(model, field_name='categories', extra_params={}):
return _register(model, field_name, extra_params, fields.CategoryM2MField)

def register_fk(model, field_name='category', extra_params={}):
return _register(model, field_name, extra_params, fields.CategoryFKField)

def _register(model, field_name, extra_params={}, field=fields.CategoryFKField):
app_label = model._meta.app_label
registry_name = ".".join((app_label, model.__name__, field_name)).lower()

if registry_name in field_registry:
return #raise AlreadyRegistered
opts = model._meta
Expand All @@ -64,11 +64,11 @@ def _register(model, field_name, extra_params={}, field=fields.CategoryFKField):
model_registry[app_label].append(model)
field_registry[registry_name] = field(**extra_params)
field_registry[registry_name].contribute_to_class(model, field_name)

from categories import settings
from django.core.exceptions import ImproperlyConfigured
from django.db.models.loading import get_model

for key, value in settings.FK_REGISTRY.items():
model = get_model(*key.split('.'))
if model is None:
Expand Down Expand Up @@ -109,6 +109,6 @@ def _register(model, field_name, extra_params={}, field=fields.CategoryFKField):
register_m2m(model, field_name, extra_params=value)
else:
raise ImproperlyConfigured("CATEGORY_SETTINGS['M2M_REGISTRY'] doesn't recognize the value of %s" % key)

except ImportError:
pass

0 comments on commit b49c8d1

Please sign in to comment.