More code imporvements

docs/conf.py

@@ -46,8 +46,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Django Suit'
-copyright = u'2013, Kaspars Sprogis (darklow)'
+project = 'Django Suit'
+copyright = '2013, Kaspars Sprogis (darklow)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -188,7 +188,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'DjangoSuit.tex', u'Django Suit Documentation', u'Kaspars Sprogis (darklow)', 'manual'),
+    ('index', 'DjangoSuit.tex', 'Django Suit Documentation', 'Kaspars Sprogis (darklow)', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -216,7 +216,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [('index', 'djangosuit', u'Django Suit Documentation', [u'Kaspars Sprogis (darklow)'], 1)]
+man_pages = [('index', 'djangosuit', 'Django Suit Documentation', ['Kaspars Sprogis (darklow)'], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -231,8 +231,8 @@
     (
         'index',
         'DjangoSuit',
-        u'Django Suit Documentation',
-        u'Kaspars Sprogis (darklow)',
+        'Django Suit Documentation',
+        'Kaspars Sprogis (darklow)',
         'DjangoSuit',
         'One line description of project.',
         'Miscellaneous',

pyproject.toml

@@ -0,0 +1,34 @@
+[tool.ruff]
+# https://docs.astral.sh/ruff/configuration/#using-pyprojecttoml
+
+fix = true
+
+ignore = [
+    "E203",  # Whitespace before '{symbol}'
+    "F401",  # {name} imported but unused
+]
+
+line-length = 120
+
+# https://docs.astral.sh/ruff/rules/
+select = [
+    # First two lines represent default flake8 configuration
+    "E", "W",  # PyCodestyle
+    "F",       # PyFlakes
+    "T10",     # flake8-debugger: catch debug statements
+    "T20",     # flake8-print: catch print statements
+    "UP025",   # unicode-kind-prefix: Prevent unicode prefix in strings
+    "I",       # isort: Check import order and add missing required imports
+]
+
+show-fixes = true
+
+[tool.ruff.isort]
+# https://docs.astral.sh/ruff/settings/#isort
+# Combine aliased imports into the same import statement.
+combine-as-imports = true
+# With imports including at least one alias, force each imported member to its own line.
+force-wrap-aliases = true
+# Do not sort imports by type (constant, class, function, etc.).
+# Instead, sort them alphabetically and case-insensitively.
+order-by-type = false

suit/admin.py

@@ -1,12 +1,14 @@
 import copy
+
 from django.conf import settings
+from django.contrib import admin
 from django.contrib.admin import ModelAdmin
 from django.contrib.admin.views.main import ChangeList
-from django.forms import ModelForm
-from django.contrib import admin
 from django.db import models
-from suit.widgets import NumberInput, SuitSplitDateTimeWidget
+from django.forms import ModelForm
+
 from suit.compat import ct_admin
+from suit.widgets import NumberInput, SuitSplitDateTimeWidget
 
 
 class SortableModelAdminBase(object):

suit/compat.py

@@ -7,7 +7,7 @@
 
 """
 import django
-from django.template.defaulttags import url
 from django.contrib.contenttypes import admin as ct_admin
+from django.template.defaulttags import url
 
 tpl_context_class = dict

suit/config.py

@@ -1,5 +1,6 @@
-from django.contrib.admin import ModelAdmin
 from django.conf import settings
+from django.contrib.admin import ModelAdmin
+
 from . import VERSION
 
 
@@ -55,10 +56,11 @@ def get_config(param=None):
 
 
 def setup_filer():
-    from suit.widgets import AutosizedTextarea
-    from filer.admin.imageadmin import ImageAdminForm
-    from filer.admin.fileadmin import FileAdminChangeFrom
     from filer.admin import FolderAdmin
+    from filer.admin.fileadmin import FileAdminChangeFrom
+    from filer.admin.imageadmin import ImageAdminForm
+
+    from suit.widgets import AutosizedTextarea
 
     def ensure_meta_widgets(meta_cls):
         if not hasattr(meta_cls, 'widgets'):

suit/templatetags/suit_compat.py

@@ -1,4 +1,5 @@
 from django import template
+
 from ..compat import url as url_compat
 
 register = template.Library()

suit/templatetags/suit_tags.py

@@ -1,11 +1,13 @@
 import itertools
+
 from django import template
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import ForeignKey
 from django.template.defaulttags import NowNode
 from django.utils.safestring import mark_safe
-from suit.config import get_config
+
 from suit import utils
+from suit.config import get_config
 
 try:
     from django.core.urlresolvers import NoReverseMatch, reverse

suit/tests/config.py

@@ -1,10 +1,11 @@
-from django.contrib.admin import ModelAdmin
 from django.conf import settings
+from django.contrib.admin import ModelAdmin
+
 from suit import VERSION
 from suit.config import default_config, get_config
 from suit.templatetags.suit_tags import admin_url
+from suit.tests.mixins import ModelsTestCaseMixin, UserTestCaseMixin
 from suit.tests.models import Book
-from suit.tests.mixins import UserTestCaseMixin, ModelsTestCaseMixin
 
 
 class ConfigTestCase(UserTestCaseMixin):

suit/tests/mixins.py

@@ -1,9 +1,9 @@
+from random import randint
+
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.management import CommandError
-from django.core.management import call_command
+from django.core.management import call_command, CommandError
 from django.test import TestCase
-from random import randint
 
 # Django 1.7 compatiblity
 try:

suit/tests/templates/form_tabs.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
 from django.utils.translation import gettext
+
 from suit.tests.mixins import ModelsTestCaseMixin, UserTestCaseMixin
 from suit.tests.models import Book, BookAdmin, test_app_label
 

suit/tests/test.py

@@ -1,3 +0,0 @@
-from .templatetags import *
-from .templates import *
-from . import *

suit/tests/utils.py

@@ -1,7 +1,7 @@
 from django import get_version
-from suit import utils
 from django.test import TestCase
 
+from suit import utils
 from suit.templatetags.suit_tags import str_to_version
 
 

suit/watch_less.py

@@ -1,9 +1,9 @@
-import sys
 import os
+import sys
 import time
 
+from watchdog.events import FileModifiedEvent, FileSystemEventHandler
 from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler, FileModifiedEvent
 
 
 class LessCompiler(FileSystemEventHandler):
@@ -17,7 +17,6 @@ def compile_css(self):
         else:
             destination = sys.argv[2]
         cmd = 'lessc %s > %s -x' % (source, os.path.abspath(destination))
-        print(cmd)
         os.system(cmd)
 
     def on_any_event(self, event):