diff options
Diffstat (limited to 'django/contrib/postgres')
| -rw-r--r-- | django/contrib/postgres/fields/array.py | 3 | ||||
| -rw-r--r-- | django/contrib/postgres/fields/hstore.py | 3 | ||||
| -rw-r--r-- | django/contrib/postgres/fields/ranges.py | 7 | ||||
| -rw-r--r-- | django/contrib/postgres/forms/array.py | 8 | ||||
| -rw-r--r-- | django/contrib/postgres/forms/hstore.py | 1 | ||||
| -rw-r--r-- | django/contrib/postgres/forms/ranges.py | 7 | ||||
| -rw-r--r-- | django/contrib/postgres/signals.py | 4 | ||||
| -rw-r--r-- | django/contrib/postgres/validators.py | 4 |
8 files changed, 17 insertions, 20 deletions
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index af575c6b30..8e442c4a7a 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -4,11 +4,10 @@ from django.contrib.postgres import lookups from django.contrib.postgres.forms import SimpleArrayField from django.contrib.postgres.validators import ArrayMaxLengthValidator from django.core import checks, exceptions -from django.db.models import Field, Transform, IntegerField +from django.db.models import Field, IntegerField, Transform from django.utils import six from django.utils.translation import string_concat, ugettext_lazy as _ - __all__ = ['ArrayField'] diff --git a/django/contrib/postgres/fields/hstore.py b/django/contrib/postgres/fields/hstore.py index 1524368ecf..461fa047e2 100644 --- a/django/contrib/postgres/fields/hstore.py +++ b/django/contrib/postgres/fields/hstore.py @@ -3,11 +3,10 @@ import json from django.contrib.postgres import forms, lookups from django.contrib.postgres.fields.array import ArrayField from django.core import exceptions -from django.db.models import Field, Transform, TextField +from django.db.models import Field, TextField, Transform from django.utils import six from django.utils.translation import ugettext_lazy as _ - __all__ = ['HStoreField'] diff --git a/django/contrib/postgres/fields/ranges.py b/django/contrib/postgres/fields/ranges.py index 8cb5229593..679e87f44e 100644 --- a/django/contrib/postgres/fields/ranges.py +++ b/django/contrib/postgres/fields/ranges.py @@ -1,12 +1,11 @@ import json -from django.contrib.postgres import lookups, forms +from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange, Range + +from django.contrib.postgres import forms, lookups from django.db import models from django.utils import six -from psycopg2.extras import Range, NumericRange, DateRange, DateTimeTZRange - - __all__ = [ 'RangeField', 'IntegerRangeField', 'BigIntegerRangeField', 'FloatRangeField', 'DateTimeRangeField', 'DateRangeField', diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py index 0bd4ee4916..01c4d53527 100644 --- a/django/contrib/postgres/forms/array.py +++ b/django/contrib/postgres/forms/array.py @@ -1,10 +1,12 @@ import copy -from django.contrib.postgres.validators import ArrayMinLengthValidator, ArrayMaxLengthValidator -from django.core.exceptions import ValidationError from django import forms -from django.utils.safestring import mark_safe +from django.contrib.postgres.validators import ( + ArrayMaxLengthValidator, ArrayMinLengthValidator, +) +from django.core.exceptions import ValidationError from django.utils import six +from django.utils.safestring import mark_safe from django.utils.translation import string_concat, ugettext_lazy as _ diff --git a/django/contrib/postgres/forms/hstore.py b/django/contrib/postgres/forms/hstore.py index 548be0f570..2c564ea53c 100644 --- a/django/contrib/postgres/forms/hstore.py +++ b/django/contrib/postgres/forms/hstore.py @@ -5,7 +5,6 @@ from django.core.exceptions import ValidationError from django.utils import six from django.utils.translation import ugettext_lazy as _ - __all__ = ['HStoreField'] diff --git a/django/contrib/postgres/forms/ranges.py b/django/contrib/postgres/forms/ranges.py index 23db4fe514..80ea8299c9 100644 --- a/django/contrib/postgres/forms/ranges.py +++ b/django/contrib/postgres/forms/ranges.py @@ -1,11 +1,10 @@ -from django.core import exceptions +from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange + from django import forms +from django.core import exceptions from django.forms.widgets import MultiWidget from django.utils.translation import ugettext_lazy as _ -from psycopg2.extras import NumericRange, DateRange, DateTimeTZRange - - __all__ = ['IntegerRangeField', 'FloatRangeField', 'DateTimeRangeField', 'DateRangeField'] diff --git a/django/contrib/postgres/signals.py b/django/contrib/postgres/signals.py index 602dd08700..183ba1d983 100644 --- a/django/contrib/postgres/signals.py +++ b/django/contrib/postgres/signals.py @@ -1,8 +1,8 @@ -from django.utils import six - from psycopg2 import ProgrammingError from psycopg2.extras import register_hstore +from django.utils import six + def register_hstore_handler(connection, **kwargs): if connection.vendor != 'postgresql': diff --git a/django/contrib/postgres/validators.py b/django/contrib/postgres/validators.py index 49ec921db1..3f576873f4 100644 --- a/django/contrib/postgres/validators.py +++ b/django/contrib/postgres/validators.py @@ -2,11 +2,11 @@ import copy from django.core.exceptions import ValidationError from django.core.validators import ( - MaxLengthValidator, MinLengthValidator, MaxValueValidator, + MaxLengthValidator, MaxValueValidator, MinLengthValidator, MinValueValidator, ) from django.utils.deconstruct import deconstructible -from django.utils.translation import ungettext_lazy, ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, ungettext_lazy class ArrayMaxLengthValidator(MaxLengthValidator): |
