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:09:51 -0400 |
| commit | 06c0e740a41f64a49a11569e76edee7be04770e0 (patch) | |
| tree | c99c372ecc879a4f937608600b7573440456b51f | |
| parent | 50b9313e0a0739dfe1ac699449b66ed3e62add51 (diff) | |
Added django.utils.six.buffer_types
and used it in the Oracle SchemaEditor. Refs #22715.
| -rw-r--r-- | django/db/backends/oracle/schema.py | 3 | ||||
| -rw-r--r-- | django/utils/six.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/django/db/backends/oracle/schema.py b/django/db/backends/oracle/schema.py index 986cd95e75..702b3791d0 100644 --- a/django/db/backends/oracle/schema.py +++ b/django/db/backends/oracle/schema.py @@ -24,8 +24,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): return "'%s'" % value elif isinstance(value, six.string_types): return "'%s'" % six.text_type(value).replace("\'", "\'\'") - elif (isinstance(value, six.memoryview) or - six.PY3 and isinstance(value, bytes)): + elif isinstance(value, six.buffer_types): return "'%s'" % force_text(binascii.hexlify(value)) elif isinstance(value, bool): return "1" if value else "0" diff --git a/django/utils/six.py b/django/utils/six.py index eb32ab8834..e13925bb55 100644 --- a/django/utils/six.py +++ b/django/utils/six.py @@ -667,6 +667,7 @@ if PY3: _assertRaisesRegex = "assertRaisesRegex" _assertRegex = "assertRegex" memoryview = memoryview + buffer_types = (bytes, bytearray, memoryview) else: _assertCountEqual = "assertItemsEqual" _assertRaisesRegex = "assertRaisesRegexp" @@ -678,6 +679,7 @@ else: memoryview = memoryview else: memoryview = buffer + buffer_types = (bytearray, memoryview) def assertCountEqual(self, *args, **kwargs): |