test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use `callable` instead of `six.callable`. 

The `callable` builtin was added back in python 3.2
which is the minimal python3 version supported by django
at this point.
This commit is contained in:
Baptiste Mispelon 2013-10-29 21:53:51 +01:00
parent 6b560b50b9
commit 497930b7f6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/migrations/operations/special.py
View File

@ -137,7 +137,7 @@ class RunPython(Operation):
# object, representing the versioned models as an AppCache. # object, representing the versioned models as an AppCache.
# We could try to override the global cache, but then people will still # We could try to override the global cache, but then people will still
# use direct imports, so we go with a documentation approach instead. # use direct imports, so we go with a documentation approach instead.
if six.callable(self.code): if callable(self.code):
self.code(models=from_state.render(), schema_editor=schema_editor) self.code(models=from_state.render(), schema_editor=schema_editor)
else: else:
context = { context = {
@ -149,7 +149,7 @@ class RunPython(Operation):
def database_backwards(self, app_label, schema_editor, from_state, to_state): def database_backwards(self, app_label, schema_editor, from_state, to_state):
if self.reverse_code is None: if self.reverse_code is None:
raise NotImplementedError("You cannot reverse this operation") raise NotImplementedError("You cannot reverse this operation")
elif six.callable(self.reverse_code): elif callable(self.reverse_code):
self.reverse_code(models=from_state.render(), schema_editor=schema_editor) self.reverse_code(models=from_state.render(), schema_editor=schema_editor)
else: else:
context = { context = {