From e4fd21f9987eb28704a044ad3f7b0c527e2f4f38 Mon Sep 17 00:00:00 2001 From: Christian Moser Date: Tue, 30 Dec 2025 02:33:32 +0100 Subject: [PATCH] License change to 0-BSD --- LICENSE | 30 ++++++++---------------- tinywiki/management/commands/twimport.py | 6 ++--- tinywiki/migrations/pages/license.bbcode | 11 ++------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/LICENSE b/LICENSE index 60f6968..fa93ae4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,12 @@ -Copyright 2025 Christian Moser +Copyright (C) 2025 - 2026 by Christian christian@cmoser.eu -Redistribution and use in source and binary forms, with or without -modification,are permitted provided that the following conditions are met: +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/tinywiki/management/commands/twimport.py b/tinywiki/management/commands/twimport.py index 2b73188..e2bbabc 100644 --- a/tinywiki/management/commands/twimport.py +++ b/tinywiki/management/commands/twimport.py @@ -63,7 +63,7 @@ class Command(BaseCommand): if has_images: import_builtin_images_from_zip(filename, user) else: - with open(file, "rt", encoding="utf-8") as json_file: + with open(filename, "rt", encoding="utf-8") as json_file: try: json_data = json.loads(json_file.read()) except Exception: @@ -76,6 +76,6 @@ class Command(BaseCommand): raise CommandError("Not a valid json file!") if has_images: - import_builtin_images(file) + import_builtin_images(filename) if has_pages: - import_builtin_pages(file) + import_builtin_pages(filename) diff --git a/tinywiki/migrations/pages/license.bbcode b/tinywiki/migrations/pages/license.bbcode index 031840f..5a9064b 100644 --- a/tinywiki/migrations/pages/license.bbcode +++ b/tinywiki/migrations/pages/license.bbcode @@ -1,10 +1,3 @@ [h2]Copyright [copy] 2025 Christian Moser[/h2] - -[p]Redistribution and use in source and binary forms, with or without modification,are permitted provided that the following conditions are met:[/p] - -[ol] -[li]Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.[/li] -[li]Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.[/li] -[/ol] - -[p][b]THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.[/b][/p] \ No newline at end of file +[p]Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.[/p] +[p]THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.[/p]