global: fix invenio.base mentions

* FIX Amends legacy imports and mentions of `invenio.base` module.

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

Author: jirikuncar

invenio_base/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+#
 # This file is part of Invenio.
-# Copyright (C) 2012, 2013, 2014 CERN.
+# Copyright (C) 2012, 2013, 2014, 2015 CERN.
 #
 # Invenio is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -16,9 +17,4 @@
 # along with Invenio; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.A
 
-"""
-    invenio.base
-    ------------
-
-    Builds the Invenio application.
-"""
+"""Build the Invenio application."""

invenio_base/before_request_functions.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+#
 # This file is part of Invenio.
-# Copyright (C) 2012, 2013 CERN.
+# Copyright (C) 2012, 2013, 2015 CERN.
 #
 # Invenio is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -15,15 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Invenio; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-"""
-    invenio.base.before_request_functions
-    -------------------------------------
 
-    Implements functions to configure necessary the "before request" functions
-    one wants to attach to the application at the global level.
+"""Implement functions to configure necessary the "before request" functions.
+
+These functions will be attached to the application at the global level.
 """
 
 
 def setup_app(app):
-    """Attaches functions to before request handler."""
+    """Attache functions to before request handler."""
     pass

invenio_base/factory.py

@@ -232,7 +232,7 @@ def create_app(instance_path=None, static_folder=None, **kwargs_config):
     #
 
     # Load default configuration
-    app.config.from_object('invenio.base.config')
+    app.config.from_object('invenio_base.config')
 
     # Load site specific default configuration from entry points
     load_site_config(app)

invenio_base/helpers.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+#
 # This file is part of Invenio.
-# Copyright (C) 2012, 2013 CERN.
+# Copyright (C) 2012, 2013, 2015 CERN.
 #
 # Invenio is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -15,23 +16,20 @@
 # You should have received a copy of the GNU General Public License
 # along with Invenio; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-"""
-    invenio.base.helpers
-    --------------------
 
-    Implements various helpers.
-"""
+"""Implement various helpers."""
 
 from functools import wraps
+
 from flask import Flask, current_app, has_app_context
-from six import iteritems, text_type, string_types
 
+from six import iteritems, string_types, text_type
 
-def with_app_context(app=None, new_context=False, **kwargs_config):
-    """Run function within the application context"""
 
+def with_app_context(app=None, new_context=False, **kwargs_config):
+    """Run function within the application context."""
     def get_application():
-        """Returns an application instance."""
+        """Return an application instance."""
         if app is not None and not isinstance(app, Flask) and callable(app):
             return app(**kwargs_config)
         else:
@@ -41,8 +39,7 @@ def get_application():
     def decorator(f):
         @wraps(f)
         def decorated_func(*args, **kwargs):
-            """This function has to run within the application context."""
-
+            """Force this function to run within the application context."""
             if not has_app_context() or new_context:
                 with get_application().test_request_context('/'):
                     # FIXME we should use maybe app_context()
@@ -56,9 +53,9 @@ def decorated_func(*args, **kwargs):
 
 
 def unicodifier(obj):
-    """
-    Tries to (recursively) convert the given object into Unicode, assuming
-    a UTF-8 encoding)
+    """Try to (recursively) convert the given object into Unicode.
+
+    It assumes a UTF-8 encoding.
 
     :param obj: the object to convert
         (can be e.g. unicode, str, list, tuple, dict)
@@ -77,8 +74,7 @@ def unicodifier(obj):
 
 
 def utf8ifier(obj):
-    """
-    Tries to (recursively) convert the given object into utf8.
+    """Try to (recursively) convert the given object into utf8.
 
     :param obj: the object to convert
         (can be e.g. unicode, str, list, tuple, dict)

tests/test_flash_security.py

@@ -23,8 +23,7 @@
 
 from flask import escape, url_for
 
-from invenio.testsuite import InvenioTestCase, make_test_suite, \
-    run_test_suite
+from invenio.testsuite import InvenioTestCase
 
 
 class FlashMessageSecurityTest(InvenioTestCase):
@@ -36,7 +35,7 @@ def config(self):
         cfg = super(FlashMessageSecurityTest, self).config
         cfg['PACKAGES'] = [
             'test_apps.flash_msg',
-            'invenio.base',
+            'invenio_base',
         ]
         return cfg
 
@@ -65,8 +64,3 @@ def test_flash_message_escaping(self):
             self.assertTrue(message in response.data,
                             'flash message should not have been escaped for ' +
                             'context "{}"'.format(context))
-
-TEST_SUITE = make_test_suite(FlashMessageSecurityTest)
-
-if __name__ == "__main__":
-    run_test_suite(TEST_SUITE)

tests/test_scripts_config.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+#
 # This file is part of Invenio.
-# Copyright (C) 2014 CERN.
+# Copyright (C) 2014, 2015 CERN.
 #
 # Invenio is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -16,18 +17,19 @@
 # along with Invenio; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.A
 
-"""Test invenio.base.scripts.config."""
+"""Test invenio_base.scripts.config."""
 
 import os
 import sys
-import mock
 import tempfile
 
 from flask import current_app
-from invenio_base.wrappers import lazy_import
-from invenio.testsuite import make_test_suite, InvenioTestCase
 
-config = lazy_import("invenio.base.scripts.config")
+from invenio.testsuite import InvenioTestCase
+
+from invenio_base.scripts import config
+
+import mock
 
 
 class TestConfig(InvenioTestCase):
@@ -138,6 +140,3 @@ def test_update_true_to_false(self):
             self.assertRegexpMatches(f.read(), "DEBUG\s*=\s*False")
 
         sys.stdout = _stdout
-
-
-TEST_SUITE = make_test_suite(TestConfig)