aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorMichal Dvorak2012-12-03 19:10:57 +0100
committerMichal Dvorak2012-12-03 19:10:57 +0100
commitdea0f9129c770b6a9ccebce7296235b529fa59e7 (patch)
tree1d941d75ecd8739f868bb529c48d250e48a44ad7 /rest_framework/fields.py
parentad01fa0eae990ca1607d44cbabba5425c9d0b9a4 (diff)
downloaddjango-rest-framework-dea0f9129c770b6a9ccebce7296235b529fa59e7.tar.bz2
Fixed screwed formatting
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 907bab74..74b4cb7c 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -28,7 +28,7 @@ def is_simple_callable(obj):
return (
(inspect.isfunction(obj) and not inspect.getargspec(obj)[0]) or
(inspect.ismethod(obj) and len(inspect.getargspec(obj)[0]) <= 1)
- )
+ )
class Field(object):
@@ -217,7 +217,6 @@ class ModelField(WritableField):
"""
A generic field that can be used against an arbitrary model field.
"""
-
def __init__(self, *args, **kwargs):
try:
self.model_field = kwargs.pop('model_field')
@@ -225,9 +224,9 @@ class ModelField(WritableField):
raise ValueError("ModelField requires 'model_field' kwarg")
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',
- getattr(self.model_field, 'max_length', None))
+ getattr(self.model_field, 'max_length', None))
super(ModelField, self).__init__(*args, **kwargs)
@@ -437,7 +436,7 @@ class PrimaryKeyRelatedField(RelatedField):
# RelatedObject (reverse relationship)
obj = getattr(obj, self.source or field_name)
return self.to_native(obj.pk)
- # Forward relationship
+ # Forward relationship
return self.to_native(pk)
@@ -472,7 +471,7 @@ class ManyPrimaryKeyRelatedField(ManyRelatedField):
# RelatedManager (reverse relationship)
queryset = getattr(obj, self.source or field_name)
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()]
def from_native(self, data):
@@ -916,7 +915,7 @@ class DateTimeField(WritableField):
# call stack.
warnings.warn(u"DateTimeField received a naive datetime (%s)"
u" while time zone support is active." % value,
- RuntimeWarning)
+ RuntimeWarning)
default_timezone = timezone.get_default_timezone()
value = timezone.make_aware(value, default_timezone)
return value