From 7cf6b8b5947cb568ba7fa8a39d800343ce50d5ac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 3 Jun 2018 11:54:26 +0530
Subject: [PATCH] Move the config utils into its own package

---
 kittens/diff/config.py                   | 2 +-
 kitty/boss.py                            | 2 +-
 kitty/cli.py                             | 2 +-
 kitty/conf/__init__.py                   | 0
 kitty/{config_utils.py => conf/utils.py} | 8 ++++----
 kitty/config.py                          | 2 +-
 kitty/utils.py                           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 kitty/conf/__init__.py
 rename kitty/{config_utils.py => conf/utils.py} (97%)

diff --git a/kittens/diff/config.py b/kittens/diff/config.py
index 60decee9b..edccc57ce 100644
--- a/kittens/diff/config.py
+++ b/kittens/diff/config.py
@@ -4,7 +4,7 @@
 
 import os
 
-from kitty.config_utils import (
+from kitty.conf.utils import (
     init_config, key_func, load_config as _load_config, merge_dicts,
     parse_config_base, parse_kittens_key, python_string, resolve_config,
     to_color
diff --git a/kitty/boss.py b/kitty/boss.py
index dbe89ebae..a77c40c5b 100644
--- a/kitty/boss.py
+++ b/kitty/boss.py
@@ -11,11 +11,11 @@ from gettext import gettext as _
 from weakref import WeakValueDictionary
 
 from .cli import create_opts, parse_args
+from .conf.utils import to_cmdline
 from .config import (
     MINIMUM_FONT_SIZE, initial_window_size_func,
     prepare_config_file_for_editing
 )
-from .config_utils import to_cmdline
 from .constants import (
     appname, config_dir, set_boss, supports_primary_selection
 )
diff --git a/kitty/cli.py b/kitty/cli.py
index 869f8fe89..a07efa7d4 100644
--- a/kitty/cli.py
+++ b/kitty/cli.py
@@ -8,7 +8,7 @@ import sys
 from collections import deque
 
 from .config import defaults, load_config
-from .config_utils import resolve_config
+from .conf.utils import resolve_config
 from .constants import appname, defconf, is_macos, is_wayland, str_version
 
 CONFIG_HELP = '''\
diff --git a/kitty/conf/__init__.py b/kitty/conf/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/kitty/config_utils.py b/kitty/conf/utils.py
similarity index 97%
rename from kitty/config_utils.py
rename to kitty/conf/utils.py
index 35abb695a..51c27c2ab 100644
--- a/kitty/config_utils.py
+++ b/kitty/conf/utils.py
@@ -7,8 +7,8 @@ import os
 import re
 import shlex
 
-from .rgb import to_color as as_color
-from .utils import log_error
+from ..rgb import to_color as as_color
+from ..utils import log_error
 
 key_pat = re.compile(r'([a-zA-Z][a-zA-Z0-9_-]*)\s+(.+)$')
 
@@ -78,7 +78,7 @@ def _parse(lines, type_map, special_handling, ans, all_keys):
     if name:
         base_path_for_includes = os.path.dirname(os.path.abspath(name))
     else:
-        from .constants import config_dir
+        from ..constants import config_dir
         base_path_for_includes = config_dir
     for line in lines:
         parse_line(line, type_map, special_handling, ans, all_keys, base_path_for_includes)
@@ -188,7 +188,7 @@ def key_func():
 
 
 def parse_kittens_shortcut(sc):
-    from kitty.key_encoding import config_key_map, config_mod_map, text_match
+    from ..key_encoding import config_key_map, config_mod_map, text_match
     if sc.endswith('+'):
         parts = list(filter(None, sc.rstrip('+').split('+') + ['+']))
     else:
diff --git a/kitty/config.py b/kitty/config.py
index 17e156bb1..03b07c1d4 100644
--- a/kitty/config.py
+++ b/kitty/config.py
@@ -10,7 +10,7 @@ from collections import namedtuple
 from contextlib import contextmanager
 
 from . import fast_data_types as defines
-from .config_utils import (
+from .conf.utils import (
     init_config, key_func, load_config as _load_config, merge_dicts,
     parse_config_base, positive_float, positive_int, python_string, to_bool,
     to_cmdline, to_color, unit_float
diff --git a/kitty/utils.py b/kitty/utils.py
index 458ed7299..a850c5113 100644
--- a/kitty/utils.py
+++ b/kitty/utils.py
@@ -151,7 +151,7 @@ def base64_encode(
 
 def command_for_open(program='default'):
     if isinstance(program, str):
-        from .config_utils import to_cmdline
+        from .conf.utils import to_cmdline
         program = to_cmdline(program)
     if program == ['default']:
         cmd = ['open'] if is_macos else ['xdg-open']