From 5031393136574d791be0b29cc798f505b356500c Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 13 Aug 2016 21:06:02 +0200 Subject: [PATCH] Force isort to treat typing in the py3.5 style, not py3.4 --- src/pretix/base/cache.py | 2 +- src/pretix/base/i18n.py | 2 +- src/pretix/base/models/items.py | 2 +- src/pretix/base/models/orders.py | 2 +- src/pretix/base/payment.py | 2 +- src/pretix/base/plugins.py | 2 +- src/pretix/base/services/cart.py | 2 +- src/pretix/base/services/export.py | 3 ++- src/pretix/base/services/mail.py | 2 +- src/pretix/base/services/orders.py | 2 +- src/pretix/base/services/stats.py | 2 +- src/pretix/base/settings.py | 2 +- src/pretix/base/signals.py | 3 ++- src/pretix/base/ticketoutput.py | 2 +- src/setup.cfg | 1 + 15 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/pretix/base/cache.py b/src/pretix/base/cache.py index e61915f73..5c684c57c 100644 --- a/src/pretix/base/cache.py +++ b/src/pretix/base/cache.py @@ -1,9 +1,9 @@ import hashlib import time +from typing import Dict, List from django.core.cache import caches from django.db.models import Model -from typing import Dict, List class NamespacedCache: diff --git a/src/pretix/base/i18n.py b/src/pretix/base/i18n.py index 635bd5290..f8db0346f 100644 --- a/src/pretix/base/i18n.py +++ b/src/pretix/base/i18n.py @@ -1,6 +1,7 @@ import copy import json from contextlib import contextmanager +from typing import Dict, List, Optional, Union from django import forms from django.conf import settings @@ -10,7 +11,6 @@ from django.utils import translation from django.utils.formats import date_format, number_format from django.utils.safestring import mark_safe from django.utils.translation import ugettext -from typing import Dict, List, Optional, Union class LazyI18nString: diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index 03b4de078..1ced4adc7 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -1,13 +1,13 @@ import sys import uuid from decimal import Decimal +from typing import Tuple from django.db import models from django.db.models import Q from django.utils.functional import cached_property from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ -from typing import Tuple from pretix.base.i18n import I18nCharField, I18nTextField from pretix.base.models.base import LoggedModel diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 03de7f71a..dd75b8601 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -3,12 +3,12 @@ import random import string from datetime import datetime from decimal import Decimal +from typing import List, Union from django.conf import settings from django.db import models from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ -from typing import List, Union from ..decimal import round_decimal from .base import CachedFile, LoggedModel diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py index 0de8c9ee9..9d6ebb8c4 100644 --- a/src/pretix/base/payment.py +++ b/src/pretix/base/payment.py @@ -1,5 +1,6 @@ from collections import OrderedDict from decimal import Decimal +from typing import Any, Dict from django import forms from django.contrib import messages @@ -9,7 +10,6 @@ from django.forms import Form from django.http import HttpRequest from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ -from typing import Any, Dict from pretix.base.decimal import round_decimal from pretix.base.models import CartPosition, Event, Order, Quota diff --git a/src/pretix/base/plugins.py b/src/pretix/base/plugins.py index c01fd9636..29b40e39d 100644 --- a/src/pretix/base/plugins.py +++ b/src/pretix/base/plugins.py @@ -1,7 +1,7 @@ from enum import Enum +from typing import List from django.apps import apps -from typing import List class PluginType(Enum): diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 18dfbc5ec..e5c3ca337 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -1,11 +1,11 @@ from datetime import datetime, timedelta from decimal import Decimal +from typing import List, Optional from django.conf import settings from django.db.models import Q from django.utils.timezone import now from django.utils.translation import ugettext as _ -from typing import List, Optional from pretix.base.i18n import LazyLocaleException from pretix.base.models import ( diff --git a/src/pretix/base/services/export.py b/src/pretix/base/services/export.py index c4c33ca55..5aa2d2135 100644 --- a/src/pretix/base/services/export.py +++ b/src/pretix/base/services/export.py @@ -1,6 +1,7 @@ +from typing import Any, Dict + from django.conf import settings from django.core.files.base import ContentFile -from typing import Any, Dict from pretix.base.models import CachedFile, Event, cachedfile_name from pretix.base.signals import register_data_exporters diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py index 0cc0a07ba..2043a82fc 100644 --- a/src/pretix/base/services/mail.py +++ b/src/pretix/base/services/mail.py @@ -1,10 +1,10 @@ import logging +from typing import Any, Dict from django.conf import settings from django.core.mail import EmailMessage, get_connection from django.template.loader import get_template from django.utils.translation import ugettext as _ -from typing import Any, Dict from pretix.base.i18n import LazyI18nString, language from pretix.base.models import Event, Order diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index a32504ce5..4f58c9bf8 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -1,12 +1,12 @@ from datetime import datetime, timedelta from decimal import Decimal +from typing import List from django.conf import settings from django.db import transaction from django.dispatch import receiver from django.utils.timezone import now from django.utils.translation import ugettext as _ -from typing import List from pretix.base.i18n import ( LazyDate, LazyLocaleException, LazyNumber, language, diff --git a/src/pretix/base/services/stats.py b/src/pretix/base/services/stats.py index f9152020a..6e26a8a9c 100644 --- a/src/pretix/base/services/stats.py +++ b/src/pretix/base/services/stats.py @@ -1,8 +1,8 @@ from decimal import Decimal +from typing import Any, Dict, Iterable, List, Tuple from django.db.models import Count, Sum from django.utils.translation import ugettext_lazy as _ -from typing import Any, Dict, Iterable, List, Tuple from pretix.base.models import Event, Item, ItemCategory, Order, OrderPosition from pretix.base.signals import register_payment_providers diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index c48e21bb7..162798c67 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -1,6 +1,7 @@ import decimal import json from datetime import date, datetime, time +from typing import Any, Dict, Optional import dateutil.parser from django.conf import settings @@ -8,7 +9,6 @@ from django.core.files import File from django.core.files.storage import default_storage from django.db.models import Model from django.utils.translation import ugettext_noop -from typing import Any, Dict, Optional from pretix.base.i18n import LazyI18nString diff --git a/src/pretix/base/signals.py b/src/pretix/base/signals.py index 5d3478d80..aad143fa6 100644 --- a/src/pretix/base/signals.py +++ b/src/pretix/base/signals.py @@ -1,8 +1,9 @@ +from typing import Any, Callable, List, Tuple + import django.dispatch from django.apps import apps from django.conf import settings from django.dispatch.dispatcher import NO_RECEIVERS -from typing import Any, Callable, List, Tuple from .models import Event diff --git a/src/pretix/base/ticketoutput.py b/src/pretix/base/ticketoutput.py index 3064fc6fd..70ff65c43 100644 --- a/src/pretix/base/ticketoutput.py +++ b/src/pretix/base/ticketoutput.py @@ -1,9 +1,9 @@ from collections import OrderedDict +from typing import Tuple from django import forms from django.http import HttpRequest from django.utils.translation import ugettext_lazy as _ -from typing import Tuple from pretix.base.models import Event, Order from pretix.base.settings import SettingsSandbox diff --git a/src/setup.cfg b/src/setup.cfg index 4ada48c62..6a95fc4d0 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -10,6 +10,7 @@ default_section = THIRDPARTY include_trailing_comma = true known_first_party = pretix known_third_party = versions +known_standard_library = typing multi_line_output = 5 not_skip = __init__.py skip = make_testdata.py,wsgi.py,bootstrap,celery.py