Fix argument conflicts because of **params

The problem is that we have a chain of function calls like the following:

```python
first("foo", language_code="bar")

def first(string, **params):
    second(string=string, "fr", **params)

def second(string, language_code, **params):
    # ...
```

This way, we invoke `second` by providing the `language_code` argument
twice and python complains. We fix this by converting params to dict
argument, where possible.

Author: Konstantinos Bairaktaris

tests/native/core/test_core.py

@@ -8,7 +8,6 @@
 from transifex.native.core import NotInitializedError, TxNative
 from transifex.native.parsing import SourceString
 from transifex.native.rendering import (PseudoTranslationPolicy,
-                                        SourceStringErrorPolicy,
                                         SourceStringPolicy, parse_error_policy)
 
 
@@ -94,6 +93,7 @@ def test_translate_source_language_reaches_renderer(self, mock_render):
             language_code='en',
             escape=True,
             missing_policy=mytx._missing_policy,
+            params={},
         )
 
     @patch('transifex.native.core.MemoryCache.get')
@@ -111,6 +111,7 @@ def test_translate_target_language_missing_reaches_renderer(self, mock_render,
             language_code='en',
             escape=True,
             missing_policy=mytx._missing_policy,
+            params={},
         )
 
     def test_translate_target_language_missing_reaches_missing_policy(self):
@@ -127,7 +128,7 @@ def test_translate_error_reaches_error_policy(self, mock_renderer):
         mytx.translate('My String', 'en', is_source=False)
         error_policy.get.assert_called_once_with(
             source_string='My String', translation=None, language_code='en',
-            escape=True
+            escape=True, params={},
         )
 
     def test_translate_error_reaches_source_string_error_policy(

tests/native/core/test_rendering.py

@@ -42,7 +42,7 @@ def test_simple_render_escaped(self):
             'en',
             escape=True,
             missing_policy=SourceStringPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         assert translation == (
             u'<script type="text/javascript">alert(1)</script>'
@@ -55,7 +55,7 @@ def test_simple_render_unescaped(self):
             'en',
             escape=False,
             missing_policy=SourceStringPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         assert translation == JS_SCRIPT
 
@@ -66,7 +66,7 @@ def test_simple_render_with_translation(self):
             'en',
             escape=True,
             missing_policy=SourceStringPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         assert translation == u'2 τραπέζια'
 
@@ -77,7 +77,7 @@ def test_simple_render_with_missing_translation(self):
             'en',
             escape=True,
             missing_policy=SourceStringPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         # Should fall back to source
         assert translation == u'2 tables'
@@ -88,7 +88,7 @@ def test_simple_render_with_missing_translation(self):
             'en',
             escape=True,
             missing_policy=PseudoTranslationPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         # Should use the proper missing policy
         assert translation == u'2 ťàƀĺêš'
@@ -100,7 +100,7 @@ def test_simple_render_escaped_with_missing_translation(self):
             'en',
             escape=True,
             missing_policy=SourceStringPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         assert translation == (
             u'<script type="text/javascript">alert(1)</script>'
@@ -113,7 +113,7 @@ def test_simple_render_unescaped_with_missing_translation(self):
             'en',
             escape=False,
             missing_policy=SourceStringPolicy(),
-            cnt=2,
+            params={'cnt': 2},
         )
         assert translation == JS_SCRIPT
 
@@ -131,15 +131,15 @@ def test_complex_message_format(self):
         assert translation == u'Jane invites Joe and 9 other people to her party.'
 
     def _complex(self, **params):
+        params = dict(params)
+        params.update({'host': "Jane", 'guest': "Joe"})
         return StringRenderer.render(
             COMPLEX_STRINGS,
             None,
             'en',
             escape=True,
             missing_policy=SourceStringPolicy(),
-            host='Jane',
-            guest='Joe',
-            **params
+            params=params,
         )
 
     @patch('transifex.native.rendering.html_escape')

transifex/common/console.py

@@ -84,5 +84,5 @@ def pluralized(one, other, cnt_value):
         language_code='en',
         escape=False,
         missing_policy=None,
-        cnt=cnt_value,
+        params={'cnt': cnt_value},
     )

transifex/native/core.py

@@ -84,6 +84,10 @@ def translate(
         :return: the rendered string
         :rtype: unicode
         """
+
+        if params is None:
+            params = {}
+
         self._check_initialization()
 
         translation_template = self.get_translation(source_string,
@@ -92,7 +96,7 @@ def translate(
                                                     is_source)
 
         return self.render_translation(translation_template,
-                                       params or {},
+                                       params,
                                        source_string,
                                        language_code,
                                        escape)
@@ -132,14 +136,14 @@ def render_translation(self, translation_template, params, source_string,
                 language_code=language_code,
                 escape=escape,
                 missing_policy=self._missing_policy,
-                **params
+                params=params,
             )
         except Exception:
             return self._error_policy.get(
                 source_string=source_string,
                 translation=translation_template,
                 language_code=language_code,
-                escape=escape, **params
+                escape=escape, params=params,
             )
 
     def fetch_translations(self):

transifex/native/django/utils/__init__.py

@@ -4,34 +4,34 @@
 from transifex.native import tx
 
 
-def translate(string, _context=None, escape=True, **params):
+def translate(_string, _context=None, _escape=True, **params):
     """Translate the given source string to the current language.
 
     A convenience wrapper that uses the current language of a Django app.
 
     If there are any placeholders to replace, they need to be passed as kwargs.
 
-    :param unicode string: the source string to get the translation for
+    :param unicode _string: the source string to get the translation for
     :param unicode _context: an optional context that gives more information
         about the source string
-    :param bool escape: if True, the returned string will be HTML-escaped,
+    :param bool _escape: if True, the returned string will be HTML-escaped,
         otherwise it won't
     :return: the final translation in the current language
     :rtype: unicode
     """
     is_source = get_language() == settings.LANGUAGE_CODE
     locale = to_locale(get_language())  # e.g. from en-us to en_US
     return tx.translate(
-        string,
+        _string,
         locale,
         _context=_context,
         is_source=is_source,
-        escape=escape,
+        escape=_escape,
         params=params,
     )
 
 
-def lazy_translate(string, _context=None, escape=True, **params):
+def lazy_translate(_string, _context=None, _escape=True, **params):
     """Lazily translate the given source string to the current language.
 
     Delays the evaluation of translating the given string until necessary.
@@ -41,21 +41,21 @@ def lazy_translate(string, _context=None, escape=True, **params):
 
     See translate() for more details.
 
-    :param unicode string: the source string to get the translation for
+    :param unicode _string: the source string to get the translation for
     :param unicode _context: an optional context that gives more information
         about the source string
-    :param bool escape: if True, the returned string will be HTML-escaped,
+    :param bool _escape: if True, the returned string will be HTML-escaped,
         otherwise it won't
     :return: an object that when evaluated as a string will return
         the final translation in the current language
     :rtype: LazyString
     """
     return LazyString(
-        translate, string, _context=_context, escape=escape, **params
+        translate, _string, _context=_context, escape=_escape, **params
     )
 
 
-def utranslate(string, _context=None, **params):
+def utranslate(_string, _context=None, **params):
     """Translate the given source string to the current language, without HTML
     escaping.
 
@@ -66,10 +66,10 @@ def utranslate(string, _context=None, **params):
 
     If there are any placeholders to replace, they need to be passed as kwargs.
 
-    :param unicode string: the source string to get the translation for
+    :param unicode _string: the source string to get the translation for
     :param unicode _context: an optional context that gives more information
         about the source string
     :return: the final translation in the current language
     :rtype: unicode
     """
-    return translate(string, _context, escape=False, **params)
+    return translate(_string, _context, escape=False, **params)

transifex/native/rendering.py

@@ -37,7 +37,7 @@ class StringRenderer(object):
     @classmethod
     def render(
         cls, source_string, string_to_render, language_code, escape,
-        missing_policy, **params
+        missing_policy, params=None,
     ):
         """Render the given ICU string.
 
@@ -61,6 +61,10 @@ def render(
         :return: the final rendered string
         :rtype: unicode
         """
+
+        if params is None:
+            params = {}
+
         try:
             if not string_to_render and not missing_policy:
                 raise Exception(
@@ -294,10 +298,8 @@ class AbstractErrorPolicy(object):
     Error policies define what happens when rendering faces an error.
     They are useful to protect the user from pages failing to load."""
 
-    def get(
-        self, source_string, translation, language_code,
-        escape, **params
-    ):
+    def get(self, source_string, translation, language_code, escape,
+            params=None):
         raise NotImplementedError()
 
 
@@ -311,7 +313,7 @@ def __init__(self, default_text='ERROR'):
 
     def get(
         self, source_string, translation, language_code,
-        escape, **params
+        escape, params=None,
     ):
         """Try to render the source string. If something goes wrong,
         render a custom text provided by the user.
@@ -322,14 +324,17 @@ def get(
         :param bool escape: Whether to escape or not
         """
 
+        if params is None:
+            params = {}
+
         try:
             return StringRenderer.render(
                 source_string=source_string,
                 string_to_render=source_string,
                 language_code=language_code,
                 escape=escape,
                 missing_policy=None,
-                **params
+                params=params,
             )
         except Exception as e:
             logger.error(