mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
More attacking E302 violators
This commit is contained in:
@@ -90,6 +90,7 @@ def unregister_serializer(format):
|
||||
raise SerializerDoesNotExist(format)
|
||||
del _serializers[format]
|
||||
|
||||
|
||||
def get_serializer(format):
|
||||
if not _serializers:
|
||||
_load_serializers()
|
||||
@@ -97,16 +98,19 @@ def get_serializer(format):
|
||||
raise SerializerDoesNotExist(format)
|
||||
return _serializers[format].Serializer
|
||||
|
||||
|
||||
def get_serializer_formats():
|
||||
if not _serializers:
|
||||
_load_serializers()
|
||||
return list(_serializers)
|
||||
|
||||
|
||||
def get_public_serializer_formats():
|
||||
if not _serializers:
|
||||
_load_serializers()
|
||||
return [k for k, v in six.iteritems(_serializers) if not v.Serializer.internal_use_only]
|
||||
|
||||
|
||||
def get_deserializer(format):
|
||||
if not _serializers:
|
||||
_load_serializers()
|
||||
@@ -114,6 +118,7 @@ def get_deserializer(format):
|
||||
raise SerializerDoesNotExist(format)
|
||||
return _serializers[format].Deserializer
|
||||
|
||||
|
||||
def serialize(format, queryset, **options):
|
||||
"""
|
||||
Serialize a queryset (or any iterator that returns database objects) using
|
||||
@@ -123,6 +128,7 @@ def serialize(format, queryset, **options):
|
||||
s.serialize(queryset, **options)
|
||||
return s.getvalue()
|
||||
|
||||
|
||||
def deserialize(format, stream_or_string, **options):
|
||||
"""
|
||||
Deserialize a stream or a string. Returns an iterator that yields ``(obj,
|
||||
@@ -133,6 +139,7 @@ def deserialize(format, stream_or_string, **options):
|
||||
d = get_deserializer(format)
|
||||
return d(stream_or_string, **options)
|
||||
|
||||
|
||||
def _load_serializers():
|
||||
"""
|
||||
Register built-in and settings-defined serializers. This is done lazily so
|
||||
|
||||
@@ -6,18 +6,22 @@ import warnings
|
||||
from django.db import models
|
||||
from django.utils import six
|
||||
|
||||
|
||||
class SerializerDoesNotExist(KeyError):
|
||||
"""The requested serializer was not found."""
|
||||
pass
|
||||
|
||||
|
||||
class SerializationError(Exception):
|
||||
"""Something bad happened during serialization."""
|
||||
pass
|
||||
|
||||
|
||||
class DeserializationError(Exception):
|
||||
"""Something bad happened during deserialization."""
|
||||
pass
|
||||
|
||||
|
||||
class Serializer(object):
|
||||
"""
|
||||
Abstract serializer base class.
|
||||
@@ -117,6 +121,7 @@ class Serializer(object):
|
||||
if callable(getattr(self.stream, 'getvalue', None)):
|
||||
return self.stream.getvalue()
|
||||
|
||||
|
||||
class Deserializer(six.Iterator):
|
||||
"""
|
||||
Abstract base deserializer class.
|
||||
@@ -143,6 +148,7 @@ class Deserializer(six.Iterator):
|
||||
"""Iteration iterface -- return the next item in the stream"""
|
||||
raise NotImplementedError('subclasses of Deserializer must provide a __next__() method')
|
||||
|
||||
|
||||
class DeserializedObject(object):
|
||||
"""
|
||||
A deserialized model.
|
||||
@@ -176,6 +182,7 @@ class DeserializedObject(object):
|
||||
# the m2m data twice.
|
||||
self.m2m_data = None
|
||||
|
||||
|
||||
def build_instance(Model, data, db):
|
||||
"""
|
||||
Build a model instance.
|
||||
|
||||
@@ -17,6 +17,7 @@ from django.core.serializers.python import Deserializer as PythonDeserializer
|
||||
from django.utils import six
|
||||
from django.utils.timezone import is_aware
|
||||
|
||||
|
||||
class Serializer(PythonSerializer):
|
||||
"""
|
||||
Convert a queryset to JSON.
|
||||
|
||||
@@ -147,6 +147,7 @@ def Deserializer(object_list, **options):
|
||||
obj = base.build_instance(Model, data, db)
|
||||
yield base.DeserializedObject(obj, m2m_data)
|
||||
|
||||
|
||||
def _get_model(model_identifier):
|
||||
"""
|
||||
Helper to look up a model from an "app_label.model_name" string.
|
||||
|
||||
@@ -29,6 +29,7 @@ class DjangoSafeDumper(SafeDumper):
|
||||
|
||||
DjangoSafeDumper.add_representer(decimal.Decimal, DjangoSafeDumper.represent_decimal)
|
||||
|
||||
|
||||
class Serializer(PythonSerializer):
|
||||
"""
|
||||
Convert a queryset to YAML.
|
||||
@@ -55,6 +56,7 @@ class Serializer(PythonSerializer):
|
||||
# Grand-parent super
|
||||
return super(PythonSerializer, self).getvalue()
|
||||
|
||||
|
||||
def Deserializer(stream_or_string, **options):
|
||||
"""
|
||||
Deserialize a stream or string of YAML data.
|
||||
|
||||
@@ -13,6 +13,7 @@ from xml.dom import pulldom
|
||||
from xml.sax import handler
|
||||
from xml.sax.expatreader import ExpatParser as _ExpatParser
|
||||
|
||||
|
||||
class Serializer(base.Serializer):
|
||||
"""
|
||||
Serializes a QuerySet to XML.
|
||||
@@ -143,6 +144,7 @@ class Serializer(base.Serializer):
|
||||
"to": smart_text(field.rel.to._meta),
|
||||
})
|
||||
|
||||
|
||||
class Deserializer(base.Deserializer):
|
||||
"""
|
||||
Deserialize XML.
|
||||
|
||||
Reference in New Issue
Block a user