From cc787845e461ea732d7d14d861308e0886fe66ea Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 17 Nov 2020 14:13:46 -0600 Subject: [PATCH] Move code out of __init__.py --- src/pgwui_upload/__init__.py | 24 +--------- src/pgwui_upload/pgwui_upload.py | 44 +++++++++++++++++++ ...{test___init__.py => test_pgwui_upload.py} | 12 ++--- 3 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 src/pgwui_upload/pgwui_upload.py rename tests/{test___init__.py => test_pgwui_upload.py} (89%) diff --git a/src/pgwui_upload/__init__.py b/src/pgwui_upload/__init__.py index b5fb682..4a95019 100644 --- a/src/pgwui_upload/__init__.py +++ b/src/pgwui_upload/__init__.py @@ -19,26 +19,4 @@ # Karl O. Pinc -'''Provide a way to configure PGWUI. -''' -PGWUI_COMPONENT = 'pgwui_upload' -DEFAULT_UPLOAD_ROUTE = '/upload' -DEFAULT_UPLOAD_MENU_LABEL = 'upload -- Upload File Into Database' - - -def init_menu(config): - '''Add default menu information into settings when they are not present - ''' - settings = config.get_settings() - pgwui = settings.setdefault('pgwui', dict()) - pgwui.setdefault(PGWUI_COMPONENT, dict()) - pgwui[PGWUI_COMPONENT].setdefault( - 'menu_label', DEFAULT_UPLOAD_MENU_LABEL) - - -def includeme(config): - '''Pyramid configuration for PGWUI_Upload - ''' - init_menu(config) - config.add_route(PGWUI_COMPONENT, DEFAULT_UPLOAD_ROUTE) - config.scan() +from .pgwui_upload import includeme # noqa: F401 diff --git a/src/pgwui_upload/pgwui_upload.py b/src/pgwui_upload/pgwui_upload.py new file mode 100644 index 0000000..b5fb682 --- /dev/null +++ b/src/pgwui_upload/pgwui_upload.py @@ -0,0 +1,44 @@ +# Copyright (C) 2018, 2020 The Meme Factory, Inc. http://www.karlpinc.com/ + +# This file is part of PGWUI_Upload. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public +# License along with this program. If not, see +# . +# + +# Karl O. Pinc + +'''Provide a way to configure PGWUI. +''' +PGWUI_COMPONENT = 'pgwui_upload' +DEFAULT_UPLOAD_ROUTE = '/upload' +DEFAULT_UPLOAD_MENU_LABEL = 'upload -- Upload File Into Database' + + +def init_menu(config): + '''Add default menu information into settings when they are not present + ''' + settings = config.get_settings() + pgwui = settings.setdefault('pgwui', dict()) + pgwui.setdefault(PGWUI_COMPONENT, dict()) + pgwui[PGWUI_COMPONENT].setdefault( + 'menu_label', DEFAULT_UPLOAD_MENU_LABEL) + + +def includeme(config): + '''Pyramid configuration for PGWUI_Upload + ''' + init_menu(config) + config.add_route(PGWUI_COMPONENT, DEFAULT_UPLOAD_ROUTE) + config.scan() diff --git a/tests/test___init__.py b/tests/test_pgwui_upload.py similarity index 89% rename from tests/test___init__.py rename to tests/test_pgwui_upload.py index a2e6bc1..131a5d3 100644 --- a/tests/test___init__.py +++ b/tests/test_pgwui_upload.py @@ -21,7 +21,7 @@ import pyramid.testing -import pgwui_upload.__init__ as pgwui_upload_init +import pgwui_upload.pgwui_upload as pgwui_upload from pgwui_testing import testing @@ -44,11 +44,11 @@ def test_init_menu_default(): ''' with pyramid.testing.testConfig() as config: - pgwui_upload_init.init_menu(config) + pgwui_upload.init_menu(config) new_settings = config.get_settings() assert new_settings['pgwui']['pgwui_upload']['menu_label'] \ - == pgwui_upload_init.DEFAULT_UPLOAD_MENU_LABEL + == pgwui_upload.DEFAULT_UPLOAD_MENU_LABEL def test_init_menu_no_default(): @@ -64,14 +64,14 @@ def test_init_menu_no_default(): sample_settings['pgwui']['pgwui_upload']['menu_label'] \ = test_menu_label - pgwui_upload_init.init_menu(config) + pgwui_upload.init_menu(config) new_settings = config.get_settings() assert new_settings['pgwui']['pgwui_upload']['menu_label'] \ == test_menu_label -mock_init_menu = testing.make_mock_fixture(pgwui_upload_init, 'init_menu') +mock_init_menu = testing.make_mock_fixture(pgwui_upload, 'init_menu') # includeme() @@ -87,7 +87,7 @@ def test_includeme(mock_init_menu, mock_add_route, mock_scan): mocked_add_route = mock_add_route(config) mocked_scan = mock_scan(config) - pgwui_upload_init.includeme(config) + pgwui_upload.includeme(config) mock_init_menu.assert_called_once() mocked_add_route.assert_called_once() -- 2.34.1