Force isort to treat typing in the py3.5 style, not py3.4

This commit is contained in:
Raphael Michel
2016-08-13 21:06:02 +02:00
parent 34212841e2
commit 5031393136
15 changed files with 17 additions and 14 deletions

View File

@@ -1,9 +1,9 @@
import hashlib import hashlib
import time import time
from typing import Dict, List
from django.core.cache import caches from django.core.cache import caches
from django.db.models import Model from django.db.models import Model
from typing import Dict, List
class NamespacedCache: class NamespacedCache:

View File

@@ -1,6 +1,7 @@
import copy import copy
import json import json
from contextlib import contextmanager from contextlib import contextmanager
from typing import Dict, List, Optional, Union
from django import forms from django import forms
from django.conf import settings 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.formats import date_format, number_format
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext from django.utils.translation import ugettext
from typing import Dict, List, Optional, Union
class LazyI18nString: class LazyI18nString:

View File

@@ -1,13 +1,13 @@
import sys import sys
import uuid import uuid
from decimal import Decimal from decimal import Decimal
from typing import Tuple
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import Q
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from typing import Tuple
from pretix.base.i18n import I18nCharField, I18nTextField from pretix.base.i18n import I18nCharField, I18nTextField
from pretix.base.models.base import LoggedModel from pretix.base.models.base import LoggedModel

View File

@@ -3,12 +3,12 @@ import random
import string import string
from datetime import datetime from datetime import datetime
from decimal import Decimal from decimal import Decimal
from typing import List, Union
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from typing import List, Union
from ..decimal import round_decimal from ..decimal import round_decimal
from .base import CachedFile, LoggedModel from .base import CachedFile, LoggedModel

View File

@@ -1,5 +1,6 @@
from collections import OrderedDict from collections import OrderedDict
from decimal import Decimal from decimal import Decimal
from typing import Any, Dict
from django import forms from django import forms
from django.contrib import messages from django.contrib import messages
@@ -9,7 +10,6 @@ from django.forms import Form
from django.http import HttpRequest from django.http import HttpRequest
from django.template.loader import get_template from django.template.loader import get_template
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from typing import Any, Dict
from pretix.base.decimal import round_decimal from pretix.base.decimal import round_decimal
from pretix.base.models import CartPosition, Event, Order, Quota from pretix.base.models import CartPosition, Event, Order, Quota

View File

@@ -1,7 +1,7 @@
from enum import Enum from enum import Enum
from typing import List
from django.apps import apps from django.apps import apps
from typing import List
class PluginType(Enum): class PluginType(Enum):

View File

@@ -1,11 +1,11 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from decimal import Decimal from decimal import Decimal
from typing import List, Optional
from django.conf import settings from django.conf import settings
from django.db.models import Q from django.db.models import Q
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from typing import List, Optional
from pretix.base.i18n import LazyLocaleException from pretix.base.i18n import LazyLocaleException
from pretix.base.models import ( from pretix.base.models import (

View File

@@ -1,6 +1,7 @@
from typing import Any, Dict
from django.conf import settings from django.conf import settings
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from typing import Any, Dict
from pretix.base.models import CachedFile, Event, cachedfile_name from pretix.base.models import CachedFile, Event, cachedfile_name
from pretix.base.signals import register_data_exporters from pretix.base.signals import register_data_exporters

View File

@@ -1,10 +1,10 @@
import logging import logging
from typing import Any, Dict
from django.conf import settings from django.conf import settings
from django.core.mail import EmailMessage, get_connection from django.core.mail import EmailMessage, get_connection
from django.template.loader import get_template from django.template.loader import get_template
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from typing import Any, Dict
from pretix.base.i18n import LazyI18nString, language from pretix.base.i18n import LazyI18nString, language
from pretix.base.models import Event, Order from pretix.base.models import Event, Order

View File

@@ -1,12 +1,12 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from decimal import Decimal from decimal import Decimal
from typing import List
from django.conf import settings from django.conf import settings
from django.db import transaction from django.db import transaction
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from typing import List
from pretix.base.i18n import ( from pretix.base.i18n import (
LazyDate, LazyLocaleException, LazyNumber, language, LazyDate, LazyLocaleException, LazyNumber, language,

View File

@@ -1,8 +1,8 @@
from decimal import Decimal from decimal import Decimal
from typing import Any, Dict, Iterable, List, Tuple
from django.db.models import Count, Sum from django.db.models import Count, Sum
from django.utils.translation import ugettext_lazy as _ 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.models import Event, Item, ItemCategory, Order, OrderPosition
from pretix.base.signals import register_payment_providers from pretix.base.signals import register_payment_providers

View File

@@ -1,6 +1,7 @@
import decimal import decimal
import json import json
from datetime import date, datetime, time from datetime import date, datetime, time
from typing import Any, Dict, Optional
import dateutil.parser import dateutil.parser
from django.conf import settings 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.core.files.storage import default_storage
from django.db.models import Model from django.db.models import Model
from django.utils.translation import ugettext_noop from django.utils.translation import ugettext_noop
from typing import Any, Dict, Optional
from pretix.base.i18n import LazyI18nString from pretix.base.i18n import LazyI18nString

View File

@@ -1,8 +1,9 @@
from typing import Any, Callable, List, Tuple
import django.dispatch import django.dispatch
from django.apps import apps from django.apps import apps
from django.conf import settings from django.conf import settings
from django.dispatch.dispatcher import NO_RECEIVERS from django.dispatch.dispatcher import NO_RECEIVERS
from typing import Any, Callable, List, Tuple
from .models import Event from .models import Event

View File

@@ -1,9 +1,9 @@
from collections import OrderedDict from collections import OrderedDict
from typing import Tuple
from django import forms from django import forms
from django.http import HttpRequest from django.http import HttpRequest
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from typing import Tuple
from pretix.base.models import Event, Order from pretix.base.models import Event, Order
from pretix.base.settings import SettingsSandbox from pretix.base.settings import SettingsSandbox

View File

@@ -10,6 +10,7 @@ default_section = THIRDPARTY
include_trailing_comma = true include_trailing_comma = true
known_first_party = pretix known_first_party = pretix
known_third_party = versions known_third_party = versions
known_standard_library = typing
multi_line_output = 5 multi_line_output = 5
not_skip = __init__.py not_skip = __init__.py
skip = make_testdata.py,wsgi.py,bootstrap,celery.py skip = make_testdata.py,wsgi.py,bootstrap,celery.py