'Refactored by Sourcery'

glotaran · Sep 18, 2021 · c9c405b · c9c405b
1 parent 477e550
commit c9c405b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/glotaran/model/model.py b/glotaran/model/model.py
@@ -200,9 +200,7 @@ def _add_dataset_type(self):
         self._add_model_item("dataset", dataset_model_type)
 
     def as_dict(self) -> dict:
-        model_dict = {}
-        model_dict["default-megacomplex"] = self.default_megacomplex
-
+        model_dict = {'default-megacomplex': self.default_megacomplex}
         for name in self._model_items:
             items = getattr(self, name)
             if len(items) == 0:

diff --git a/glotaran/project/project.py b/glotaran/project/project.py
@@ -55,7 +55,6 @@ def __post_init__(self):
             self.folder = self.file.parent
         if isinstance(self.folder, str):
             self.folder = Path(self.folder)
-        pass
 
     @classmethod
     def create(cls, name: str | None = None, folder: str | Path | None = None) -> Project:
@@ -78,7 +77,7 @@ def create(cls, name: str | None = None, folder: str | Path | None = None) -> Pr
         if folder is None:
             folder = getcwd()
         project_folder = Path(folder)
-        name = name if name else project_folder.name
+        name = name or project_folder.name
         project_file = project_folder / PROJECT_FILE_NAME
         with open(project_file, "w") as f:
             f.write(TEMPLATE.format(gta_version=gta_version, name=name))
@@ -297,12 +296,13 @@ def generate_parameters(
             groups = parameter.split(".")
             label = groups.pop()
             if len(groups) == 0:
-                if isinstance(parameters, dict) and len(parameters) != 0:
-                    raise ModelError(
-                        "The root parameter group cannot contain both groups and parameters."
-                    )
-                elif isinstance(parameters, dict):
-                    parameters = []
+                if isinstance(parameters, dict):
+                    if len(parameters) != 0:
+                        raise ModelError(
+                            "The root parameter group cannot contain both groups and parameters."
+                        )
+                    else:
+                        parameters = []
                 parameters.append(
                     [
                         label,

diff --git a/glotaran/project/result.py b/glotaran/project/result.py
@@ -138,8 +138,7 @@ def get_scheme(self) -> Scheme:
             if "weight" in dataset:
                 data[label]["weight"] = dataset.weight
 
-        new_scheme = replace(self.scheme, parameters=self.optimized_parameters)
-        return new_scheme
+        return replace(self.scheme, parameters=self.optimized_parameters)
 
     def markdown(self, with_model: bool = True, base_heading_level: int = 1) -> MarkdownStr:
         """Format the model as a markdown text.