Organize Python imports
This commit is contained in:
parent
e903d32cd0
commit
76bcc0bea5
|
@ -34,6 +34,9 @@
|
|||
<AndroidXmlCodeStyleSettings>
|
||||
<option name="USE_CUSTOM_SETTINGS" value="true" />
|
||||
</AndroidXmlCodeStyleSettings>
|
||||
<Python>
|
||||
<option name="OPTIMIZE_IMPORTS_JOIN_FROM_IMPORTS_WITH_SAME_SOURCE" value="true" />
|
||||
</Python>
|
||||
<XML>
|
||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||
</XML>
|
||||
|
|
|
@ -2,10 +2,11 @@
|
|||
# Generated by Django 1.10.5 on 2017-04-12 23:04
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import django.utils.timezone
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
import maker.models.storage
|
||||
import maker.storage
|
||||
|
||||
|
|
|
@ -2,8 +2,9 @@ from __future__ import unicode_literals
|
|||
|
||||
import datetime
|
||||
|
||||
from django.utils import timezone
|
||||
from django.db import migrations
|
||||
from django.utils import timezone
|
||||
|
||||
from maker import tasks
|
||||
|
||||
|
||||
|
|
|
@ -4,15 +4,13 @@ import os
|
|||
from io import BytesIO
|
||||
|
||||
import requests
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.exceptions import ObjectDoesNotExist, ValidationError
|
||||
from django.core.files import File
|
||||
from django.db import models
|
||||
from django.db.models.signals import post_delete
|
||||
from django.dispatch import receiver
|
||||
from django.utils import timezone
|
||||
from fdroidserver import common
|
||||
from fdroidserver import update
|
||||
from fdroidserver import common, update
|
||||
|
||||
from maker import tasks
|
||||
from maker.storage import get_apk_file_path, RepoStorage
|
||||
|
|
|
@ -12,14 +12,10 @@ from django.core.files.base import ContentFile
|
|||
from django.db import models
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from fdroidserver import common
|
||||
from fdroidserver import index
|
||||
from fdroidserver import server
|
||||
from fdroidserver import update
|
||||
from fdroidserver import common, index, server, update
|
||||
|
||||
from maker import tasks
|
||||
from maker.storage import REPO_DIR
|
||||
from maker.storage import get_repo_file_path, get_remote_repo_path, get_repo_root_path
|
||||
from maker.storage import REPO_DIR, get_repo_file_path, get_remote_repo_path, get_repo_root_path
|
||||
|
||||
keydname = "CN=localhost.localdomain, OU=F-Droid"
|
||||
|
||||
|
|
|
@ -10,8 +10,8 @@ from django.shortcuts import get_object_or_404
|
|||
from django.views.static import serve
|
||||
|
||||
from maker import DEFAULT_USER_NAME
|
||||
from maker.storage import USER_RE, REMOTE_REPO_RE
|
||||
from maker.models import RemoteRepository, Repository
|
||||
from maker.storage import USER_RE, REMOTE_REPO_RE
|
||||
|
||||
|
||||
# TODO remove when not needed anymore for testing
|
||||
|
|
|
@ -3,8 +3,7 @@ from django.shortcuts import get_object_or_404
|
|||
from django.views.generic import ListView, DetailView
|
||||
from django.views.generic.edit import CreateView
|
||||
|
||||
from maker.models import Repository
|
||||
from maker.models import SshStorage, S3Storage, App
|
||||
from maker.models import Repository, SshStorage, S3Storage, App
|
||||
from . import BaseModelForm, LoginOrSingleUserRequiredMixin
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue