Merge branch 'hg'

Author: jakub-horak

.hgtags

@@ -512,3 +512,4 @@ fa6fc60a9d8ab4981317c5be18e47b28868691e5 st201
 fa6fc60a9d8ab4981317c5be18e47b28868691e5 11.4.84.0.1.201.0
 4aa2fc1df7c1cf43786bcb1d7a75fea721f9864e st202
 d3a4e98be3b2016eecfd2fc31437d9b386a9b0c0 st203
+611b9daec17e8217a55d6418976b2c407604f26d st204

src/modules/cfgfiles.py

@@ -40,7 +40,7 @@
 # registers the id/name mappings.
 #
 # Following other platforms behaviour:
-#   https://en.wikipedia.org/wiki/User_identifier 
+#   https://en.wikipedia.org/wiki/User_identifier
 #
 # 100-499 will be used for actions where no uid/gid provided.
 MIN_DYNAMIC_ID = 100

src/modules/client/publisher.py

@@ -2119,7 +2119,7 @@ def __refresh(self, full_refresh, immediate, mismatched=False,
     def refresh(self, full_refresh=False, immediate=False, progtrack=None,
         include_updates=False):
         """Refreshes the publisher's metadata, returning a tuple
-        containing a boolean value indicating whether any updates to the 
+        containing a boolean value indicating whether any updates to the
         publisher's metadata occurred and an error object, which is
         either a CatalogOriginRefreshException containing all the failed
         origins for this publisher or None.

src/modules/misc.py

@@ -1296,7 +1296,7 @@ def validate_ssl_cert(ssl_cert, prefix=None, uri=None):
 def load_trust_anchors(trust_anchor_loc, trust_anchors, bad_trust_anchors=[]):
     """Load all trust anchors in given directory; each
     certificate file may have multiple trust certificates."""
-    ca_list = [] 
+    ca_list = []
 
     for fn in os.listdir(trust_anchor_loc):
         pth = os.path.join(trust_anchor_loc, fn)
@@ -1313,7 +1313,7 @@ def load_trust_anchors(trust_anchor_loc, trust_anchors, bad_trust_anchors=[]):
             for cert in raw.split(begin_cert)[1:]:
                 ca_list.append(x509.load_pem_x509_certificate(begin_cert+cert, \
                     default_backend()))
-        except (ValueError, IOError) as e: 
+        except (ValueError, IOError) as e:
             bad_trust_anchors.append((pth, str(e)))
         else:
             # We store certificates internally by

src/modules/portable/__init__.py

@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2008, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates.
 #
 
 # The portable module provide access to methods that require operating system-
@@ -86,17 +86,17 @@ def get_file_type(actions):
 def get_group_by_name(name, dirpath, use_file):
     """ Return the group ID for a group name.
     If use_file is true, an OS-specific file from within the file tree
-    rooted by dirpath will be consulted, if it exists. Otherwise, the 
+    rooted by dirpath will be consulted, if it exists. Otherwise, the
     group ID is retrieved from the operating system.
-    Exceptions:        
+    Exceptions:
         KeyError if the specified group does not exist"""
     raise NotImplementedError
 
 
 def get_user_by_name(name, dirpath, use_file):
     """ Return the user ID for a user name.
     If use_file is true, an OS-specific file from within the file tree
-    rooted by dirpath will be consulted, if it exists. Otherwise, the 
+    rooted by dirpath will be consulted, if it exists. Otherwise, the
     user ID is retrieved from the operating system.
     Exceptions:
         KeyError if the specified group does not exist"""
@@ -106,7 +106,7 @@ def get_user_by_name(name, dirpath, use_file):
 def get_name_by_gid(gid, dirpath, use_file):
     """ Return the group name for a group ID.
     If use_file is true, an OS-specific file from within the file tree
-    rooted by dirpath will be consulted, if it exists. Otherwise, the 
+    rooted by dirpath will be consulted, if it exists. Otherwise, the
     group name is retrieved from the operating system.
     Exceptions:
         KeyError if the specified group does not exist"""
@@ -116,7 +116,7 @@ def get_name_by_gid(gid, dirpath, use_file):
 def get_name_by_uid(uid, dirpath, use_file):
     """ Return the user name for a user ID.
     If use_file is true, an OS-specific file from within the file tree
-    rooted by dirpath will be consulted, if it exists. Otherwise, the 
+    rooted by dirpath will be consulted, if it exists. Otherwise, the
     user name is retrieved from the operating system.
     Exceptions:
         KeyError if the specified group does not exist"""
@@ -155,7 +155,7 @@ def chown(path, owner, group):
     """ Change ownership of a file in an OS-specific way.
     The owner and group ownership information should be applied to
     the given file, if applicable on the current runtime OS.
-    Exceptions:        
+    Exceptions:
         EnvironmentError (or subclass) if the path does not exist
         or ownership cannot be changed"""
     raise NotImplementedError
@@ -181,7 +181,7 @@ def link(src, dst):
 def remove(path):
     """ Remove the given file in an OS-specific way
     Exceptions:
-       OSError (or subclass) if the source path does not exist or 
+       OSError (or subclass) if the source path does not exist or
        the file cannot be removed"""
     raise NotImplementedError
 
@@ -199,7 +199,7 @@ def copyfile(src, dst):
 
 
 def split_path(path):
-    """ Splits a path and gives back the components of the path.  
+    """ Splits a path and gives back the components of the path.
     This is intended to hide platform-specific details about splitting
     a path into its components.  This interface is similar to
     os.path.split() except that the entire path is split, not just
@@ -212,7 +212,7 @@ def split_path(path):
 
 
 def get_root(path):
-    """ Returns the 'root' of the given path.  
+    """ Returns the 'root' of the given path.
     This should include any and all components of a path up to the first
     non-platform-specific component.  For example, on Windows,
     it should include the drive letter prefix.
@@ -226,7 +226,7 @@ def get_root(path):
 def assert_mode(path, mode):
     """ Checks that the file identified by path has the given mode to
     the extent possible by the host operating system.  Otherwise raises
-    an AssertionError where the mode attribute of the assertion is the 
+    an AssertionError where the mode attribute of the assertion is the
     mode of the file."""
     raise NotImplementedError
 

src/modules/portable/os_windows.py

@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2008, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates.
 #
 
 """
@@ -188,7 +188,7 @@ def get_trashdir(path):
 
 def move_to_trash(path):
     """
-    Move the file to a trash folder within its containing image. If the 
+    Move the file to a trash folder within its containing image. If the
     file is not in an image, just return without moving it. If the file
     cannot be removed, raise an OSError exception.
     """

src/modules/portable/util.py

@@ -20,15 +20,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2008, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates.
 #
 import os
 import platform
 import re
 
 
 def get_canonical_os_type():
-    """ 
+    """
     Return a standardized, lower case version of the "type" of OS family.
     """
     if os.name == 'posix':
@@ -45,7 +45,7 @@ def get_canonical_os_type():
 def get_canonical_os_name():
     """
     Return a standardized, lower case version of the name of the OS.  This is
-    useful to avoid the ambiguity of OS marketing names.  
+    useful to avoid the ambiguity of OS marketing names.
     """
 
     psl = platform.system().lower()
@@ -65,7 +65,7 @@ def get_os_release():
     """
     Return a standardized, sanitized version string, consisting of a
     dot-separated list of integers representing the release version of
-    this OS. 
+    this OS.
     """
 
     ostype = get_canonical_os_type()

src/sysrepo.py

@@ -205,7 +205,7 @@ def _get_image(image_dir):
 
 
 def _clean_publisher(uri):
-    """ Remove the HTTP_PORT from the uri otherwise the rewrite rules 
+    """ Remove the HTTP_PORT from the uri otherwise the rewrite rules
     (in the mako file) will incorporate it with the subsequent use of
     libcurl, adhering to RPF7230 section 5.4, removing it and thus break
     the matching on the rewrite rules leading to the default response of

src/tests/api/t_api.py

@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2008, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates.
 #
 
 from . import testutils
@@ -119,35 +119,35 @@ class TestPkgApi(pkg5unittest.SingleDepotTestCase):
 
     p5i_bobcat = """{
   "packages": [
-    "pkg:/[email protected],5.11-0", 
+    "pkg:/[email protected],5.11-0",
     "baz"
-  ], 
+  ],
   "publishers": [
     {
-      "alias": "cat", 
-      "name": "bobcat", 
+      "alias": "cat",
+      "name": "bobcat",
       "packages": [
         "pkg:/[email protected],5.11-0"
-      ], 
+      ],
       "repositories": [
         {
-          "collection_type": "core", 
-          "description": "xkcd.net/325", 
+          "collection_type": "core",
+          "description": "xkcd.net/325",
           "legal_uris": [
             "http://xkcd.com/license.html"
-          ], 
-          "mirrors": [], 
-          "name": "source", 
+          ],
+          "mirrors": [],
+          "name": "source",
           "origins": [
             "%REAL_ORIGIN%/"
-          ], 
-          "refresh_seconds": 43200, 
-          "registration_uri": "", 
+          ],
+          "refresh_seconds": 43200,
+          "registration_uri": "",
           "related_uris": []
         }
       ]
     }
-  ], 
+  ],
   "version": 1
 }
 """

src/tests/api/t_config.py

@@ -1177,7 +1177,7 @@ class TestConfig(_TestConfigBase):
 uri_default = http://example.com/
 urilist_basic =
 urilist_default = http://example.com/,file:/example/path
-uuid_basic = 
+uuid_basic =
 uuid_default = 16fd2706-8baf-433b-82eb-8c7fada847da
 """.format(uni_escape=TH_PACKAGE,
 uni_txt=TH_PACKAGE),
@@ -1267,7 +1267,7 @@ def test_base(self):
 bool_basic = False
 str_basic = 
 
-""", str(conf))
+""", str(conf))  # noqa
 
         conf.set_property("first_section", "str_basic", TH_PACKAGE)
         self.assertEqualDiff("""\
@@ -1286,7 +1286,7 @@ def test_base(self):
 bool_basic = False
 str_basic = 
 
-""", str(conf))
+""", str(conf))  # noqa
 
         conf.set_property("first_section", "str_basic", TH_PACKAGE)
         self.assertEqualDiff("""\