Use MalformedConfigFile exception when lang_map is invalid

transifex · Nov 1, 2017 · ba3642e · ba3642e
1 parent f72d49f
commit ba3642e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/txclib/config.py b/txclib/config.py
@@ -5,6 +5,8 @@
 
 import six
 
+from txclib.exceptions import MalformedConfigFile
+
 
 class OrderedRawConfigParser(configparser.RawConfigParser):
     """
@@ -67,7 +69,9 @@ def fromkeys(cls, keys, value=None):
     def __setitem__(self, key, val):
         k = self._flip.get(val, _NOTFOUND)
         if not (k is _NOTFOUND or k == key):
-            raise KeyError('(key,val) would erase mapping for value %r' % val)
+            raise MalformedConfigFile("Your lang map configuration is not correct. "
+                                      "Duplicate entry detected with value '%s'. "
+                                      "Keys and values should be unique." % val)
 
         v = self.get(key, _NOTFOUND)
         if v is not _NOTFOUND:

diff --git a/txclib/project.py b/txclib/project.py
@@ -299,10 +299,9 @@ def get_resource_lang_mapping(self, resource):
                 lang_map.update({k: v})
         except configparser.NoOptionError:
             pass
-        except (ValueError, KeyError):
-            raise Exception(
-                "Your lang map configuration is not correct."
-                "Check that there are no duplicate keys or values.")
+        except ValueError:
+            raise MalformedConfigFile(
+                "Your lang map configuration is not correct.")
 
         if self.config.has_section(resource):
             res_lang_map = Flipdict()
@@ -313,10 +312,9 @@ def get_resource_lang_mapping(self, resource):
                     res_lang_map.update({k: v})
             except configparser.NoOptionError:
                 pass
-            except (ValueError, KeyError):
-                raise Exception(
-                    "Your lang map configuration is not correct."
-                    "Check that there are no duplicate keys or values.")
+            except ValueError:
+                raise MalformedConfigFile(
+                    "Your lang map configuration is not correct.")
 
         # merge the lang maps and return result
         lang_map.update(res_lang_map)