Infra
/
rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

normalize_family can allow dot

This commit is contained in:
Emmanuel Garette 2019-12-22 08:45:03 +01:00
parent 2f8fc054d0
commit 81028d1539
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rougail/loader.py
View File

@ -28,7 +28,7 @@ import imp
class ConvertDynOptionDescription(DynOptionDescription): class ConvertDynOptionDescription(DynOptionDescription):
def convert_suffix_to_path(self, suffix): def convert_suffix_to_path(self, suffix):
return normalize_family(suffix, return normalize_family(suffix,
check=False) check_name=False)
class CreoleLoaderError(Exception): class CreoleLoaderError(Exception):

4
src/rougail/objspace.py
View File

@ -601,7 +601,9 @@ class Path(object):
def get_family_path(self, name, current_namespace): # pylint: disable=C0111 def get_family_path(self, name, current_namespace): # pylint: disable=C0111
if current_namespace is None: # pragma: no cover if current_namespace is None: # pragma: no cover
raise CreoleOperationError('current_namespace must not be None') raise CreoleOperationError('current_namespace must not be None')
dico = self.families[normalize_family(name, check_name=False)] dico = self.families[normalize_family(name,
check_name=False,
allow_dot=True)]
if dico['namespace'] != 'creole' and current_namespace != dico['namespace']: if dico['namespace'] != 'creole' and current_namespace != dico['namespace']:
raise CreoleDictConsistencyError(_('A family located in the {} namespace ' raise CreoleDictConsistencyError(_('A family located in the {} namespace '
'shall not be used in the {} namespace').format( 'shall not be used in the {} namespace').format(

6
src/rougail/utils.py
View File

@ -6,12 +6,14 @@ from .i18n import _
def normalize_family(family_name: str, def normalize_family(family_name: str,
check_name=True) -> str: check_name: bool=True,
allow_dot: bool=False) -> str:
"""replace space, accent, uppercase, ... by valid character """replace space, accent, uppercase, ... by valid character
""" """
f = family_name f = family_name
f = f.replace('-', '_') f = f.replace('-', '_')
f = f.replace('.', '_') if not allow_dot:
f = f.replace('.', '_')
f = f.replace(' ', '_') f = f.replace(' ', '_')
nfkd_form = unicodedata.normalize('NFKD', f) nfkd_form = unicodedata.normalize('NFKD', f)
f = ''.join([c for c in nfkd_form if not unicodedata.combining(c)]) f = ''.join([c for c in nfkd_form if not unicodedata.combining(c)])