Ran ruff upgrade fixers.

cssutils/_fetch.py

@@ -18,7 +18,7 @@
 log = errorhandler.ErrorHandler()
 
 
-@functools.lru_cache()
+@functools.lru_cache
 def _get_version():
     try:
         return metadata.version('cssutils')

cssutils/css/csscharsetrule.py

@@ -60,16 +60,10 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(encoding={!r})".format(
-            self.__class__.__name__, self.encoding
-        )
+        return f"cssutils.css.{self.__class__.__name__}(encoding={self.encoding!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object encoding={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.encoding,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object encoding={self.encoding!r} at 0x{id(self):x}>"
 
     def _getCssText(self):
         """The parsable textual representation."""

cssutils/css/csscomment.py

@@ -34,16 +34,10 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(cssText={!r})".format(
-            self.__class__.__name__, self.cssText
-        )
+        return f"cssutils.css.{self.__class__.__name__}(cssText={self.cssText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object cssText={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.cssText,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object cssText={self.cssText!r} at 0x{id(self):x}>"
 
     def _getCssText(self):
         """Return serialized property cssText."""

cssutils/css/cssfontfacerule.py

@@ -54,18 +54,10 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(style={!r})".format(
-            self.__class__.__name__,
-            self.style.cssText,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(style={self.style.cssText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object style={!r} valid={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.style.cssText,
-            self.valid,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object style={self.style.cssText!r} valid={self.valid!r} at 0x{id(self):x}>"
 
     def _getCssText(self):
         """Return serialized property cssText."""

cssutils/css/cssimportrule.py

@@ -77,25 +77,14 @@ def __repr__(self):
             mediaText = self.media.mediaText
         else:
             mediaText = None
-        return "cssutils.css.{}(href={!r}, mediaText={!r}, name={!r})".format(
-            self.__class__.__name__,
-            self.href,
-            mediaText,
-            self.name,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(href={self.href!r}, mediaText={mediaText!r}, name={self.name!r})"
 
     def __str__(self):
         if self._usemedia:
             mediaText = self.media.mediaText
         else:
             mediaText = None
-        return "<cssutils.css.{} object href={!r} mediaText={!r} name={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.href,
-            mediaText,
-            self.name,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object href={self.href!r} mediaText={mediaText!r} name={self.name!r} at 0x{id(self):x}>"
 
     _usemedia = property(
         lambda self: self.media.mediaText not in ('', 'all'),

cssutils/css/cssmediarule.py

@@ -49,17 +49,10 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(mediaText={!r})".format(
-            self.__class__.__name__,
-            self.media.mediaText,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(mediaText={self.media.mediaText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object mediaText={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.media.mediaText,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object mediaText={self.media.mediaText!r} at 0x{id(self):x}>"
 
     def _getCssText(self):
         """Return serialized property cssText."""

cssutils/css/cssnamespacerule.py

@@ -91,20 +91,11 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(namespaceURI={!r}, prefix={!r})".format(
-            self.__class__.__name__,
-            self.namespaceURI,
-            self.prefix,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(namespaceURI={self.namespaceURI!r}, prefix={self.prefix!r})"
 
     def __str__(self):
         return (
-            "<cssutils.css.{} object namespaceURI={!r} prefix={!r} at 0x{:x}>".format(
-                self.__class__.__name__,
-                self.namespaceURI,
-                self.prefix,
-                id(self),
-            )
+            f"<cssutils.css.{self.__class__.__name__} object namespaceURI={self.namespaceURI!r} prefix={self.prefix!r} at 0x{id(self):x}>"
         )
 
     def _getCssText(self):

cssutils/css/csspagerule.py

@@ -95,11 +95,7 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(selectorText={!r}, style={!r})".format(
-            self.__class__.__name__,
-            self.selectorText,
-            self.style.cssText,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(selectorText={self.selectorText!r}, style={self.style.cssText!r})"
 
     def __str__(self):
         return (

cssutils/css/cssrule.py

@@ -80,9 +80,7 @@ def _setAtkeyword(self, keyword):
             self._keyword = keyword
         else:
             self._log.error(
-                '{}: Invalid atkeyword for this rule: {!r}'.format(
-                    self.atkeyword, keyword
-                ),
+                f'{self.atkeyword}: Invalid atkeyword for this rule: {keyword!r}',
                 error=xml.dom.InvalidModificationErr,
             )
 

cssutils/css/cssstyledeclaration.py

@@ -209,12 +209,7 @@ def __repr__(self):
         )
 
     def __str__(self):
-        return "<cssutils.css.{} object length={!r} (all: {!r}) at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.length,
-            len(self.getProperties(all=True)),
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object length={self.length!r} (all: {len(self.getProperties(all=True))!r}) at 0x{id(self):x}>"
 
     def __nnames(self):
         """Return iterator for all different names in order as set

cssutils/css/cssstylerule.py

@@ -58,11 +58,7 @@ def __repr__(self):
             st = (self.selectorText, self._namespaces)
         else:
             st = self.selectorText
-        return "cssutils.css.{}(selectorText={!r}, style={!r})".format(
-            self.__class__.__name__,
-            st,
-            self.style.cssText,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(selectorText={st!r}, style={self.style.cssText!r})"
 
     def __str__(self):
         return (

cssutils/css/cssstylesheet.py

@@ -80,12 +80,7 @@ def __repr__(self):
             mediaText = self.media.mediaText
         else:
             mediaText = None
-        return "cssutils.css.{}(href={!r}, media={!r}, title={!r})".format(
-            self.__class__.__name__,
-            self.href,
-            mediaText,
-            self.title,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(href={self.href!r}, media={mediaText!r}, title={self.title!r})"
 
     def __str__(self):
         if self.media:

cssutils/css/cssunknownrule.py

@@ -34,16 +34,10 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(cssText={!r})".format(
-            self.__class__.__name__, self.cssText
-        )
+        return f"cssutils.css.{self.__class__.__name__}(cssText={self.cssText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object cssText={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.cssText,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object cssText={self.cssText!r} at 0x{id(self):x}>"
 
     def _getCssText(self):
         """Return serialized property cssText."""

cssutils/css/cssvalue.py

@@ -561,12 +561,7 @@ def __init__(self, cssText=None, parent=None, readonly=False):
 
     def __str__(self):
         return (
-            "<cssutils.css.{} object primitiveType={} cssText={!r} at 0x{:x}>".format(
-                self.__class__.__name__,
-                self.primitiveTypeString,
-                self.cssText,
-                id(self),
-            )
+            f"<cssutils.css.{self.__class__.__name__} object primitiveType={self.primitiveTypeString} cssText={self.cssText!r} at 0x{id(self):x}>"
         )
 
     _unitnames = [
@@ -1137,12 +1132,7 @@ def __repr__(self):
         return f"cssutils.css.{self.__class__.__name__}({self.cssText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object colorType={!r} cssText={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.colorType,
-            self.cssText,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object colorType={self.colorType!r} cssText={self.cssText!r} at 0x{id(self):x}>"
 
     def _setCssText(self, cssText):
         self._checkReadonly()
@@ -1318,12 +1308,7 @@ def __repr__(self):
         return f"cssutils.css.{self.__class__.__name__}({self.cssText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object name={!r} value={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.name,
-            self.value,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object name={self.name!r} value={self.value!r} at 0x{id(self):x}>"
 
     def _setCssText(self, cssText):
         self._checkReadonly()

cssutils/css/cssvariablesdeclaration.py

@@ -51,16 +51,10 @@ def __init__(self, cssText='', parentRule=None, readonly=False):
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(cssText={!r})".format(
-            self.__class__.__name__, self.cssText
-        )
+        return f"cssutils.css.{self.__class__.__name__}(cssText={self.cssText!r})"
 
     def __str__(self):
-        return "<cssutils.css.{} object length={!r} at 0x{:x}>".format(
-            self.__class__.__name__,
-            self.length,
-            id(self),
-        )
+        return f"<cssutils.css.{self.__class__.__name__} object length={self.length!r} at 0x{id(self):x}>"
 
     def __contains__(self, variableName):
         """Check if a variable is in variable declaration block.

cssutils/css/cssvariablesrule.py

@@ -69,11 +69,7 @@ def __init__(
         self._readonly = readonly
 
     def __repr__(self):
-        return "cssutils.css.{}(mediaText={!r}, variables={!r})".format(
-            self.__class__.__name__,
-            self._media.mediaText,
-            self.variables.cssText,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(mediaText={self._media.mediaText!r}, variables={self.variables.cssText!r})"
 
     def __str__(self):
         return (

cssutils/css/marginrule.py

@@ -102,9 +102,7 @@ def _setMargin(self, margin):
 
         if n not in MarginRule.margins:
             self._log.error(
-                'Invalid margin @keyword for this {} rule: {!r}'.format(
-                    self.margin, margin
-                ),
+                f'Invalid margin @keyword for this {self.margin} rule: {margin!r}',
                 error=xml.dom.InvalidModificationErr,
             )
 
@@ -123,11 +121,7 @@ def _setMargin(self, margin):
     atkeyword = margin
 
     def __repr__(self):
-        return "cssutils.css.{}(margin={!r}, style={!r})".format(
-            self.__class__.__name__,
-            self.margin,
-            self.style.cssText,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(margin={self.margin!r}, style={self.style.cssText!r})"
 
     def __str__(self):
         return "<cssutils.css.%s object margin=%r style=%r " "at 0x%x>" % (

cssutils/css/property.py

@@ -81,23 +81,10 @@ def __init__(
             self.priority = priority
 
     def __repr__(self):
-        return "cssutils.css.{}(name={!r}, value={!r}, priority={!r})".format(
-            self.__class__.__name__,
-            self.literalname,
-            self.propertyValue.cssText,
-            self.priority,
-        )
+        return f"cssutils.css.{self.__class__.__name__}(name={self.literalname!r}, value={self.propertyValue.cssText!r}, priority={self.priority!r})"
 
     def __str__(self):
-        return "<{}.{} object name={!r} value={!r} priority={!r} valid={!r} at 0x{:x}>".format(
-            self.__class__.__module__,
-            self.__class__.__name__,
-            self.name,
-            self.propertyValue.cssText,
-            self.priority,
-            self.valid,
-            id(self),
-        )
+        return f"<{self.__class__.__module__}.{self.__class__.__name__} object name={self.name!r} value={self.propertyValue.cssText!r} priority={self.priority!r} valid={self.valid!r} at 0x{id(self):x}>"
 
     def _isValidating(self):
         """Return True if validation is enabled."""