From 61032b8d9bdf45eb2a085df6149c29fc69481467 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 30 Mar 2023 12:11:18 -0400 Subject: [PATCH] stricter linting --- .pylintrc | 2 +- extensions-builtin/seed_travel | 2 +- modules/images.py | 2 +- modules/lycoris | 2 +- modules/prompt_parser.py | 1 + modules/shared.py | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.pylintrc b/.pylintrc index 53254e5dc..12eae44bb 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,3 +1,3 @@ # See https://pylint.pycqa.org/en/latest/user_guide/messages/message_control.html [MESSAGES CONTROL] -disable=C,R,W,E,I +disable=C,R,W diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index dbc8c5291..3e217f28b 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit dbc8c5291205d7a4d6d662475d40c9da580020f1 +Subproject commit 3e217f28b801483d18af092208db3552f7b8ec42 diff --git a/modules/images.py b/modules/images.py index 3c7b2c92a..caba95a5b 100644 --- a/modules/images.py +++ b/modules/images.py @@ -12,7 +12,7 @@ import numpy as np import piexif import piexif.helper from PIL import Image, ImageFont, ImageDraw, PngImagePlugin, ExifTags -from fonts.ttf import Roboto +from fonts.ttf import Roboto # pylint: disable=no-name-in-module import string import json import hashlib diff --git a/modules/lycoris b/modules/lycoris index 932e83ca6..c3d925421 160000 --- a/modules/lycoris +++ b/modules/lycoris @@ -1 +1 @@ -Subproject commit 932e83ca6f8f7159a2afd41382e2a554e8cafe4b +Subproject commit c3d925421209a22a60d863ffa3de0b3e7e89f047 diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index 2a60bd2c9..987f5d891 100644 --- a/modules/prompt_parser.py +++ b/modules/prompt_parser.py @@ -2,6 +2,7 @@ import re from collections import namedtuple from typing import List import lark +import shared # a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][ in background:0.25] [shoddy:masterful:0.5]" # will be represented with prompt_schedule like this (assuming steps=100): diff --git a/modules/shared.py b/modules/shared.py index 2ba9cf844..8867304c3 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -29,7 +29,6 @@ try: traceback_install(console=console, extra_lines=1, width=console.width, word_wrap=False, indent_guides=False, show_locals=False, max_frames=2) except: console = None - import traceback script_loading.preload_extensions(extensions_dir, parser) script_loading.preload_extensions(extensions_builtin_dir, parser) @@ -671,4 +670,5 @@ def exception(): if console is not None: console.print_exception(show_locals=False, max_frames=10, extra_lines=2, suppress=[gr], word_wrap=False, width=min([console.width, 200])) else: + import traceback print(traceback.format_exc(), file=sys.stderr)