diff options
| author | Shai Berger <shai@platonix.com> | 2014-05-28 20:40:31 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-13 13:13:10 -0400 |
| commit | 1cb5dfe05f4e8363a7cf39d400e328f4b1c33366 (patch) | |
| tree | 035cd6157eb7e0845c2631063684f4a545738a2a /django/utils | |
| parent | d94de802d34c858805a01d3c699799aebc247ec3 (diff) | |
[1.7.x] Added django.utils.six.buffer_types
and used it in the Oracle SchemaEditor. Refs #22715.
Backport of 06c0e740a4 from master
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/six.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/utils/six.py b/django/utils/six.py index bf94a83000..8c582deaac 100644 --- a/django/utils/six.py +++ b/django/utils/six.py @@ -666,6 +666,7 @@ if PY3: _assertRaisesRegex = "assertRaisesRegex" _assertRegex = "assertRegex" memoryview = memoryview + buffer_types = (bytes, bytearray, memoryview) else: _assertRaisesRegex = "assertRaisesRegexp" _assertRegex = "assertRegexpMatches" @@ -676,6 +677,7 @@ else: memoryview = memoryview else: memoryview = buffer + buffer_types = (bytearray, memoryview) def assertRaisesRegex(self, *args, **kwargs): |