From 732167282bf45160cc25ce15926bb8a80bfe845c Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Tue, 5 Apr 2016 17:38:05 -0700 Subject: [PATCH] Some import sorting stuff --- channels/channel.py | 1 + channels/management/commands/runworker.py | 3 +- patchinator.py | 53 +++++++++++++++-------- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/channels/channel.py b/channels/channel.py index 465e267..c22c940 100644 --- a/channels/channel.py +++ b/channels/channel.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from django.utils import six + from channels import DEFAULT_CHANNEL_LAYER, channel_layers diff --git a/channels/management/commands/runworker.py b/channels/management/commands/runworker.py index 069e6ec..0cf4498 100644 --- a/channels/management/commands/runworker.py +++ b/channels/management/commands/runworker.py @@ -1,7 +1,8 @@ from __future__ import unicode_literals from django.core.management import BaseCommand, CommandError -from channels import channel_layers, DEFAULT_CHANNEL_LAYER + +from channels import DEFAULT_CHANNEL_LAYER, channel_layers from channels.log import setup_logger from channels.worker import Worker diff --git a/patchinator.py b/patchinator.py index fd41524..07b74c1 100644 --- a/patchinator.py +++ b/patchinator.py @@ -11,6 +11,8 @@ import re import os.path import sys +from isort import SortImports + # Transforms: Turn one content string into another @@ -48,6 +50,15 @@ class Insert(object): return value[:match.start()] + self.to_insert + value[match.start():] +class Isort(object): + """ + Runs isort on the file + """ + + def __call__(self, value): + return SortImports(file_contents=value).output + + # Operations: Copy or patch files class FileMap(object): @@ -108,7 +119,11 @@ global_transforms = [ Replacement(r"from .handler import", r"from django.core.handlers.asgi import"), Replacement(r"from django.channels.tests import", r"from django.test.channels import"), Replacement(r"from django.channels.handler import", r"from django.core.handlers.asgi import"), - Replacement(r"channels.tests.test_routing", r"channels_tests.test_routing") + Replacement(r"channels.tests.test_routing", r"channels_tests.test_routing"), +] + +python_transforms = global_transforms + [ + Isort(), ] docs_transforms = global_transforms + [ @@ -129,64 +144,64 @@ class Patchinator(object): operations = [ FileMap( - "channels/asgi.py", "django/channels/asgi.py", global_transforms, + "channels/asgi.py", "django/channels/asgi.py", python_transforms, ), FileMap( - "channels/auth.py", "django/channels/auth.py", global_transforms, + "channels/auth.py", "django/channels/auth.py", python_transforms, ), FileMap( - "channels/channel.py", "django/channels/channel.py", global_transforms, + "channels/channel.py", "django/channels/channel.py", python_transforms, ), FileMap( - "channels/database_layer.py", "django/channels/database_layer.py", global_transforms, + "channels/database_layer.py", "django/channels/database_layer.py", python_transforms, ), FileMap( - "channels/exceptions.py", "django/channels/exceptions.py", global_transforms, + "channels/exceptions.py", "django/channels/exceptions.py", python_transforms, ), FileMap( - "channels/handler.py", "django/core/handlers/asgi.py", global_transforms, + "channels/handler.py", "django/core/handlers/asgi.py", python_transforms, ), FileMap( - "channels/routing.py", "django/channels/routing.py", global_transforms, + "channels/routing.py", "django/channels/routing.py", python_transforms, ), FileMap( - "channels/message.py", "django/channels/message.py", global_transforms, + "channels/message.py", "django/channels/message.py", python_transforms, ), FileMap( - "channels/sessions.py", "django/channels/sessions.py", global_transforms, + "channels/sessions.py", "django/channels/sessions.py", python_transforms, ), FileMap( - "channels/staticfiles.py", "django/contrib/staticfiles/consumers.py", global_transforms, + "channels/staticfiles.py", "django/contrib/staticfiles/consumers.py", python_transforms, ), FileMap( - "channels/utils.py", "django/channels/utils.py", global_transforms, + "channels/utils.py", "django/channels/utils.py", python_transforms, ), FileMap( - "channels/worker.py", "django/channels/worker.py", global_transforms, + "channels/worker.py", "django/channels/worker.py", python_transforms, ), FileMap( "channels/management/commands/runworker.py", "django/core/management/commands/runworker.py", - global_transforms, + python_transforms, ), # Tests FileMap( - "channels/tests/base.py", "django/test/channels.py", global_transforms, + "channels/tests/base.py", "django/test/channels.py", python_transforms, ), NewFile( "tests/channels_tests/__init__.py", ), FileMap( - "channels/tests/test_database_layer.py", "tests/channels_tests/test_database_layer.py", global_transforms, + "channels/tests/test_database_layer.py", "tests/channels_tests/test_database_layer.py", python_transforms, ), FileMap( - "channels/tests/test_handler.py", "tests/channels_tests/test_handler.py", global_transforms, + "channels/tests/test_handler.py", "tests/channels_tests/test_handler.py", python_transforms, ), FileMap( - "channels/tests/test_routing.py", "tests/channels_tests/test_routing.py", global_transforms, + "channels/tests/test_routing.py", "tests/channels_tests/test_routing.py", python_transforms, ), FileMap( - "channels/tests/test_request.py", "tests/channels_tests/test_request.py", global_transforms, + "channels/tests/test_request.py", "tests/channels_tests/test_request.py", python_transforms, ), # Docs FileMap(