Sort imports (with isort)

City-of-Helsinki · Oct 6, 2017 · 51a5466 · 51a5466
1 parent acf99b8
commit 51a5466
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 22 deletions.
diff --git a/decisions/admin.py b/decisions/admin.py
@@ -2,7 +2,8 @@
 from django.contrib import admin
 from easy_select2 import select2_modelform
 
-from decisions.models import Action, Content, Event, Membership, Organization, Person, Post
+from decisions.models import (
+    Action, Content, Event, Membership, Organization, Person, Post)
 
 
 class PersonMembershipInline(admin.TabularInline):

diff --git a/decisions/api/organization.py b/decisions/api/organization.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers, viewsets
 
-from decisions.models import Event, OrganizationClass, Organization, Post
+from decisions.models import Event, Organization, OrganizationClass, Post
 
 from .base import DataModelSerializer
 

diff --git a/decisions/factories/__init__.py b/decisions/factories/__init__.py
@@ -1,3 +1,4 @@
 from .case import ActionFactory, CaseFactory, FunctionFactory  # noqa
 from .event import EventFactory  # noqa
-from .organization import OrganizationClassFactory, OrganizationFactory, PostFactory  # noqa
+from .organization import (  # noqa
+    OrganizationClassFactory, OrganizationFactory, PostFactory)
diff --git a/decisions/factories/organization.py b/decisions/factories/organization.py
@@ -1,7 +1,7 @@
 import factory
 from faker import Faker
 
-from decisions.models import OrganizationClass, Organization, Post
+from decisions.models import Organization, OrganizationClass, Post
 
 fake = Faker()
 fake.seed(7)

diff --git a/decisions/importer/helsinki/ahjo/document.py b/decisions/importer/helsinki/ahjo/document.py
@@ -1,10 +1,10 @@
-import pytz
-import re
-import logging
 import json
+import logging
+import re
+from datetime import date, datetime
 
+import pytz
 from lxml import etree
-from datetime import datetime, date
 
 RESOLUTION_MAP = {
     'hyväksytty': 'accepted'

diff --git a/decisions/importer/helsinki/ahjo/tests/test_parse_dirlist.py b/decisions/importer/helsinki/ahjo/tests/test_parse_dirlist.py
@@ -2,7 +2,8 @@
 
 import datetime
 
-from decisions.importer.helsinki.ahjo.parse_dirlist import parse_dir_listing, parse_file_path
+from decisions.importer.helsinki.ahjo.parse_dirlist import (
+    parse_dir_listing, parse_file_path)
 
 EXAMPLE_ROOT_LISTING = r"""
 <html><head><title>openhelsinki.hel.fi - /files/</title></head>

diff --git a/decisions/importer/helsinki/helsinki.py b/decisions/importer/helsinki/helsinki.py
@@ -2,13 +2,13 @@
 # Based heavily on https://github.com/City-of-Helsinki/openahjo/blob/4bcb003d5db932ca28ea6851d76a20a4ee6eef54/decisions/importer/helsinki.py  # noqa
 
 import json
-
 from enum import Enum
+
 from dateutil.parser import parse as dateutil_parse
 from django.db import transaction
 from django.utils.text import slugify
 
-from decisions.models import DataSource, Person, OrganizationClass
+from decisions.models import DataSource, OrganizationClass, Person
 
 from .base import Importer
 

diff --git a/decisions/importer/open_ahjo.py b/decisions/importer/open_ahjo.py
@@ -4,8 +4,8 @@
 from django.conf import settings
 
 from decisions.models import (
-    Action, Attachment, Case, CaseGeometry, Content, DataSource, Event, Function, Organization, Post
-)
+    Action, Attachment, Case, CaseGeometry, Content, DataSource, Event,
+    Function, Organization, Post)
 
 from .base import Importer
 

diff --git a/decisions/importer/paatos_scraper.py b/decisions/importer/paatos_scraper.py
@@ -4,12 +4,13 @@
 import os.path
 import tempfile
 import zipfile
+
 import dateutil.parser
 from django.utils.text import slugify
 
 from decisions.models import (
-    Action, Attachment, Case, Content, DataSource, Event, Organization, Function, CaseGeometry
-)
+    Action, Attachment, Case, CaseGeometry, Content, DataSource, Event,
+    Function, Organization)
 
 from .base import Importer
 

diff --git a/decisions/models/__init__.py b/decisions/models/__init__.py
@@ -1,5 +1,6 @@
 from .base import DataSource, ImportedFile  # noqa
-from .case import Action, Attachment, Case, CaseGeometry, Content, Function  # noqa
+from .case import (  # noqa
+    Action, Attachment, Case, CaseGeometry, Content, Function)
 from .meeting import Event  # noqa
-from .organization import OrganizationClass, Organization, Post  # noqa
+from .organization import Organization, OrganizationClass, Post  # noqa
 from .person import Membership, Person  # noqa
diff --git a/decisions/models/meeting.py b/decisions/models/meeting.py
@@ -4,7 +4,6 @@
 
 from .base import DataModel
 
-
 # Popoloish models
 
 

diff --git a/decisions/tests/conftest.py b/decisions/tests/conftest.py
@@ -1,9 +1,8 @@
 from pytest_factoryboy import register
 
 from decisions.factories import (
-    ActionFactory, CaseFactory, EventFactory, FunctionFactory, OrganizationClassFactory, OrganizationFactory,
-    PostFactory
-)
+    ActionFactory, CaseFactory, EventFactory, FunctionFactory,
+    OrganizationClassFactory, OrganizationFactory, PostFactory)
 
 register(ActionFactory)
 register(CaseFactory)

diff --git a/decisions/urls_v1.py b/decisions/urls_v1.py
@@ -1,7 +1,9 @@
 from django.conf.urls import include, url
 from rest_framework.routers import DefaultRouter
 
-from decisions.api import ActionViewSet, CaseViewSet, EventViewSet, FunctionViewSet, OrganizationViewSet, PostViewSet
+from decisions.api import (
+    ActionViewSet, CaseViewSet, EventViewSet, FunctionViewSet,
+    OrganizationViewSet, PostViewSet)
 
 router = DefaultRouter()
 router.register(r'action', ActionViewSet)

diff --git a/paatos/wsgi.py b/paatos/wsgi.py
@@ -1,4 +1,6 @@
 import os
+
 from django.core.wsgi import get_wsgi_application
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "paatos.settings")
 application = get_wsgi_application()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@

		from .base import DataModel


		# Popoloish models


Expand Down