Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Made regex more readable (#2164)

Dhananjay Goratelafd6b1d89407f
diff --git a/manim/_config/utils.py b/manim/_config/utils.py
index 3dd79ca47..090f2c82c 100644
--- a/manim/_config/utils.py
+++ b/manim/_config/utils.py
@@ -591,14 +591,16 @@ class ManimConfig(MutableMapping):
setattr(self, key, parser["CLI"].getfloat(key))
# tuple keys
- gui_location = tuple(map(int, re.split(";|,|-", parser["CLI"]["gui_location"])))
+ gui_location = tuple(
+ map(int, re.split(r"[;,\-]", parser["CLI"]["gui_location"])),
+ )
setattr(self, "gui_location", gui_location)
window_size = parser["CLI"][
"window_size"
] # if not "default", get a tuple of the position
if window_size != "default":
- window_size = tuple(map(int, re.split(";|,|-", window_size)))
+ window_size = tuple(map(int, re.split(r"[;,\-]", window_size)))
setattr(self, "window_size", window_size)
# plugins
diff --git a/manim/cli/render/global_options.py b/manim/cli/render/global_options.py
index 520fcb17e..2b9aa6722 100644
--- a/manim/cli/render/global_options.py
+++ b/manim/cli/render/global_options.py
@@ -9,7 +9,7 @@ from ... import logger
def validate_gui_location(ctx, param, value):
if value:
try:
- x_offset, y_offset = map(int, re.split(";|,|-", value))
+ x_offset, y_offset = map(int, re.split(r"[;,\-]", value))
return (x_offset, y_offset)
except Exception:
logger.error("GUI location option is invalid.")
diff --git a/manim/cli/render/render_options.py b/manim/cli/render/render_options.py
index 13ecf9632..f700c1298 100644
--- a/manim/cli/render/render_options.py
+++ b/manim/cli/render/render_options.py
@@ -15,7 +15,7 @@ def validate_scene_range(ctx, param, value):
if value:
try:
- start, end = map(int, re.split(";|,|-", value))
+ start, end = map(int, re.split(r"[;,\-]", value))
return start, end
except Exception:
logger.error("Couldn't determine a range for -n option.")
@@ -25,7 +25,7 @@ def validate_scene_range(ctx, param, value):
def validate_resolution(ctx, param, value):
if value:
try:
- start, end = map(int, re.split(";|,|-", value))
+ start, end = map(int, re.split(r"[;,\-]", value))
return (start, end)
except Exception:
logger.error("Resolution option is invalid.")