diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-12-29 16:27:49 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 20:18:46 +0100 |
| commit | 7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch) | |
| tree | 313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /django/db/backends/sqlite3/schema.py | |
| parent | f6acd1d271122d66de8061e75ae26137ddf02658 (diff) | |
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/db/backends/sqlite3/schema.py')
| -rw-r--r-- | django/db/backends/sqlite3/schema.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/django/db/backends/sqlite3/schema.py b/django/db/backends/sqlite3/schema.py index 36adb22584..d74f59d21c 100644 --- a/django/db/backends/sqlite3/schema.py +++ b/django/db/backends/sqlite3/schema.py @@ -5,7 +5,6 @@ from decimal import Decimal from django.apps.registry import Apps from django.db.backends.base.schema import BaseDatabaseSchemaEditor -from django.utils import six class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): @@ -46,15 +45,13 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): # Manual emulation of SQLite parameter quoting if isinstance(value, type(True)): return str(int(value)) - elif isinstance(value, (Decimal, float)): + elif isinstance(value, (Decimal, float, int)): return str(value) - elif isinstance(value, six.integer_types): - return str(value) - elif isinstance(value, six.string_types): - return "'%s'" % six.text_type(value).replace("\'", "\'\'") + elif isinstance(value, str): + return "'%s'" % value.replace("\'", "\'\'") elif value is None: return "NULL" - elif isinstance(value, (bytes, bytearray, six.memoryview)): + elif isinstance(value, (bytes, bytearray, memoryview)): # Bytes are only allowed for BLOB fields, encoded as string # literals containing hexadecimal data and preceded by a single "X" # character: |
