From 89da594fe971ceaf486f3afbfcb9d443210fc3d0 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Fri, 29 Jul 2016 12:24:10 +0200 Subject: [PATCH] svn: Rename keys.py to config_keys.py --- rhodecode/svn_support/__init__.py | 30 +++++++++---------- .../svn_support/{keys.py => config_keys.py} | 0 .../tests/test_mod_dav_svn_config.py | 20 ++++++------- rhodecode/svn_support/utils.py | 10 +++---- 4 files changed, 30 insertions(+), 30 deletions(-) rename rhodecode/svn_support/{keys.py => config_keys.py} (100%) diff --git a/rhodecode/svn_support/__init__.py b/rhodecode/svn_support/__init__.py index 71167960..336dbf0d 100644 --- a/rhodecode/svn_support/__init__.py +++ b/rhodecode/svn_support/__init__.py @@ -25,7 +25,7 @@ from rhodecode import events from rhodecode.lib.utils2 import str2bool from .subscribers import generate_config_subscriber -from . import keys +from . import config_keys log = logging.getLogger(__name__) @@ -35,7 +35,7 @@ def includeme(config): settings = config.registry.settings _sanitize_settings_and_apply_defaults(settings) - if settings[keys.generate_config]: + if settings[config_keys.generate_config]: config.add_subscriber( generate_config_subscriber, events.RepoGroupEvent) @@ -45,25 +45,25 @@ def _sanitize_settings_and_apply_defaults(settings): Set defaults, convert to python types and validate settings. """ # Convert bool settings from string to bool. - settings[keys.generate_config] = str2bool( - settings.get(keys.generate_config, 'false')) - settings[keys.list_parent_path] = str2bool( - settings.get(keys.list_parent_path, 'true')) + settings[config_keys.generate_config] = str2bool( + settings.get(config_keys.generate_config, 'false')) + settings[config_keys.list_parent_path] = str2bool( + settings.get(config_keys.list_parent_path, 'true')) # Set defaults if key not present. - settings.setdefault(keys.config_file_path, None) - settings.setdefault(keys.location_root, '/') - settings.setdefault(keys.parent_path_root, None) + settings.setdefault(config_keys.config_file_path, None) + settings.setdefault(config_keys.location_root, '/') + settings.setdefault(config_keys.parent_path_root, None) # Append path separator to paths. - settings[keys.location_root] = _append_path_sep( - settings[keys.location_root]) - settings[keys.parent_path_root] = _append_path_sep( - settings[keys.parent_path_root]) + settings[config_keys.location_root] = _append_path_sep( + settings[config_keys.location_root]) + settings[config_keys.parent_path_root] = _append_path_sep( + settings[config_keys.parent_path_root]) # Validate settings. - if settings[keys.generate_config]: - assert settings[keys.config_file_path] is not None + if settings[config_keys.generate_config]: + assert settings[config_keys.config_file_path] is not None def _append_path_sep(path): diff --git a/rhodecode/svn_support/keys.py b/rhodecode/svn_support/config_keys.py similarity index 100% rename from rhodecode/svn_support/keys.py rename to rhodecode/svn_support/config_keys.py diff --git a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py b/rhodecode/svn_support/tests/test_mod_dav_svn_config.py index 2f3f2097..586b39c0 100644 --- a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py +++ b/rhodecode/svn_support/tests/test_mod_dav_svn_config.py @@ -26,7 +26,7 @@ import tempfile from pyramid import testing -from rhodecode.svn_support import keys +from rhodecode.svn_support import config_keys from rhodecode.svn_support.utils import generate_mod_dav_svn_config @@ -60,10 +60,10 @@ class TestModDavSvnConfig(object): config_file_path = tempfile.mkstemp( suffix='mod-dav-svn.conf', dir=cls.tempdir)[1] return { - keys.config_file_path: config_file_path, - keys.location_root: '/location/root/', - keys.parent_path_root: '/parent/path/root/', - keys.list_parent_path: True, + config_keys.config_file_path: config_file_path, + config_keys.location_root: '/location/root/', + config_keys.parent_path_root: '/parent/path/root/', + config_keys.list_parent_path: True, } @classmethod @@ -86,7 +86,7 @@ class TestModDavSvnConfig(object): generate_mod_dav_svn_config(settings) # Read generated file. - with open(settings[keys.config_file_path], 'r') as file_: + with open(settings[config_keys.config_file_path], 'r') as file_: content = file_.read() # Assert that one location block exists for each repository group. @@ -109,11 +109,11 @@ class TestModDavSvnConfig(object): # Execute the method under test. settings = self.get_settings() - settings[keys.list_parent_path] = True + settings[config_keys.list_parent_path] = True generate_mod_dav_svn_config(settings) # Read generated file. - with open(settings[keys.config_file_path], 'r') as file_: + with open(settings[config_keys.config_file_path], 'r') as file_: content = file_.read() # Make assertions. @@ -126,11 +126,11 @@ class TestModDavSvnConfig(object): # Execute the method under test. settings = self.get_settings() - settings[keys.list_parent_path] = False + settings[config_keys.list_parent_path] = False generate_mod_dav_svn_config(settings) # Read generated file. - with open(settings[keys.config_file_path], 'r') as file_: + with open(settings[config_keys.config_file_path], 'r') as file_: content = file_.read() # Make assertions. diff --git a/rhodecode/svn_support/utils.py b/rhodecode/svn_support/utils.py index 3c21669f..0865332b 100644 --- a/rhodecode/svn_support/utils.py +++ b/rhodecode/svn_support/utils.py @@ -23,7 +23,7 @@ import os from pyramid.renderers import render from rhodecode.model.db import RepoGroup -from . import keys +from . import config_keys def generate_mod_dav_svn_config(settings): @@ -33,10 +33,10 @@ def generate_mod_dav_svn_config(settings): available repository group because the mod_dav_svn module does not support repositories organized in sub folders. """ - filepath = settings[keys.config_file_path] - parent_path_root = settings[keys.parent_path_root] - list_parent_path = settings[keys.list_parent_path] - location_root = settings[keys.location_root] + filepath = settings[config_keys.config_file_path] + parent_path_root = settings[config_keys.parent_path_root] + list_parent_path = settings[config_keys.list_parent_path] + location_root = settings[config_keys.location_root] # Render the configuration to string. template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'