← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mumble-django/saucy-proposed

« back to all changes in this revision

Viewing changes to pyweb/djextdirect/formprovider.py

  • Committer: Package Import Robot
  • Author(s): Michael Ziegler
  • Date: 2013-05-19 18:06:11 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20130519180611-flqpsk20fu2t6hq4
Tags: 2.9-1
* New upstream release.
* Drop DM-Upload-Allowed as it isn't used any longer.
* Update VCS-{SVN,Browser} tags.
* Update Django dependency to 1.5.
* Remove template patch for django-registration 0.8 (applied upstream).
* Remove the hunk that adds MessageMiddleware to settings.py (applied
  upstream).
* Disable the registration app for now (incompatible to Django 1.5).
* Remove dependency to python-simplejson.
* Adapt apache config to staticfiles change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pyweb/djextdirect/formprovider.py
15
15
 *  GNU General Public License for more details.
16
16
"""
17
17
 
18
 
try:
19
 
    import simplejson
20
 
except ImportError:
21
 
    import json as simplejson
 
18
import json
22
19
 
23
20
import functools
24
21
 
293
290
            'clsname':      clsname,
294
291
            'clslowername': formname,
295
292
            'defaultconf':  '{'
296
 
                'items:'    + simplejson.dumps(items, cls=DjangoJSONEncoder, indent=4) + ','
297
 
                'fileUpload: ' + simplejson.dumps(hasfiles, cls=DjangoJSONEncoder) + ','
 
293
                'items:'    + json.dumps(items, cls=DjangoJSONEncoder, indent=4) + ','
 
294
                'fileUpload: ' + json.dumps(hasfiles, cls=DjangoJSONEncoder) + ','
298
295
                '}',
299
296
            'apiconf': ('{'
300
297
                'load:  '  + ("XD_%s.get"     % clsname) + ","