Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Moved utilities to utils, made cfgwriter read a proper file, formatted function to snake_case (#4)

Aathish83e6ff4314fe
diff --git a/manim/config.py b/manim/config.py
index 867c5dea7..c3f55abda 100644
--- a/manim/config.py
+++ b/manim/config.py
@@ -4,7 +4,7 @@ import sys
import colour
from . import constants
-from .config_utils import (
+from .utils.config_utils import (
_init_dirs,
args,
config_parser,
diff --git a/manim/logger.py b/manim/logger.py
index 0a15daeb9..d00246f3d 100644
--- a/manim/logger.py
+++ b/manim/logger.py
@@ -5,10 +5,10 @@ from rich.console import Console
from rich.logging import RichHandler
from rich.theme import Theme
-from .config_utils import config_parser, successfully_read_files
+from .utils.config_utils import config_parser, successfully_read_files
-def parseTheme(fp):
+def parse_theme(fp):
config_parser.read(fp)
theme = dict(config_parser["log.color"])
customTheme = Theme(theme)
@@ -16,7 +16,7 @@ def parseTheme(fp):
try:
- customTheme = parseTheme(successfully_read_files)
+ customTheme = parse_theme(successfully_read_files)
console = Console(theme=customTheme)
except KeyError:
console = Console()
diff --git a/manim/cfgwriter/__main__.py b/manim/utils/cfgwriter.py
similarity index 85%
rename from manim/cfgwriter/__main__.py
rename to manim/utils/cfgwriter.py
index 8df700366..55945f387 100644
--- a/manim/cfgwriter/__main__.py
+++ b/manim/utils/cfgwriter.py
@@ -1,5 +1,8 @@
+from os import path
import configparser
+from .config_utils import successfully_read_files
+
from rich.console import Console
from rich.progress import track
from rich.color import Color
@@ -26,7 +29,9 @@ def check_valid_colour(color):
def main():
console = Console()
config = configparser.ConfigParser()
- config.read("manim.cfg")
+ config.read(
+ successfully_read_files
+ )
default = {
"logging.keyword": "bold yellow",
"logging.level.notset": "dim",
@@ -66,7 +71,9 @@ def main():
with open("manim.cfg", "w") as fp:
config.write(fp)
console.print(
- "A file called [yellow]manim.cfg[/yellow] is created. To save your theme please save that file and each time \nplace it in you current working directory(The directory where you execute manim command) for the your theme to be displayed."
+ """A configuration file called [yellow]manim.cfg[/yellow] has been created.
+To save your theme please save that file and each time place it in your current working directory,
+(the directory where you executed the command manim)"""
)
diff --git a/manim/config_utils.py b/manim/utils/config_utils.py
similarity index 98%
rename from manim/config_utils.py
rename to manim/utils/config_utils.py
index c32702eac..db22cdb29 100644
--- a/manim/config_utils.py
+++ b/manim/utils/config_utils.py
@@ -14,8 +14,8 @@ import sys
import colour
-from . import constants
-from .utils.tex import TexTemplate, TexTemplateFromFile
+from .. import constants
+from .tex import TexTemplate, TexTemplateFromFile
__all__ = ["file_writer_config"]
@@ -345,7 +345,7 @@ def _from_command_line():
# Config files to be parsed, in ascending priority
-library_wide = os.path.join(os.path.dirname(__file__), "default.cfg")
+library_wide = os.path.join(os.path.dirname(__file__), "../default.cfg")
config_files = [
library_wide,
os.path.expanduser("~/.manim.cfg"),
diff --git a/setup.py b/setup.py
index 751fefbfa..b05dae6be 100755
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
"console_scripts": [
"manim=manim.__main__:main",
"manimcm=manim.__main__:main",
- "cfg-manim=manim.cfgwriter.__main__:main",
+ "cfg-manim=manim.utils.cfgwriter:main",
]
},
install_requires=[