Get rid of initialized

Author: Konstantinos Bairaktaris

tests/native/conftest.py

@@ -5,7 +5,7 @@
 from transifex.common.utils import generate_key
 from transifex.native.cache import MemoryCache
 from transifex.native.cds import TRANSIFEX_CDS_HOST
-from transifex.native.core import NotInitializedError, TxNative
+from transifex.native.core import TxNative
 from transifex.native.parsing import SourceString
 from transifex.native.rendering import (PseudoTranslationPolicy,
                                         SourceStringPolicy, parse_error_policy)
@@ -55,34 +55,6 @@ def _get_tx(self, **kwargs):
         mytx.init(['en', 'el'], 'cds_token', **kwargs)
         return mytx
 
-    def test_uninitialized(self):
-        mytx = TxNative()
-        with pytest.raises(NotInitializedError):
-            mytx.translate('string', 'en')
-        with pytest.raises(NotInitializedError):
-            mytx.fetch_translations()
-        with pytest.raises(NotInitializedError):
-            mytx.push_source_strings([], False)
-
-    def test_default_init(self):
-        mytx = self._get_tx()
-        assert mytx.initialized is True
-        assert mytx._languages == ['en', 'el']
-        assert isinstance(mytx._missing_policy, SourceStringPolicy)
-        assert isinstance(mytx._cache, MemoryCache)
-        assert mytx._cds_handler.token == 'cds_token'
-        assert mytx._cds_handler.host == TRANSIFEX_CDS_HOST
-
-    def test_custom_init(self):
-        missing_policy = PseudoTranslationPolicy()
-        mytx = self._get_tx(cds_host='myhost', missing_policy=missing_policy)
-        assert mytx.initialized is True
-        assert mytx._languages == ['en', 'el']
-        assert mytx._missing_policy == missing_policy
-        assert isinstance(mytx._cache, MemoryCache)
-        assert mytx._cds_handler.token == 'cds_token'
-        assert mytx._cds_handler.host == 'myhost'
-
     @patch('transifex.native.core.StringRenderer.render')
     def test_translate_source_language_reaches_renderer(self, mock_render):
         mytx = self._get_tx()

tests/native/core/test_core.py

@@ -6,24 +6,11 @@
 class TestModuleInit(object):
     """Test __init__.py of root native module."""
 
-    def test_init_uses_given_params(self, reset_tx):
+    def test_init_uses_given_params(self):
         native.init(
             'mytoken', ['lang1', 'lang2'], cds_host='myhost',
             missing_policy=PseudoTranslationPolicy(),
         )
-        assert _tx.initialized is True
-        assert _tx._cds_handler.token == 'mytoken'
-        assert _tx._cds_handler.host == 'myhost'
-        assert _tx._languages == ['lang1', 'lang2']
-        assert isinstance(_tx._missing_policy, PseudoTranslationPolicy)
-
-    def test_initialized_only_once(self, reset_tx):
-        # Even if native.init() is called multiple times, only the first one matters
-        native.init(
-            'mytoken', ['lang1', 'lang2'], cds_host='myhost',
-            missing_policy=PseudoTranslationPolicy(),
-        )
-        native.init('another_token', ['lang3', 'lang4'], 'another_host')
         assert _tx._cds_handler.token == 'mytoken'
         assert _tx._cds_handler.host == 'myhost'
         assert _tx._languages == ['lang1', 'lang2']

tests/native/core/test_init.py

@@ -19,15 +19,14 @@ def init(
     :param AbstractErrorPolicy error_policy: an optional policy to use
         for defining how to handle translation rendering errors
     """
-    if not tx.initialized:
-        tx.init(
-            languages,
-            token,
-            secret=secret,
-            cds_host=cds_host,
-            missing_policy=missing_policy,
-            error_policy=error_policy
-        )
+    tx.init(
+        languages,
+        token,
+        secret=secret,
+        cds_host=cds_host,
+        missing_policy=missing_policy,
+        error_policy=error_policy
+    )
 
 
 tx = TxNative()

transifex/native/__init__.py

@@ -10,15 +10,6 @@
                                         SourceStringPolicy, StringRenderer)
 
 
-class NotInitializedError(Exception):
-    """Raised when a method of a TxNative instance is called but the class
-    hasn't been initialized.
-
-    Allows for better debugging when developers neglect to call init().
-    """
-    pass
-
-
 class TxNative(object):
     """The main class of the framework, responsible for orchestrating all
     behavior."""
@@ -33,7 +24,6 @@ def __init__(self):
         self._languages = []
         self._missing_policy = None
         self._cds_handler = None
-        self.initialized = False
 
     def init(
         self, languages, token, secret=None, cds_host=None,
@@ -62,7 +52,6 @@ def init(
         self._cds_handler = CDSHandler(
             self._languages, token, secret=secret, host=cds_host
         )
-        self.initialized = True
 
     def translate(
         self, source_string, language_code, is_source=False,
@@ -88,8 +77,6 @@ def translate(
         if params is None:
             params = {}
 
-        self._check_initialization()
-
         translation_template = self.get_translation(source_string,
                                                     language_code,
                                                     _context,
@@ -148,7 +135,6 @@ def render_translation(self, translation_template, params, source_string,
 
     def fetch_translations(self):
         """Fetch fresh content from the CDS."""
-        self._check_initialization()
         self._cache.update(self._cds_handler.fetch_translations())
 
     def push_source_strings(self, strings, purge=False):
@@ -163,16 +149,5 @@ def push_source_strings(self, strings, purge=False):
             response
         :rtype: tuple
         """
-        self._check_initialization()
         response = self._cds_handler.push_source_strings(strings, purge)
         return response.status_code, json.loads(response.content)
-
-    def _check_initialization(self):
-        """Raise an exception if the class has not been initialized.
-
-        :raise NotInitializedError: if the class hasn't been initialized
-        """
-        if not self.initialized:
-            raise NotInitializedError(
-                'TxNative is not initialized, make sure you call init() first.'
-            )