encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 08:00:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed screwed formatting

Browse Source
This commit is contained in:
Michal Dvorak 2012-12-03 19:10:57 +01:00
parent ad01fa0eae
commit dea0f9129c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rest_framework/fields.py
View File

@ -28,7 +28,7 @@ def is_simple_callable(obj):
return ( return (
(inspect.isfunction(obj) and not inspect.getargspec(obj)[0]) or (inspect.isfunction(obj) and not inspect.getargspec(obj)[0]) or
(inspect.ismethod(obj) and len(inspect.getargspec(obj)[0]) <= 1) (inspect.ismethod(obj) and len(inspect.getargspec(obj)[0]) <= 1)
) )
class Field(object): class Field(object):
@ -217,7 +217,6 @@ class ModelField(WritableField):
""" """
A generic field that can be used against an arbitrary model field. A generic field that can be used against an arbitrary model field.
""" """
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
try: try:
self.model_field = kwargs.pop('model_field') self.model_field = kwargs.pop('model_field')
@ -225,9 +224,9 @@ class ModelField(WritableField):
raise ValueError("ModelField requires 'model_field' kwarg") raise ValueError("ModelField requires 'model_field' kwarg")
self.min_length = kwargs.pop('min_length', self.min_length = kwargs.pop('min_length',
getattr(self.model_field, 'min_length', None)) getattr(self.model_field, 'min_length', None))
self.max_length = kwargs.pop('max_length', self.max_length = kwargs.pop('max_length',
getattr(self.model_field, 'max_length', None)) getattr(self.model_field, 'max_length', None))
super(ModelField, self).__init__(*args, **kwargs) super(ModelField, self).__init__(*args, **kwargs)
@ -437,7 +436,7 @@ class PrimaryKeyRelatedField(RelatedField):
# RelatedObject (reverse relationship) # RelatedObject (reverse relationship)
obj = getattr(obj, self.source or field_name) obj = getattr(obj, self.source or field_name)
return self.to_native(obj.pk) return self.to_native(obj.pk)
# Forward relationship # Forward relationship
return self.to_native(pk) return self.to_native(pk)
@ -472,7 +471,7 @@ class ManyPrimaryKeyRelatedField(ManyRelatedField):
# RelatedManager (reverse relationship) # RelatedManager (reverse relationship)
queryset = getattr(obj, self.source or field_name) queryset = getattr(obj, self.source or field_name)
return [self.to_native(item.pk) for item in queryset.all()] return [self.to_native(item.pk) for item in queryset.all()]
# Forward relationship # Forward relationship
return [self.to_native(item.pk) for item in queryset.all()] return [self.to_native(item.pk) for item in queryset.all()]
def from_native(self, data): def from_native(self, data):
@ -916,7 +915,7 @@ class DateTimeField(WritableField):
# call stack. # call stack.
warnings.warn(u"DateTimeField received a naive datetime (%s)" warnings.warn(u"DateTimeField received a naive datetime (%s)"
u" while time zone support is active." % value, u" while time zone support is active." % value,
RuntimeWarning) RuntimeWarning)
default_timezone = timezone.get_default_timezone() default_timezone = timezone.get_default_timezone()
value = timezone.make_aware(value, default_timezone) value = timezone.make_aware(value, default_timezone)
return value return value