From 8fa8c178e054e4f8c1945494fd5ba9500c16cec3 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 30 Mar 2024 14:37:00 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblins=20(delin?= =?UTF-8?q?t).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sort imports using ruff check --fix --select I. --- conftest.py | 1 - cssutils/__init__.py | 13 ++++----- cssutils/_fetch.py | 3 ++- cssutils/_fetchgae.py | 4 ++- cssutils/codec.py | 2 +- cssutils/css/__init__.py | 27 +++++++++---------- cssutils/css/csscharsetrule.py | 6 +++-- cssutils/css/csscomment.py | 6 +++-- cssutils/css/cssfontfacerule.py | 8 +++--- cssutils/css/cssimportrule.py | 6 +++-- cssutils/css/cssmediarule.py | 6 +++-- cssutils/css/cssnamespacerule.py | 6 +++-- cssutils/css/csspagerule.py | 8 +++--- cssutils/css/cssproperties.py | 3 ++- cssutils/css/cssrule.py | 3 ++- cssutils/css/cssstyledeclaration.py | 3 ++- cssutils/css/cssstylerule.py | 8 +++--- cssutils/css/cssstylesheet.py | 6 +++-- cssutils/css/cssunknownrule.py | 6 +++-- cssutils/css/cssvalue.py | 7 ++--- cssutils/css/cssvariablesdeclaration.py | 8 +++--- cssutils/css/cssvariablesrule.py | 8 +++--- cssutils/css/marginrule.py | 8 +++--- cssutils/css/property.py | 3 ++- cssutils/css/selector.py | 5 ++-- cssutils/css/selectorlist.py | 3 ++- cssutils/css/value.py | 7 ++--- cssutils/errorhandler.py | 2 +- cssutils/helper.py | 4 +-- cssutils/parse.py | 7 ++--- cssutils/prodparser.py | 6 +++-- cssutils/sac.py | 4 +-- cssutils/script.py | 7 +++-- cssutils/scripts/csscapture.py | 3 ++- cssutils/scripts/csscombine.py | 3 ++- cssutils/scripts/cssparse.py | 3 ++- cssutils/serialize.py | 4 ++- cssutils/settings.py | 3 +-- cssutils/stylesheets/medialist.py | 8 +++--- cssutils/stylesheets/mediaquery.py | 7 ++--- cssutils/tests/basetest.py | 1 + cssutils/tests/test_csscharsetrule.py | 7 +++-- cssutils/tests/test_csscomment.py | 4 ++- cssutils/tests/test_cssimportrule.py | 1 + cssutils/tests/test_cssnamespacerule.py | 7 +++-- cssutils/tests/test_csspagerule.py | 7 +++-- cssutils/tests/test_cssproperties.py | 3 ++- cssutils/tests/test_cssrule.py | 7 +++-- cssutils/tests/test_cssrulelist.py | 3 ++- cssutils/tests/test_cssstyledeclaration.py | 7 +++-- cssutils/tests/test_cssstylerule.py | 7 +++-- cssutils/tests/test_cssstylesheet.py | 7 +++-- cssutils/tests/test_cssunknownrule.py | 4 ++- cssutils/tests/test_cssutils.py | 6 +++-- cssutils/tests/test_cssvalue.py | 5 ++-- .../tests/test_cssvariablesdeclaration.py | 3 ++- cssutils/tests/test_cssvariablesrule.py | 7 +++-- cssutils/tests/test_domimplementation.py | 2 +- cssutils/tests/test_errorhandler.py | 2 +- cssutils/tests/test_marginrule.py | 7 +++-- cssutils/tests/test_medialist.py | 3 ++- cssutils/tests/test_mediaquery.py | 7 +++-- cssutils/tests/test_parse.py | 6 +++-- cssutils/tests/test_prodparser.py | 14 +++++----- cssutils/tests/test_properties.py | 1 + cssutils/tests/test_property.py | 3 ++- cssutils/tests/test_scripts_csscombine.py | 3 ++- cssutils/tests/test_selector.py | 3 ++- cssutils/tests/test_selectorlist.py | 7 +++-- cssutils/tests/test_serialize.py | 3 ++- cssutils/tests/test_util.py | 7 ++--- cssutils/tests/test_value.py | 6 +++-- cssutils/tokenize2.py | 2 +- cssutils/util.py | 14 +++++----- encutils/__init__.py | 6 ++--- examples/build.py | 1 - examples/codec.py | 1 - examples/customlog.py | 3 +-- examples/imports.py | 3 ++- examples/parse.py | 3 ++- examples/serialize.py | 3 ++- examples/style.py | 3 ++- examples/testutil.py | 2 +- tools/try.py | 5 ++-- 84 files changed, 270 insertions(+), 171 deletions(-) diff --git a/conftest.py b/conftest.py index a4effcd9..eebd705d 100644 --- a/conftest.py +++ b/conftest.py @@ -4,7 +4,6 @@ import cssutils - collect_ignore = [ 'cssutils/_fetchgae.py', 'tools', diff --git a/cssutils/__init__.py b/cssutils/__init__.py index 37c54894..38d22353 100644 --- a/cssutils/__init__.py +++ b/cssutils/__init__.py @@ -69,20 +69,17 @@ """ +import functools +import itertools import os.path -import urllib.request import urllib.parse +import urllib.request import xml.dom -import itertools -import functools -from . import errorhandler -from . import css -from . import stylesheets +from . import css, errorhandler, stylesheets from .parse import CSSParser -from .serialize import CSSSerializer from .profiles import Profiles - +from .serialize import CSSSerializer __all__ = ['css', 'stylesheets', 'CSSParser', 'CSSSerializer'] diff --git a/cssutils/_fetch.py b/cssutils/_fetch.py index e3c6be9b..31986cae 100644 --- a/cssutils/_fetch.py +++ b/cssutils/_fetch.py @@ -3,8 +3,8 @@ __all__ = ['_defaultFetcher'] import functools -import urllib.request import urllib.error +import urllib.request try: from importlib import metadata @@ -12,6 +12,7 @@ import importlib_metadata as metadata import encutils + from . import errorhandler log = errorhandler.ErrorHandler() diff --git a/cssutils/_fetchgae.py b/cssutils/_fetchgae.py index 8b3d130f..11639c9b 100644 --- a/cssutils/_fetchgae.py +++ b/cssutils/_fetchgae.py @@ -3,8 +3,10 @@ __all__ = ['_defaultFetcher'] # raises ImportError of not on GAE -from google.appengine.api import urlfetch import cgi + +from google.appengine.api import urlfetch + from . import errorhandler log = errorhandler.ErrorHandler() diff --git a/cssutils/codec.py b/cssutils/codec.py index a988a3b4..9ab030ee 100644 --- a/cssutils/codec.py +++ b/cssutils/codec.py @@ -1,8 +1,8 @@ """Python codec for CSS.""" import codecs -import marshal import functools +import marshal # We're using bits to store all possible candidate encodings (or variants, i.e. # we have two bits for the variants of UTF-16 and two for the diff --git a/cssutils/css/__init__.py b/cssutils/css/__init__.py index 25e5f3bf..b8182f9b 100644 --- a/cssutils/css/__init__.py +++ b/cssutils/css/__init__.py @@ -58,34 +58,33 @@ 'CSSCalc', ] -from .cssstylesheet import CSSStyleSheet -from .cssrulelist import CSSRuleList -from .cssrule import CSSRule -from .csscomment import CSSComment from .csscharsetrule import CSSCharsetRule +from .csscomment import CSSComment from .cssfontfacerule import CSSFontFaceRule from .cssimportrule import CSSImportRule from .cssmediarule import CSSMediaRule from .cssnamespacerule import CSSNamespaceRule from .csspagerule import CSSPageRule -from .marginrule import MarginRule +from .cssrule import CSSRule +from .cssrulelist import CSSRuleList +from .cssstyledeclaration import CSSStyleDeclaration from .cssstylerule import CSSStyleRule +from .cssstylesheet import CSSStyleSheet from .cssunknownrule import CSSUnknownRule +from .cssvariablesdeclaration import CSSVariablesDeclaration from .cssvariablesrule import CSSVariablesRule +from .marginrule import MarginRule +from .property import Property from .selector import Selector from .selectorlist import SelectorList -from .cssstyledeclaration import CSSStyleDeclaration -from .cssvariablesdeclaration import CSSVariablesDeclaration -from .property import Property - from .value import ( - PropertyValue, - Value, ColorValue, - DimensionValue, - URIValue, + CSSCalc, CSSFunction, CSSVariable, + DimensionValue, MSValue, - CSSCalc, + PropertyValue, + URIValue, + Value, ) diff --git a/cssutils/css/csscharsetrule.py b/cssutils/css/csscharsetrule.py index 6fd7e558..aedd5e52 100644 --- a/cssutils/css/csscharsetrule.py +++ b/cssutils/css/csscharsetrule.py @@ -3,10 +3,12 @@ __all__ = ['CSSCharsetRule'] import codecs -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule + class CSSCharsetRule(cssrule.CSSRule): """ diff --git a/cssutils/css/csscomment.py b/cssutils/css/csscomment.py index de12fd46..408afb11 100644 --- a/cssutils/css/csscomment.py +++ b/cssutils/css/csscomment.py @@ -6,10 +6,12 @@ class only. __all__ = ['CSSComment'] -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule + class CSSComment(cssrule.CSSRule): """ diff --git a/cssutils/css/cssfontfacerule.py b/cssutils/css/cssfontfacerule.py index e25c440f..b56f722b 100644 --- a/cssutils/css/cssfontfacerule.py +++ b/cssutils/css/cssfontfacerule.py @@ -6,11 +6,13 @@ __all__ = ['CSSFontFaceRule'] -from .cssstyledeclaration import CSSStyleDeclaration -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule +from .cssstyledeclaration import CSSStyleDeclaration + class CSSFontFaceRule(cssrule.CSSRule): """ diff --git a/cssutils/css/cssimportrule.py b/cssutils/css/cssimportrule.py index f4bbc780..1697cea9 100644 --- a/cssutils/css/cssimportrule.py +++ b/cssutils/css/cssimportrule.py @@ -3,12 +3,14 @@ __all__ = ['CSSImportRule'] -from . import cssrule -import cssutils import os import urllib.parse import xml.dom +import cssutils + +from . import cssrule + class CSSImportRule(cssrule.CSSRule): """ diff --git a/cssutils/css/cssmediarule.py b/cssutils/css/cssmediarule.py index 979b9bfa..5567d70f 100644 --- a/cssutils/css/cssmediarule.py +++ b/cssutils/css/cssmediarule.py @@ -2,10 +2,12 @@ __all__ = ['CSSMediaRule'] -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule + class CSSMediaRule(cssrule.CSSRuleRules): """ diff --git a/cssutils/css/cssnamespacerule.py b/cssutils/css/cssnamespacerule.py index b535ef41..99e814d9 100644 --- a/cssutils/css/cssnamespacerule.py +++ b/cssutils/css/cssnamespacerule.py @@ -2,10 +2,12 @@ __all__ = ['CSSNamespaceRule'] -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule + class CSSNamespaceRule(cssrule.CSSRule): """ diff --git a/cssutils/css/csspagerule.py b/cssutils/css/csspagerule.py index f236f06d..953aa634 100644 --- a/cssutils/css/csspagerule.py +++ b/cssutils/css/csspagerule.py @@ -2,12 +2,14 @@ __all__ = ['CSSPageRule'] +import xml.dom from itertools import chain + +import cssutils + +from . import cssrule from .cssstyledeclaration import CSSStyleDeclaration from .marginrule import MarginRule -from . import cssrule -import cssutils -import xml.dom class CSSPageRule(cssrule.CSSRuleRules): diff --git a/cssutils/css/cssproperties.py b/cssutils/css/cssproperties.py index 18500de1..0262dfdd 100644 --- a/cssutils/css/cssproperties.py +++ b/cssutils/css/cssproperties.py @@ -49,9 +49,10 @@ __all__ = ['CSS2Properties'] -import cssutils.profiles import re +import cssutils.profiles + class CSS2Properties: """The CSS2Properties interface represents a convenience mechanism diff --git a/cssutils/css/cssrule.py b/cssutils/css/cssrule.py index ec87e172..2e396fe5 100644 --- a/cssutils/css/cssrule.py +++ b/cssutils/css/cssrule.py @@ -2,9 +2,10 @@ __all__ = ['CSSRule'] -import cssutils.util import xml.dom +import cssutils.util + class CSSRule(cssutils.util.Base2): """Abstract base interface for any type of CSS statement. This includes diff --git a/cssutils/css/cssstyledeclaration.py b/cssutils/css/cssstyledeclaration.py index ce1811b9..bdf336fa 100644 --- a/cssutils/css/cssstyledeclaration.py +++ b/cssutils/css/cssstyledeclaration.py @@ -52,9 +52,10 @@ __all__ = ['CSSStyleDeclaration', 'Property'] +import cssutils + from .cssproperties import CSS2Properties from .property import Property -import cssutils class CSSStyleDeclaration(CSS2Properties, cssutils.util.Base2): diff --git a/cssutils/css/cssstylerule.py b/cssutils/css/cssstylerule.py index 092ff96c..08a8226e 100644 --- a/cssutils/css/cssstylerule.py +++ b/cssutils/css/cssstylerule.py @@ -2,11 +2,13 @@ __all__ = ['CSSStyleRule'] +import xml.dom + +import cssutils + +from . import cssrule from .cssstyledeclaration import CSSStyleDeclaration from .selectorlist import SelectorList -from . import cssrule -import cssutils -import xml.dom class CSSStyleRule(cssrule.CSSRule): diff --git a/cssutils/css/cssstylesheet.py b/cssutils/css/cssstylesheet.py index 32f13318..e8c88a5b 100644 --- a/cssutils/css/cssstylesheet.py +++ b/cssutils/css/cssstylesheet.py @@ -10,12 +10,14 @@ __all__ = ['CSSStyleSheet'] +import xml.dom + +import cssutils.stylesheets from cssutils.helper import Deprecated from cssutils.util import _Namespaces, _readUrl + from .cssrule import CSSRule from .cssvariablesdeclaration import CSSVariablesDeclaration -import cssutils.stylesheets -import xml.dom class CSSStyleSheet(cssutils.stylesheets.StyleSheet): diff --git a/cssutils/css/cssunknownrule.py b/cssutils/css/cssunknownrule.py index 3f8650c0..3aa28aa7 100644 --- a/cssutils/css/cssunknownrule.py +++ b/cssutils/css/cssunknownrule.py @@ -2,10 +2,12 @@ __all__ = ['CSSUnknownRule'] -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule + class CSSUnknownRule(cssrule.CSSRule): """ diff --git a/cssutils/css/cssvalue.py b/cssutils/css/cssvalue.py index 10c45b24..a386bd0d 100644 --- a/cssutils/css/cssvalue.py +++ b/cssutils/css/cssvalue.py @@ -8,13 +8,14 @@ __all__ = ['CSSValue', 'CSSPrimitiveValue', 'CSSValueList', 'RGBColor', 'CSSVariable'] -from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence -import cssutils -import cssutils.helper import math import re import xml.dom +import cssutils +import cssutils.helper +from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence + class CSSValue(cssutils.util._NewBase): """The CSSValue interface represents a simple or a complex value. diff --git a/cssutils/css/cssvariablesdeclaration.py b/cssutils/css/cssvariablesdeclaration.py index 0543262a..c5e1c107 100644 --- a/cssutils/css/cssvariablesdeclaration.py +++ b/cssutils/css/cssvariablesdeclaration.py @@ -4,11 +4,13 @@ __all__ = ['CSSVariablesDeclaration'] -from cssutils.prodparser import PreDef, Prod, ProdParser, Sequence +import itertools + +import cssutils from cssutils.helper import normalize +from cssutils.prodparser import PreDef, Prod, ProdParser, Sequence + from .value import PropertyValue -import cssutils -import itertools class CSSVariablesDeclaration(cssutils.util._NewBase): diff --git a/cssutils/css/cssvariablesrule.py b/cssutils/css/cssvariablesrule.py index 5fe66f06..ddc87960 100644 --- a/cssutils/css/cssvariablesrule.py +++ b/cssutils/css/cssvariablesrule.py @@ -4,11 +4,13 @@ __all__ = ['CSSVariablesRule'] -from .cssvariablesdeclaration import CSSVariablesDeclaration -from . import cssrule -import cssutils import xml.dom +import cssutils + +from . import cssrule +from .cssvariablesdeclaration import CSSVariablesDeclaration + class CSSVariablesRule(cssrule.CSSRule): """ diff --git a/cssutils/css/marginrule.py b/cssutils/css/marginrule.py index d486a247..2f6a556b 100644 --- a/cssutils/css/marginrule.py +++ b/cssutils/css/marginrule.py @@ -2,11 +2,13 @@ __all__ = ['MarginRule'] +import xml.dom + +import cssutils from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence -from .cssstyledeclaration import CSSStyleDeclaration + from . import cssrule -import cssutils -import xml.dom +from .cssstyledeclaration import CSSStyleDeclaration class MarginRule(cssrule.CSSRule): diff --git a/cssutils/css/property.py b/cssutils/css/property.py index 7408506e..5d4d3eae 100644 --- a/cssutils/css/property.py +++ b/cssutils/css/property.py @@ -2,9 +2,10 @@ __all__ = ['Property'] +import cssutils from cssutils.helper import Deprecated + from .value import PropertyValue -import cssutils class Property(cssutils.util.Base): diff --git a/cssutils/css/selector.py b/cssutils/css/selector.py index 9f5b1f31..4fb82408 100644 --- a/cssutils/css/selector.py +++ b/cssutils/css/selector.py @@ -8,10 +8,11 @@ __all__ = ['Selector'] +import xml.dom + +import cssutils from cssutils.helper import Deprecated from cssutils.util import _SimpleNamespaces -import cssutils -import xml.dom class Selector(cssutils.util.Base2): diff --git a/cssutils/css/selectorlist.py b/cssutils/css/selectorlist.py index a3292fad..43111e3d 100644 --- a/cssutils/css/selectorlist.py +++ b/cssutils/css/selectorlist.py @@ -18,9 +18,10 @@ __all__ = ['SelectorList'] -from .selector import Selector import cssutils +from .selector import Selector + class SelectorList(cssutils.util.Base, cssutils.util.ListSeq): """A list of :class:`~cssutils.css.Selector` objects diff --git a/cssutils/css/value.py b/cssutils/css/value.py index 6cd4ed17..fc69d61c 100644 --- a/cssutils/css/value.py +++ b/cssutils/css/value.py @@ -16,13 +16,14 @@ 'MSValue', ] -from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence -import cssutils -from cssutils.helper import normalize, pushtoken import colorsys import re import urllib.parse +import cssutils +from cssutils.helper import normalize, pushtoken +from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence + class PropertyValue(cssutils.util._NewBase): """ diff --git a/cssutils/errorhandler.py b/cssutils/errorhandler.py index d249aa68..99363f1f 100644 --- a/cssutils/errorhandler.py +++ b/cssutils/errorhandler.py @@ -17,9 +17,9 @@ __all__ = ['ErrorHandler'] import logging -import urllib.request import urllib.error import urllib.parse +import urllib.request import xml.dom diff --git a/cssutils/helper.py b/cssutils/helper.py index b967ea4a..555bb7fc 100644 --- a/cssutils/helper.py +++ b/cssutils/helper.py @@ -1,11 +1,11 @@ """cssutils helper TEST""" +import itertools import os import re -import itertools -import urllib.request import urllib.error import urllib.parse +import urllib.request class Deprecated: diff --git a/cssutils/parse.py b/cssutils/parse.py index f1622207..a321a7f8 100644 --- a/cssutils/parse.py +++ b/cssutils/parse.py @@ -2,13 +2,14 @@ __all__ = ['CSSParser'] -from .helper import path2url import codecs -import cssutils -from . import tokenize2 +import cssutils from cssutils import css +from . import tokenize2 +from .helper import path2url + class CSSParser: """Parse a CSS StyleSheet from URL, string or file and return a DOM Level 2 diff --git a/cssutils/prodparser.py b/cssutils/prodparser.py index e98243e0..2d8f583f 100644 --- a/cssutils/prodparser.py +++ b/cssutils/prodparser.py @@ -16,13 +16,15 @@ __all__ = ['ProdParser', 'Sequence', 'Choice', 'Prod', 'PreDef'] -from .helper import pushtoken -import cssutils import itertools import re import sys import types +import cssutils + +from .helper import pushtoken + class ParseError(Exception): """Base Exception class for ProdParser (used internally).""" diff --git a/cssutils/sac.py b/cssutils/sac.py index fa15f6fc..e3f944a0 100644 --- a/cssutils/sac.py +++ b/cssutils/sac.py @@ -3,9 +3,7 @@ import codecs import sys -from . import helper -from . import errorhandler -from . import tokenize2 +from . import errorhandler, helper, tokenize2 class ErrorHandler: diff --git a/cssutils/script.py b/cssutils/script.py index 0d0b16de..5581739b 100644 --- a/cssutils/script.py +++ b/cssutils/script.py @@ -2,20 +2,19 @@ __all__ = ['CSSCapture', 'csscombine'] -import html.parser import codecs -import cssutils import errno +import html.parser import logging import os import sys -import urllib.request import urllib.error import urllib.parse +import urllib.request +import cssutils import encutils - # types of sheets in HTML LINK = ( 0 # diff --git a/cssutils/scripts/csscapture.py b/cssutils/scripts/csscapture.py index 74a7ffe4..1ed768dd 100644 --- a/cssutils/scripts/csscapture.py +++ b/cssutils/scripts/csscapture.py @@ -9,11 +9,12 @@ __all__ = ['CSSCapture'] -from cssutils.script import CSSCapture import logging import optparse import sys +from cssutils.script import CSSCapture + def main(args=None): usage = "usage: %prog [options] URL" diff --git a/cssutils/scripts/csscombine.py b/cssutils/scripts/csscombine.py index db4724dd..6820dd1d 100644 --- a/cssutils/scripts/csscombine.py +++ b/cssutils/scripts/csscombine.py @@ -53,10 +53,11 @@ __all__ = ['csscombine'] -from cssutils.script import csscombine import optparse import sys +from cssutils.script import csscombine + def main(args=None): usage = "usage: %prog [options] [path]" diff --git a/cssutils/scripts/cssparse.py b/cssutils/scripts/cssparse.py index 7f61e89f..65fe3b6b 100644 --- a/cssutils/scripts/cssparse.py +++ b/cssutils/scripts/cssparse.py @@ -1,10 +1,11 @@ """utility script to parse given filenames or string""" -import cssutils import logging import optparse import sys +import cssutils + def main(args=None): """ diff --git a/cssutils/serialize.py b/cssutils/serialize.py index 87522b44..b9765184 100644 --- a/cssutils/serialize.py +++ b/cssutils/serialize.py @@ -2,9 +2,11 @@ __all__ = ['CSSSerializer', 'Preferences'] -from cssutils.helper import normalize import codecs + import cssutils +from cssutils.helper import normalize + from . import helper diff --git a/cssutils/settings.py b/cssutils/settings.py index 068ac854..d423ba31 100644 --- a/cssutils/settings.py +++ b/cssutils/settings.py @@ -10,8 +10,7 @@ def set(key, value): Clears the tokenizer cache which holds the compiled productions! """ if key == 'DXImageTransform.Microsoft' and value is True: - from . import cssproductions - from . import tokenize2 + from . import cssproductions, tokenize2 tokenize2._TOKENIZER_CACHE.clear() cssproductions.PRODUCTIONS.insert(1, cssproductions._DXImageTransform) diff --git a/cssutils/stylesheets/medialist.py b/cssutils/stylesheets/medialist.py index 355e8338..6c14725b 100644 --- a/cssutils/stylesheets/medialist.py +++ b/cssutils/stylesheets/medialist.py @@ -7,11 +7,13 @@ __all__ = ['MediaList'] -from cssutils.prodparser import PreDef, Prod, ProdParser, Sequence +import xml.dom + +import cssutils from cssutils.helper import normalize, pushtoken +from cssutils.prodparser import PreDef, Prod, ProdParser, Sequence + from .mediaquery import MediaQuery -import cssutils -import xml.dom # class MediaList(cssutils.util.Base, cssutils.util.ListSeq): diff --git a/cssutils/stylesheets/mediaquery.py b/cssutils/stylesheets/mediaquery.py index 8ccb231a..2362bb60 100644 --- a/cssutils/stylesheets/mediaquery.py +++ b/cssutils/stylesheets/mediaquery.py @@ -6,11 +6,12 @@ __all__ = ['MediaQuery'] -from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence -from cssutils.helper import normalize -import cssutils import xml.dom +import cssutils +from cssutils.helper import normalize +from cssutils.prodparser import Choice, PreDef, Prod, ProdParser, Sequence + class MediaQuery(cssutils.util._NewBase): # cssutils.util.Base): """ diff --git a/cssutils/tests/basetest.py b/cssutils/tests/basetest.py index 48a10d86..05692fd0 100644 --- a/cssutils/tests/basetest.py +++ b/cssutils/tests/basetest.py @@ -1,6 +1,7 @@ """Base class for all tests""" import sys + import pytest if sys.version_info >= (3, 9): diff --git a/cssutils/tests/test_csscharsetrule.py b/cssutils/tests/test_csscharsetrule.py index 234f6ce0..ec726ec8 100644 --- a/cssutils/tests/test_csscharsetrule.py +++ b/cssutils/tests/test_csscharsetrule.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.CSSCharsetRule""" import xml.dom -from . import test_cssrule -import cssutils.css + import pytest +import cssutils.css + +from . import test_cssrule + class TestCSSCharsetRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_csscomment.py b/cssutils/tests/test_csscomment.py index 7e7e4d9f..6cd61560 100644 --- a/cssutils/tests/test_csscomment.py +++ b/cssutils/tests/test_csscomment.py @@ -1,9 +1,11 @@ """Testcases for cssutils.css.CSSComment""" import xml -from . import test_cssrule + import cssutils.css +from . import test_cssrule + class TestCSSComment(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_cssimportrule.py b/cssutils/tests/test_cssimportrule.py index 61c533de..b5b99c92 100644 --- a/cssutils/tests/test_cssimportrule.py +++ b/cssutils/tests/test_cssimportrule.py @@ -6,6 +6,7 @@ import pytest import cssutils + from . import test_cssrule diff --git a/cssutils/tests/test_cssnamespacerule.py b/cssutils/tests/test_cssnamespacerule.py index 6f56b9be..728e659e 100644 --- a/cssutils/tests/test_cssnamespacerule.py +++ b/cssutils/tests/test_cssnamespacerule.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.CSSImportRule""" import xml.dom -from . import test_cssrule -import cssutils + import pytest +import cssutils + +from . import test_cssrule + class TestCSSNamespaceRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_csspagerule.py b/cssutils/tests/test_csspagerule.py index 03bba1ff..98bf1f81 100644 --- a/cssutils/tests/test_csspagerule.py +++ b/cssutils/tests/test_csspagerule.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.CSSPageRule""" import xml.dom -from . import test_cssrule -import cssutils + import pytest +import cssutils + +from . import test_cssrule + class TestCSSPageRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_cssproperties.py b/cssutils/tests/test_cssproperties.py index a108abd8..9bb6dfe4 100644 --- a/cssutils/tests/test_cssproperties.py +++ b/cssutils/tests/test_cssproperties.py @@ -1,8 +1,9 @@ """Testcases for cssutils.css.cssproperties.""" +import pytest + import cssutils.css import cssutils.profiles -import pytest class TestCSSProperties: diff --git a/cssutils/tests/test_cssrule.py b/cssutils/tests/test_cssrule.py index fae73021..a7eab72b 100644 --- a/cssutils/tests/test_cssrule.py +++ b/cssutils/tests/test_cssrule.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.CSSRule""" import xml.dom -from . import basetest -import cssutils.css + import pytest +import cssutils.css + +from . import basetest + class TestCSSRule(basetest.BaseTestCase): """ diff --git a/cssutils/tests/test_cssrulelist.py b/cssutils/tests/test_cssrulelist.py index e428cc04..fec6737c 100644 --- a/cssutils/tests/test_cssrulelist.py +++ b/cssutils/tests/test_cssrulelist.py @@ -1,8 +1,9 @@ """Testcases for cssutils.css.CSSRuleList""" -import cssutils import pytest +import cssutils + class TestCSSRuleList: def test_init(self): diff --git a/cssutils/tests/test_cssstyledeclaration.py b/cssutils/tests/test_cssstyledeclaration.py index 4afeb652..4860f4f6 100644 --- a/cssutils/tests/test_cssstyledeclaration.py +++ b/cssutils/tests/test_cssstyledeclaration.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.cssstyledelaration.CSSStyleDeclaration.""" import xml.dom -from . import basetest -import cssutils + import pytest +import cssutils + +from . import basetest + class TestCSSStyleDeclaration(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_cssstylerule.py b/cssutils/tests/test_cssstylerule.py index 5b24d3e0..8e8298b8 100644 --- a/cssutils/tests/test_cssstylerule.py +++ b/cssutils/tests/test_cssstylerule.py @@ -1,10 +1,13 @@ """Test cases for cssutils.css.CSSStyleRule""" import xml.dom -from . import test_cssrule -import cssutils + import pytest +import cssutils + +from . import test_cssrule + class TestCSSStyleRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_cssstylesheet.py b/cssutils/tests/test_cssstylesheet.py index f5d052c8..0f33992f 100644 --- a/cssutils/tests/test_cssstylesheet.py +++ b/cssutils/tests/test_cssstylesheet.py @@ -1,10 +1,13 @@ """Tests for css.CSSStyleSheet""" import xml.dom -from . import basetest -import cssutils.css + import pytest +import cssutils.css + +from . import basetest + class TestCSSStyleSheet(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_cssunknownrule.py b/cssutils/tests/test_cssunknownrule.py index c0932ffd..8ecca842 100644 --- a/cssutils/tests/test_cssunknownrule.py +++ b/cssutils/tests/test_cssunknownrule.py @@ -1,9 +1,11 @@ """testcases for cssutils.css.CSSUnkownRule""" import xml.dom -from . import test_cssrule + import cssutils +from . import test_cssrule + class TestCSSUnknownRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_cssutils.py b/cssutils/tests/test_cssutils.py index 2f8dcc05..918683f5 100644 --- a/cssutils/tests/test_cssutils.py +++ b/cssutils/tests/test_cssutils.py @@ -1,8 +1,6 @@ """Testcases for cssutils.css.CSSCharsetRule""" -from . import basetest import codecs -import cssutils import os import sys import tempfile @@ -10,6 +8,10 @@ import pytest +import cssutils + +from . import basetest + @pytest.fixture def serializer(monkeypatch): diff --git a/cssutils/tests/test_cssvalue.py b/cssutils/tests/test_cssvalue.py index 64d706bb..5dbb0c5a 100644 --- a/cssutils/tests/test_cssvalue.py +++ b/cssutils/tests/test_cssvalue.py @@ -1,11 +1,12 @@ """Testcases for cssutils.css.CSSValue and CSSPrimitiveValue.""" import xml.dom -from . import basetest -import cssutils import pytest +import cssutils + +from . import basetest pytestmark = pytest.mark.xfail(reason="incomplete") diff --git a/cssutils/tests/test_cssvariablesdeclaration.py b/cssutils/tests/test_cssvariablesdeclaration.py index 81ff32ef..826f25c1 100644 --- a/cssutils/tests/test_cssvariablesdeclaration.py +++ b/cssutils/tests/test_cssvariablesdeclaration.py @@ -2,9 +2,10 @@ import xml.dom -from . import basetest import cssutils +from . import basetest + class TestCSSVariablesDeclaration(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_cssvariablesrule.py b/cssutils/tests/test_cssvariablesrule.py index 733284a0..2d124ed5 100644 --- a/cssutils/tests/test_cssvariablesrule.py +++ b/cssutils/tests/test_cssvariablesrule.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.CSSPageRule""" import xml.dom -from . import test_cssrule -import cssutils + import pytest +import cssutils + +from . import test_cssrule + class TestCSSVariablesRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_domimplementation.py b/cssutils/tests/test_domimplementation.py index 33cff967..ad11c4c5 100644 --- a/cssutils/tests/test_domimplementation.py +++ b/cssutils/tests/test_domimplementation.py @@ -1,8 +1,8 @@ """Testcases for cssutils.css.DOMImplementation""" +import warnings import xml.dom import xml.dom.minidom -import warnings import pytest diff --git a/cssutils/tests/test_errorhandler.py b/cssutils/tests/test_errorhandler.py index 4765de61..1791de9f 100644 --- a/cssutils/tests/test_errorhandler.py +++ b/cssutils/tests/test_errorhandler.py @@ -1,7 +1,7 @@ """Tests for parsing which does not raise Exceptions normally""" -import logging import io +import logging import sys import xml.dom diff --git a/cssutils/tests/test_marginrule.py b/cssutils/tests/test_marginrule.py index 20eaaca3..270629a1 100644 --- a/cssutils/tests/test_marginrule.py +++ b/cssutils/tests/test_marginrule.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.CSSPageRule""" import xml.dom -from . import test_cssrule -import cssutils + import pytest +import cssutils + +from . import test_cssrule + class TestMarginRule(test_cssrule.TestCSSRule): def _setup_rule(self): diff --git a/cssutils/tests/test_medialist.py b/cssutils/tests/test_medialist.py index d0e7a1a1..25b100e2 100644 --- a/cssutils/tests/test_medialist.py +++ b/cssutils/tests/test_medialist.py @@ -5,9 +5,10 @@ import pytest -from . import basetest import cssutils.stylesheets +from . import basetest + class TestMediaList(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_mediaquery.py b/cssutils/tests/test_mediaquery.py index 929542f5..70efa113 100644 --- a/cssutils/tests/test_mediaquery.py +++ b/cssutils/tests/test_mediaquery.py @@ -1,10 +1,13 @@ """Testcases for cssutils.stylesheets.MediaQuery""" import xml.dom -from . import basetest -import cssutils.stylesheets + import pytest +import cssutils.stylesheets + +from . import basetest + class TestMediaQuery(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_parse.py b/cssutils/tests/test_parse.py index e3d5e73f..bc2d7c78 100644 --- a/cssutils/tests/test_parse.py +++ b/cssutils/tests/test_parse.py @@ -1,11 +1,13 @@ """Tests for parsing which does not raise Exceptions normally""" -import xml.dom -import cssutils import urllib.error +import xml.dom from unittest import mock + import pytest +import cssutils + class TestCSSParser: def _make_fetcher(self, encoding, content): diff --git a/cssutils/tests/test_prodparser.py b/cssutils/tests/test_prodparser.py index 17a1d604..d3dff8d1 100644 --- a/cssutils/tests/test_prodparser.py +++ b/cssutils/tests/test_prodparser.py @@ -1,18 +1,20 @@ """Testcases for cssutils.css.CSSCharsetRule""" -import sys import re +import sys import xml.dom + +import pytest + from cssutils.prodparser import ( - Prod, - Sequence, Choice, - PreDef, - ParseError, Exhausted, + ParseError, + PreDef, + Prod, ProdParser, + Sequence, ) -import pytest class TestProd: diff --git a/cssutils/tests/test_properties.py b/cssutils/tests/test_properties.py index 83026c65..caf6118b 100644 --- a/cssutils/tests/test_properties.py +++ b/cssutils/tests/test_properties.py @@ -1,6 +1,7 @@ """Testcases for cssutils.css.property._Property.""" import copy + import cssutils from cssutils.css.property import Property diff --git a/cssutils/tests/test_property.py b/cssutils/tests/test_property.py index 50dbb2b5..21856940 100644 --- a/cssutils/tests/test_property.py +++ b/cssutils/tests/test_property.py @@ -6,9 +6,10 @@ import pytest from jaraco.test import property_error -from . import basetest import cssutils +from . import basetest + class TestProperty(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_scripts_csscombine.py b/cssutils/tests/test_scripts_csscombine.py index f347cbd9..9e975620 100644 --- a/cssutils/tests/test_scripts_csscombine.py +++ b/cssutils/tests/test_scripts_csscombine.py @@ -1,8 +1,9 @@ """Testcases for cssutils.scripts.csscombine""" +import cssutils from cssutils.script import csscombine + from . import basetest -import cssutils class TestCSSCombine: diff --git a/cssutils/tests/test_selector.py b/cssutils/tests/test_selector.py index fd2a1d51..a37ceefa 100644 --- a/cssutils/tests/test_selector.py +++ b/cssutils/tests/test_selector.py @@ -12,9 +12,10 @@ import pytest from jaraco.test import property_error -from . import basetest import cssutils +from . import basetest + class TestSelector(basetest.BaseTestCase): def setup_method(self): diff --git a/cssutils/tests/test_selectorlist.py b/cssutils/tests/test_selectorlist.py index 67afbc7b..b9f5ca1a 100644 --- a/cssutils/tests/test_selectorlist.py +++ b/cssutils/tests/test_selectorlist.py @@ -1,10 +1,13 @@ """Testcases for cssutils.css.selectorlist.SelectorList.""" import xml.dom -from . import basetest + +import pytest + import cssutils from cssutils.css.selectorlist import SelectorList -import pytest + +from . import basetest class TestSelectorList(basetest.BaseTestCase): diff --git a/cssutils/tests/test_serialize.py b/cssutils/tests/test_serialize.py index adb875d6..92549023 100644 --- a/cssutils/tests/test_serialize.py +++ b/cssutils/tests/test_serialize.py @@ -1,8 +1,9 @@ """Testcases for cssutils.CSSSerializer""" -from . import basetest import cssutils +from . import basetest + class TestPreferences(basetest.BaseTestCase): """ diff --git a/cssutils/tests/test_util.py b/cssutils/tests/test_util.py index 0a877bea..2b487cb8 100644 --- a/cssutils/tests/test_util.py +++ b/cssutils/tests/test_util.py @@ -1,15 +1,16 @@ """Testcases for cssutils.util""" -from email.message import Message import re -import urllib.request import urllib.error import urllib.parse +import urllib.request +from email.message import Message from unittest import mock -from cssutils.util import Base, ListSeq, _readUrl, _defaultFetcher, LazyRegex import pytest +from cssutils.util import Base, LazyRegex, ListSeq, _defaultFetcher, _readUrl + class TestListSeq: def test_all(self): diff --git a/cssutils/tests/test_value.py b/cssutils/tests/test_value.py index 6dcc4cab..6cd0c999 100644 --- a/cssutils/tests/test_value.py +++ b/cssutils/tests/test_value.py @@ -1,10 +1,12 @@ """Testcases for cssutils.css.CSSValue and CSSPrimitiveValue.""" -import xml.dom -import cssutils import types +import xml.dom + import pytest +import cssutils + from . import basetest diff --git a/cssutils/tokenize2.py b/cssutils/tokenize2.py index 86477e36..115dfc19 100644 --- a/cssutils/tokenize2.py +++ b/cssutils/tokenize2.py @@ -6,7 +6,7 @@ import re import sys -from .cssproductions import CSSProductions, MACROS, PRODUCTIONS +from .cssproductions import MACROS, PRODUCTIONS, CSSProductions from .helper import normalize _TOKENIZER_CACHE = {} diff --git a/cssutils/util.py b/cssutils/util.py index fbbd2998..66c43e45 100644 --- a/cssutils/util.py +++ b/cssutils/util.py @@ -2,15 +2,15 @@ __all__ = [] -from .helper import normalize -from itertools import chain -import cssutils -from . import codec import codecs -from . import errorhandler -from . import tokenize2 -import xml.dom import re +import xml.dom +from itertools import chain + +import cssutils + +from . import codec, errorhandler, tokenize2 +from .helper import normalize try: from ._fetchgae import _defaultFetcher diff --git a/encutils/__init__.py b/encutils/__init__.py index 77226c7a..9a4ddc07 100644 --- a/encutils/__init__.py +++ b/encutils/__init__.py @@ -51,14 +51,14 @@ 'EncodingInfo', ] -from email.message import Message import html.parser import io import re import sys -import urllib.request -import urllib.parse import urllib.error +import urllib.parse +import urllib.request +from email.message import Message class _MetaHTMLParser(html.parser.HTMLParser): diff --git a/examples/build.py b/examples/build.py index 0f869784..4457f3d8 100644 --- a/examples/build.py +++ b/examples/build.py @@ -2,7 +2,6 @@ import cssutils - cssutils.log.setLevel(logging.FATAL) diff --git a/examples/codec.py b/examples/codec.py index 92dfc6ed..22ec0aff 100644 --- a/examples/codec.py +++ b/examples/codec.py @@ -3,7 +3,6 @@ import cssutils - __here__ = pathlib.Path(__file__).parent diff --git a/examples/customlog.py b/examples/customlog.py index 5855d239..ab8033e0 100644 --- a/examples/customlog.py +++ b/examples/customlog.py @@ -1,9 +1,8 @@ -import logging import io +import logging import cssutils - EXPOUT = "" EXPERR = """Property: Unknown Property name. [1:5: x] HTTPError opening url=http://cthedot.de/x: 404 Not Found diff --git a/examples/imports.py b/examples/imports.py index 7b95b6fc..e8b8ff5a 100644 --- a/examples/imports.py +++ b/examples/imports.py @@ -1,6 +1,7 @@ -import cssutils import os.path +import cssutils + EXPOUT = '''@charset "iso-8859-1"; @import "1inherit-iso.css"; diff --git a/examples/parse.py b/examples/parse.py index 9879c89e..babc056f 100644 --- a/examples/parse.py +++ b/examples/parse.py @@ -1,6 +1,7 @@ -import cssutils import xml.dom +import cssutils + EXPOUT = '''\n--- source CSS ---\n/* This is a comment */\n body {\n background: white;\n top: red;\n x: 1;\n }\n a { y }\n \n\n--- simple parsing ---\n/* This is a comment */\nbody {\n background: white;\n top: red;\n x: 1\n }\n\n--- CSSParser(raiseExceptions=True) ---\n:::RAISED::: Property: No ":" after name found: y [7:10: ]\n''' EXPERR = 'Property: Invalid value for "CSS Level 2.1" property: red [4:9: top]\nProperty: Unknown Property name. [5:9: x]\nProperty: No ":" after name found: y [7:10: ]\nProperty: No property value found: y [7:10: ]\nCSSStyleDeclaration: Syntax Error in Property: y \nProperty: Invalid value for "CSS Level 2.1" property: red [4:9: top]\nProperty: Unknown Property name. [5:9: x]\n' diff --git a/examples/serialize.py b/examples/serialize.py index a7fb35f5..2531cca1 100644 --- a/examples/serialize.py +++ b/examples/serialize.py @@ -1,6 +1,7 @@ -import cssutils import logging +import cssutils + cssutils.log.setLevel(logging.FATAL) diff --git a/examples/style.py b/examples/style.py index 7e79b191..74163232 100644 --- a/examples/style.py +++ b/examples/style.py @@ -8,10 +8,11 @@ """ import codecs -import cssutils import sys import webbrowser +import cssutils + try: from lxml import etree from lxml.cssselect import CSSSelector diff --git a/examples/testutil.py b/examples/testutil.py index fa567baf..89f44c35 100644 --- a/examples/testutil.py +++ b/examples/testutil.py @@ -9,9 +9,9 @@ __all__ = ['TestUtil'] +import io import logging import os -import io import sys import cssutils diff --git a/tools/try.py b/tools/try.py index aa2800eb..27c47c6f 100644 --- a/tools/try.py +++ b/tools/try.py @@ -1,14 +1,15 @@ -import cssutils import logging import os import sys import timeit -import urllib.request import urllib.error import urllib.parse +import urllib.request import xml import xml.dom +import cssutils + sys.stdout.write(sys.version) print()