diff --git a/generate/container.py b/generate/container.py index 9cc2eda..df6d21d 100644 --- a/generate/container.py +++ b/generate/container.py @@ -17,7 +17,7 @@ class ConfigError(Exception): def __init__(self, message: str = "") -> None: """Create Exception object.""" self.message = message - self.super.__init__(message) + super().__init__(message) def __str__(self) -> str: """Convert Exception object to a string.""" @@ -57,7 +57,7 @@ def trim(s: str) -> str: """Remove sequential whitespace.""" s = s.replace("\t ", "\t") s = s.replace("\t\\\n", " ") - while s.__contains__(" "): + while " " in s: s = s.replace(" ", " ") return s @@ -236,10 +236,15 @@ class Ports: def command(self) -> str: """Option for podman container create.""" ports = "" - for port in self.tcp_ports: - ports += f"\t--port {port}/tcp \\\n" - for port in self.udp_ports: - ports += f"\t--port {port}/udp \\\n" + seperator = " \\\n" + ports += seperator.join( + [f"\t--port {port}/tcp" for port in self.tcp_ports] + ) + ports += seperator + ports += seperator.join( + [f"\t--port {port}/udp" for port in self.udp_ports] + ) + ports += seperator return ports @@ -447,7 +452,7 @@ class Container: def create_container(self) -> str: """Generate podman container create command.""" - cmd = f"# Create container {self.name}" + cmd = f"# Create container {self.name}\n" cmd += "podman container crate \\\n" cmd += f"\t--name={self.name} \\\n" if self.privileged: