summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-12-13 22:11:06 +0100
committerClaude Paroz <claude@2xlibre.net>2013-03-02 10:29:02 +0100
commit8ee1eddb7e148de89aebde9e68da495633fc1ec9 (patch)
tree36b83db0cf15b0be47557449b9ed056646099542 /django/utils
parent0f306cad8442f9808e4410f190f434144ff6376a (diff)
Add a BinaryField model field
Thanks Michael Jung, Charl Botha and Florian Apolloner for review and help on the patch.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/six.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/utils/six.py b/django/utils/six.py
index b93dc5b164..208c5c1112 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -394,10 +394,14 @@ if PY3:
_iterlists = "lists"
_assertRaisesRegex = "assertRaisesRegex"
_assertRegex = "assertRegex"
+ memoryview = memoryview
else:
_iterlists = "iterlists"
_assertRaisesRegex = "assertRaisesRegexp"
_assertRegex = "assertRegexpMatches"
+ # memoryview and buffer are not stricly equivalent, but should be fine for
+ # django core usage (mainly BinaryField)
+ memoryview = buffer
def iterlists(d):