fix python2.5 et dependance json

diff --git a/buildout.cfg b/buildout.cfg
index cf93c18..433b1ff 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -3,19 +3,22 @@ newest = false
 parts = django
 versions = versions
 
-find-links = http://pypi.auf.org/simple/auf.recipe.django
-    http://pypi.auf.org/simple/auf.django.skin
+find-links = http://pypi.auf.org/simple/auf.recipe.django/
+    http://pypi.auf.org/simple/auf.django.skin/
     http://pypi.auf.org/datamaster_modeles/
-    http://pypi.auf.org/simple/auf.django.auth
+    http://pypi.auf.org/simple/auf.django.auth/
+    http://pypi.auf.org/simple/auf.django.workflow/
 
 eggs =
     django
     south
     django-admin-tools
     auf.django.skin
+    auf.django.workflow
     datamaster_modeles
     auf.django.auth
     django-reversion
+    simplejson
 
 [versions]
 django-admin-tools = 0.4.0
@@ -24,6 +27,7 @@ south = 0.7
 auf.django.skin = 0.15dev
 auf.django.auth = 0.5.2dev
 django-reversion = 1.3.3
+auf.django.workflow = 0.6dev
 
 [django] 
 recipe = auf.recipe.django

diff --git a/project/dae/views.py b/project/dae/views.py
index b1eb482..d415183 100644 (file)
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 from collections import defaultdict
 from datetime import date
-from json import dumps
+from simplejson import dumps
 import warnings
 
 from django.http import Http404, HttpResponse
@@ -158,9 +158,9 @@ def embauche(request, key=None, dossier=None):
             if 'save' in request.POST:
                 if employe_form.is_valid():
                     data = dict(request.POST.items())
-                    with warnings.catch_warnings():
-                        warnings.simplefilter('ignore')
-                        employe = employe_form.save()
+                    #with warnings.catch_warnings():
+                    #    warnings.simplefilter('ignore')
+                    employe = employe_form.save()
                     data['employe'] = 'dae-%s' % employe.id
                     employe_form = EmployeForm(data, instance=employe)