Projet

Général

Profil

0002-misc-apply-isort-54260.patch

Paul Marillonnet, 15 juillet 2021 12:35

Télécharger (5,54 ko)

Voir les différences: 

Subject: [PATCH 2/4] misc: apply isort (#54260)


 django_journal/actions.py                 | 4 +---
 django_journal/admin.py                   | 6 +++---
 django_journal/decorator.py               | 3 ++-
 django_journal/journal.py                 | 2 +-
 django_journal/managers.py                | 2 +-
 django_journal/middleware.py              | 1 +
 django_journal/migrations/0001_initial.py | 2 +-
 django_journal/models.py                  | 2 +-
 setup.py                                  | 6 +++---
 tests/test_main.py                        | 7 +++----
 10 files changed, 17 insertions(+), 18 deletions(-)
django_journal/actions.py
1 1 
import csv
2 2 

  		




  3
  
  
    

  		




  4
  
  
    
from django.utils.translation import ugettext_lazy as _

  		




  5
  3
  
    
from django.http import HttpResponse

  		




  6
  4
  
    
from django.utils.encoding import force_text

  		




  7
  
  
    

  		




  
  5
  
    
from django.utils.translation import ugettext_lazy as _

  		




  8
  6
  
    

  		




  9
  7
  
    
from . import models

  		




  10
  8
  
    

  		












  

    
      django_journal/admin.py
    
  





  2
  2
  
    

  		




  3
  3
  
    
import django.contrib.admin as admin

  		




  4
  4
  
    
from django.contrib.contenttypes.models import ContentType

  		




  5
  
  
    
from django.utils.html import format_html, escape, mark_safe

  		




  6
  5
  
    
from django.db import models

  		




  
  6
  
    
from django.urls import NoReverseMatch, reverse

  		




  7
  7
  
    
from django.utils.encoding import force_text

  		




  
  8
  
    
from django.utils.html import escape, format_html, mark_safe

  		




  8
  9
  
    
from django.utils.translation import ugettext_lazy as _

  		




  9
  
  
    
from django.urls import reverse, NoReverseMatch

  		




  10
  10
  
    

  		




  11
  
  
    
from .models import Journal, Tag, ObjectData, StringData

  		




  12
  11
  
    
from .actions import export_as_csv

  		




  
  12
  
    
from .models import Journal, ObjectData, StringData, Tag

  		




  13
  13
  
    

  		




  14
  14
  
    

  		




  15
  15
  
    
class ModelAdminFormatter(Formatter):

  		












  

    
      django_journal/decorator.py
    
  





  1
  1
  
    
from functools import wraps

  		




  2
  
  
    
from django.db import transaction, DEFAULT_DB_ALIAS

  		




  
  2
  
    

  		




  
  3
  
    
from django.db import DEFAULT_DB_ALIAS, transaction

  		




  3
  4
  
    

  		




  4
  5
  
    
if hasattr(transaction, 'atomic'):

  		




  5
  6
  
    
    atomic = transaction.atomic

  		












  

    
      django_journal/journal.py
    
  





  1
  1
  
    
import logging

  		




  2
  2
  
    

  		




  
  3
  
    
import django.db.models

  		




  3
  4
  
    
from django.conf import settings

  		




  4
  5
  
    
from django.contrib.contenttypes.models import ContentType

  		




  5
  
  
    
import django.db.models

  		




  6
  6
  
    
from django.utils.encoding import force_text

  		




  7
  7
  
    

  		




  8
  8
  
    
from .decorator import atomic

  		












  

    
      django_journal/managers.py
    
  





  1
  1
  
    
from django.contrib.contenttypes.models import ContentType

  		




  
  2
  
    
from django.db.models import Manager, Q

  		




  2
  3
  
    
from django.db.models.query import QuerySet

  		




  3
  
  
    
from django.db.models import Q, Manager

  		




  4
  4
  
    

  		




  5
  5
  
    

  		




  6
  6
  
    
class CachedQuerySet(QuerySet):

  		












  

    
      django_journal/middleware.py
    
  





  1
  1
  
    
from django.utils.deprecation import MiddlewareMixin

  		




  
  2
  
    

  		




  2
  3
  
    
from django_journal import journal

  		




  3
  4
  
    

  		




  4
  5
  
    

  		












  

    
      django_journal/migrations/0001_initial.py
    
  





  1
  1
  
    
# -*- coding: utf-8 -*-

  		




  2
  2
  
    
from __future__ import unicode_literals

  		




  3
  3
  
    

  		




  4
  
  
    
from django.db import migrations, models

  		




  5
  4
  
    
import django.db.models.deletion

  		




  
  5
  
    
from django.db import migrations, models

  		




  6
  6
  
    

  		




  7
  7
  
    

  		




  8
  8
  
    
class Migration(migrations.Migration):

  		












  

    
      django_journal/models.py
    
  





  1
  1
  
    
import string

  		




  2
  2
  
    

  		




  3
  
  
    
from django.db import models

  		




  4
  3
  
    
from django.contrib.contenttypes.fields import GenericForeignKey

  		




  
  4
  
    
from django.db import models

  		




  5
  5
  
    
from django.utils.encoding import python_2_unicode_compatible

  		




  6
  6
  
    
from django.utils.translation import ugettext_lazy as _

  		




  7
  7
  
    

  		












  

    
      setup.py
    
  





  2
  2
  
    
import os

  		




  3
  3
  
    
import subprocess

  		




  4
  4
  
    
import sys

  		




  
  5
  
    
from distutils.cmd import Command

  		




  
  6
  
    
from distutils.command.build import build as _build

  		




  5
  7
  
    

  		




  6
  
  
    
from setuptools import setup, find_packages

  		




  
  8
  
    
from setuptools import find_packages, setup

  		




  7
  9
  
    
from setuptools.command.install_lib import install_lib as _install_lib

  		




  8
  
  
    
from distutils.command.build import build as _build

  		




  9
  10
  
    
from setuptools.command.sdist import sdist

  		




  10
  
  
    
from distutils.cmd import Command

  		




  11
  11
  
    

  		




  12
  12
  
    

  		




  13
  13
  
    
class test(Command):

  		












  

    
      tests/test_main.py
    
  





  1
  
  
    
from django.test import TestCase

  		




  2
  
  
    
from django.contrib.auth.models import User, Group

  		




  
  1
  
    
from django.contrib.auth.models import Group, User

  		




  3
  2
  
    
from django.db import transaction

  		




  
  3
  
    
from django.test import TestCase

  		




  4
  4
  
    
from django.utils.encoding import force_text

  		




  5
  5
  
    

  		




  6
  
  
    

  		




  7
  
  
    
from django_journal.journal import record, error_record

  		




  8
  6
  
    
from django_journal.actions import export_as_csv_generator

  		




  
  7
  
    
from django_journal.journal import error_record, record

  		




  9
  8
  
    
from django_journal.models import Journal, Tag

  		




  10
  9
  
    

  		




  11
  10
  
    

  		




  12
  
  
    
-