← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal

« back to all changes in this revision

Viewing changes to django/core/serializers/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2009-07-29 11:26:28 UTC
  • mfrom: (1.1.8 upstream) (4.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090729112628-pg09ino8sz0sj21t
Tags: 1.1-1
http://bugs.debian.org/538863
* New upstream release.
* Merge from experimental:
  - Ship FastCGI initscript and /etc/default file in python-django's examples
    directory (Closes: #538863)
  - Drop "05_10539-sphinx06-compatibility.diff"; it has been applied
    upstream.
  - Bump Standards-Version to 3.8.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/core/serializers/__init__.py
17
17
"""
18
18
 
19
19
from django.conf import settings
 
20
from django.utils import importlib
20
21
 
21
22
# Built-in serializers
22
23
BUILTIN_SERIALIZERS = {
47
48
    directly into the global register of serializers. Adding serializers
48
49
    directly is not a thread-safe operation.
49
50
    """
50
 
    module = __import__(serializer_module, {}, {}, [''])
 
51
    module = importlib.import_module(serializer_module)
51
52
    if serializers is None:
52
53
        _serializers[format] = module
53
54
    else: