fix some pycharm warnings

This commit is contained in:
Evgenii Alekseev 2023-04-17 02:06:21 +03:00
parent e42ca95789
commit 31f47b8069
8 changed files with 15 additions and 14 deletions

View File

@ -55,7 +55,7 @@ class Shell(Handler):
# licensed by https://creativecommons.org/licenses/by-sa/3.0 # licensed by https://creativecommons.org/licenses/by-sa/3.0
path = Path(sys.prefix) / "share" / "ahriman" / "templates" / "shell" path = Path(sys.prefix) / "share" / "ahriman" / "templates" / "shell"
StringPrinter(path.read_text(encoding="utf8")).print(verbose=False) StringPrinter(path.read_text(encoding="utf8")).print(verbose=False)
# we only want to pass application isntance inside # we only want to pass application instance inside
if args.code is None: if args.code is None:
code.interact(local={"application": application}) code.interact(local={"application": application})
else: else:

View File

@ -27,6 +27,7 @@ from ahriman.core.sign.gpg import GPG
from ahriman.core.status.client import Client from ahriman.core.status.client import Client
from ahriman.core.triggers import TriggerLoader from ahriman.core.triggers import TriggerLoader
from ahriman.core.util import check_user from ahriman.core.util import check_user
from ahriman.models.repository_paths import RepositoryPaths
class RepositoryProperties(LazyLogging): class RepositoryProperties(LazyLogging):
@ -68,7 +69,7 @@ class RepositoryProperties(LazyLogging):
self.name = configuration.get("repository", "name") self.name = configuration.get("repository", "name")
self.vcs_allowed_age = configuration.getint("build", "vcs_allowed_age", fallback=0) self.vcs_allowed_age = configuration.getint("build", "vcs_allowed_age", fallback=0)
self.paths = configuration.repository_paths self.paths: RepositoryPaths = configuration.repository_paths # additional workaround for pycharm typing
try: try:
check_user(self.paths, unsafe=unsafe) check_user(self.paths, unsafe=unsafe)
self.paths.tree_create() self.paths.tree_create()

View File

@ -20,10 +20,10 @@
from __future__ import annotations from __future__ import annotations
import contextlib import contextlib
import importlib
import os import os
from collections.abc import Generator from collections.abc import Generator
from importlib import import_module, machinery
from pathlib import Path from pathlib import Path
from types import ModuleType from types import ModuleType
@ -128,7 +128,7 @@ class TriggerLoader(LazyLogging):
self.logger.info("load module %s from path %s", implementation, module_path) self.logger.info("load module %s from path %s", implementation, module_path)
# basically this method is called only if ``module_path`` exists and is file. # basically this method is called only if ``module_path`` exists and is file.
# Thus, this method should never throw ``FileNotFoundError`` exception # Thus, this method should never throw ``FileNotFoundError`` exception
loader = importlib.machinery.SourceFileLoader(implementation, module_path) loader = machinery.SourceFileLoader(implementation, module_path)
module = ModuleType(loader.name) module = ModuleType(loader.name)
loader.exec_module(module) loader.exec_module(module)
@ -149,7 +149,7 @@ class TriggerLoader(LazyLogging):
""" """
self.logger.info("load module from package %s", package) self.logger.info("load module from package %s", package)
try: try:
return importlib.import_module(package) return import_module(package)
except ModuleNotFoundError: except ModuleNotFoundError:
raise ExtensionError(f"Module {package} not found") raise ExtensionError(f"Module {package} not found")

View File

@ -33,14 +33,14 @@ class InternalStatusSchema(Schema):
"description": "Repository architecture", "description": "Repository architecture",
"example": "x86_64", "example": "x86_64",
}) })
packages = fields.Nested(CountersSchema, required=True, metadata={ packages = fields.Nested(CountersSchema(), required=True, metadata={
"description": "Repository package counters", "description": "Repository package counters",
}) })
repository = fields.String(required=True, metadata={ repository = fields.String(required=True, metadata={
"description": "Repository name", "description": "Repository name",
"example": "repo-clone", "example": "repo-clone",
}) })
status = fields.Nested(StatusSchema, required=True, metadata={ status = fields.Nested(StatusSchema(), required=True, metadata={
"description": "Repository status as stored by web service", "description": "Repository status as stored by web service",
}) })
version = fields.String(required=True, metadata={ version = fields.String(required=True, metadata={

View File

@ -31,7 +31,7 @@ class LogsSchema(Schema):
"description": "Package base name", "description": "Package base name",
"example": "ahriman", "example": "ahriman",
}) })
status = fields.Nested(StatusSchema, required=True, metadata={ status = fields.Nested(StatusSchema(), required=True, metadata={
"description": "Last package status", "description": "Last package status",
}) })
logs = fields.String(required=True, metadata={ logs = fields.String(required=True, metadata={

View File

@ -37,10 +37,10 @@ class PackageSchema(Schema):
"description": "Package version", "description": "Package version",
"example": version.__version__, "example": version.__version__,
}) })
remote = fields.Nested(RemoteSchema, required=True, metadata={ remote = fields.Nested(RemoteSchema(), required=True, metadata={
"description": "Package remote properties", "description": "Package remote properties",
}) })
packages = fields.Dict( packages = fields.Dict(
keys=fields.String(), values=fields.Nested(PackagePropertiesSchema), required=True, metadata={ keys=fields.String(), values=fields.Nested(PackagePropertiesSchema()), required=True, metadata={
"description": "Packages which belong to this base", "description": "Packages which belong to this base",
}) })

View File

@ -29,7 +29,7 @@ class PackageStatusSimplifiedSchema(Schema):
special request package status schema special request package status schema
""" """
package = fields.Nested(PackageSchema, metadata={ package = fields.Nested(PackageSchema(), metadata={
"description": "Package description", "description": "Package description",
}) })
status = fields.Enum(BuildStatusEnum, by_value=True, required=True, metadata={ status = fields.Enum(BuildStatusEnum, by_value=True, required=True, metadata={
@ -42,9 +42,9 @@ class PackageStatusSchema(Schema):
response package status schema response package status schema
""" """
package = fields.Nested(PackageSchema, required=True, metadata={ package = fields.Nested(PackageSchema(), required=True, metadata={
"description": "Package description", "description": "Package description",
}) })
status = fields.Nested(StatusSchema, required=True, metadata={ status = fields.Nested(StatusSchema(), required=True, metadata={
"description": "Last package status", "description": "Last package status",
}) })

View File

@ -52,7 +52,7 @@ def test_load_trigger_class_package_invalid_import(trigger_loader: TriggerLoader
""" """
must raise InvalidExtension on invalid import must raise InvalidExtension on invalid import
""" """
mocker.patch("ahriman.core.triggers.trigger_loader.importlib.import_module", side_effect=ModuleNotFoundError()) mocker.patch("importlib.import_module", side_effect=ModuleNotFoundError())
with pytest.raises(ExtensionError): with pytest.raises(ExtensionError):
trigger_loader.load_trigger_class("random.module") trigger_loader.load_trigger_class("random.module")