From 8b0e5dac6f0d89556332c727dfbf1aac483f4e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Tue, 8 Mar 2022 21:52:49 +0100 Subject: [PATCH] Remove unused constant ENV_DIR --- gramps/cli/argparser.py | 3 +-- gramps/gen/const.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gramps/cli/argparser.py b/gramps/cli/argparser.py index f0fcab994..e13bbd4ec 100644 --- a/gramps/cli/argparser.py +++ b/gramps/cli/argparser.py @@ -48,7 +48,7 @@ from glob import glob # #------------------------------------------------------------------------- from gramps.gen.const import (LONGOPTS, SHORTOPTS, USER_PLUGINS, VERSION_DIR, - HOME_DIR, THUMB_DIR, ENV_DIR, USER_CSS) + HOME_DIR, THUMB_DIR, USER_CSS) from gramps.gen.utils.cast import get_type_converter from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext @@ -425,7 +425,6 @@ class ArgParser: if 'E' in value: # Everything else rmtree(THUMB_DIR) rmtree(USER_CSS) - rmtree(ENV_DIR) rmtree(os.path.join(HOME_DIR, "maps")) for fil in glob(os.path.join(HOME_DIR, "*")): if os.path.isfile(fil): diff --git a/gramps/gen/const.py b/gramps/gen/const.py index c02b58ce3..7b4a91e62 100644 --- a/gramps/gen/const.py +++ b/gramps/gen/const.py @@ -121,14 +121,13 @@ REPORT_OPTIONS = os.path.join(HOME_DIR, "report_options.xml") TOOL_OPTIONS = os.path.join(HOME_DIR, "tool_options.xml") PLACE_FORMATS = os.path.join(HOME_DIR, "place_formats.xml") -ENV_DIR = os.path.join(HOME_DIR, "env") THUMB_DIR = os.path.join(HOME_DIR, "thumb") THUMB_NORMAL = os.path.join(THUMB_DIR, "normal") THUMB_LARGE = os.path.join(THUMB_DIR, "large") USER_PLUGINS = os.path.join(VERSION_DIR, "plugins") USER_CSS = os.path.join(HOME_DIR, "css") # dirs checked/made for each Gramps session -USER_DIRLIST = (USER_HOME, HOME_DIR, VERSION_DIR, ENV_DIR, THUMB_DIR, +USER_DIRLIST = (USER_HOME, HOME_DIR, VERSION_DIR, THUMB_DIR, THUMB_NORMAL, THUMB_LARGE, USER_PLUGINS, USER_CSS) @@ -192,7 +191,6 @@ ENV = { "VERSION": VERSION, "major_version": major_version, "VERSION_DIR": VERSION_DIR, - "ENV_DIR": ENV_DIR, "THUMB_DIR": THUMB_DIR, "THUMB_NORMAL": THUMB_NORMAL, "THUMB_LARGE": THUMB_LARGE,