valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced Python 2.7-ism when importing Django model

Browse Source
This commit is contained in:
Seth House 2013-11-13 19:32:39 -07:00
parent 3bb83cd0b7
commit 312b3bd73a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/pillar/django_orm.py
View File

@ -186,15 +186,20 @@ def ext_pillar(minion_id,
value.rstrip('\n')))
try:
import importlib
from django.db.models.loading import get_model
django_pillar = {}
for app, models in django_app.iteritems():
for proj_app, models in django_app.iteritems():
_, _, app = proj_app.rpartition('.')
django_pillar[app] = {}
model_file = importlib.import_module(app + '.models')
for model_name, model_meta in models.iteritems():
model_orm = model_file.__dict__[model_name]
model_orm = get_model(app, model_name)
if model_orm is None:
raise salt.exceptions.SaltException(
"Django model '{0}' not found in app '{1}'."
.format(app, model_name))
pillar_for_model = django_pillar[app][model_orm.__name__] = {}
name_field = model_meta['name']