summaryrefslogtreecommitdiff
path: root/django/db/models/fields
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-10 17:24:04 -0400
committerTim Graham <timograham@gmail.com>2015-10-25 06:02:21 -0400
commite2ea30c4403fca1b0a2032aae7a783f8705fc08b (patch)
tree3f4f39f8422db192425cdde82d1af1344df5fc22 /django/db/models/fields
parent84ec3bfc1111525ee0b21afff870840b2eb13771 (diff)
[1.8.x] Fixed #24979 -- Removed usage of inspect.getargspec().
Backport of 3872a33132a4bb6aa22b237927597bbfdf6f21d7 from master
Diffstat (limited to 'django/db/models/fields')
-rw-r--r--django/db/models/fields/files.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 73c67bef81..d6c1eaf49f 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -1,7 +1,6 @@
import datetime
import os
import warnings
-from inspect import getargspec
from django import forms
from django.core import checks
@@ -13,6 +12,7 @@ from django.db.models.fields import Field
from django.utils import six
from django.utils.deprecation import RemovedInDjango110Warning
from django.utils.encoding import force_str, force_text
+from django.utils.inspect import func_supports_parameter
from django.utils.translation import ugettext_lazy as _
@@ -89,8 +89,7 @@ class FieldFile(File):
def save(self, name, content, save=True):
name = self.field.generate_filename(self.instance, name)
- args, varargs, varkw, defaults = getargspec(self.storage.save)
- if 'max_length' in args:
+ if func_supports_parameter(self.storage.save, 'max_length'):
self.name = self.storage.save(name, content, max_length=self.field.max_length)
else:
warnings.warn(