simplify Point

nschloe · Mar 31, 2019 · 73d48cb · 73d48cb
1 parent 8900e69
commit 73d48cb
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/pygmsh/built_in/point.py b/pygmsh/built_in/point.py
@@ -21,22 +21,13 @@ def __init__(self, x, lcar=None):
         self.lcar = lcar
 
         # Points are always 3D in gmsh
-        if lcar is not None:
-            self.code = "\n".join(
-                [
-                    "{} = newp;".format(self.id),
-                    "Point({}) = {{{!r}, {!r}, {!r}, {!r}}};".format(
-                        self.id, x[0], x[1], x[2], lcar
-                    ),
-                ]
-            )
-        else:
-            self.code = "\n".join(
-                [
-                    "{} = newp;".format(self.id),
-                    "Point({}) = {{{!r}, {!r}, {!r}}};".format(
-                        self.id, x[0], x[1], x[2]
-                    ),
-                ]
-            )
+        args = (x[0], x[1], x[2]) if lcar is None else (x[0], x[1], x[2], lcar)
+        fmt = ", ".join(len(args) * ["{!r}"])
+
+        self.code = "\n".join(
+            [
+                "{} = newp;".format(self.id),
+                ("Point({}) = {{" + fmt + "}};").format(self.id, *args),
+            ]
+        )
         return