From dc0ecfe691b8049a79dcc0b36ccbc67d31c3a0b8 Mon Sep 17 00:00:00 2001 From: kaliko Date: Fri, 17 Mar 2023 17:02:04 +0100 Subject: [PATCH] Switch to SPDX headers https://spdx.dev/ids/ --- LICENSE | 14 +++++++------- sid/archive.py | 17 ++--------------- sid/bts.py | 19 +++---------------- sid/echo.py | 18 +++--------------- sid/feeds.py | 16 ++-------------- sid/lib.py | 16 ++-------------- sid/log.py | 16 ++-------------- sid/ping.py | 16 ++-------------- sid/plugin.py | 17 ++--------------- sid/sid.py | 20 ++++---------------- 10 files changed, 29 insertions(+), 140 deletions(-) diff --git a/LICENSE b/LICENSE index 9b0fc9a..8c48126 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - sid - Copyright (C) 2020 kaliko + Sid an xmpp bot + Copyright (C) 2015-2023 kaliko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - sid Copyright (C) 2020 kaliko + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/sid/archive.py b/sid/archive.py index 68c841e..6875f1b 100644 --- a/sid/archive.py +++ b/sid/archive.py @@ -1,19 +1,6 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - +# SPDX-FileCopyrightText: 2020 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later from re import compile as re_compile diff --git a/sid/bts.py b/sid/bts.py index 03eef51..305ef71 100644 --- a/sid/bts.py +++ b/sid/bts.py @@ -1,20 +1,7 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2010, 2011 Anaël Verrier -# Copyright (C) 2015, 2021 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - +# SPDX-FileCopyrightText: 2015, 2021 kaliko +# SPDX-FileCopyrightText: 2010, 2011 Anaël Verrier +# SPDX-License-Identifier: GPL-3.0-or-later from re import compile as re_compile diff --git a/sid/echo.py b/sid/echo.py index 96ea393..12b4376 100644 --- a/sid/echo.py +++ b/sid/echo.py @@ -1,19 +1,7 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2007-2012 Thomas Perl -# Copyright (C) 2014, 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2007-2012 Thomas Perl +# SPDX-FileCopyrightText: 2014, 2020 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later from .plugin import Plugin, botcmd diff --git a/sid/feeds.py b/sid/feeds.py index 1b31b5c..466aaec 100644 --- a/sid/feeds.py +++ b/sid/feeds.py @@ -1,18 +1,6 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2011, 2014, 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2011, 2014, 2020 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later import datetime import threading diff --git a/sid/lib.py b/sid/lib.py index bc8fbed..9ebde96 100644 --- a/sid/lib.py +++ b/sid/lib.py @@ -1,18 +1,6 @@ # coding: utf-8 - -# Copyright (C) 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2020 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later import json import logging diff --git a/sid/log.py b/sid/log.py index 278be3d..1872c1b 100644 --- a/sid/log.py +++ b/sid/log.py @@ -1,18 +1,6 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2020 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later from datetime import datetime from os import fdopen diff --git a/sid/ping.py b/sid/ping.py index eea6576..a0463ea 100644 --- a/sid/ping.py +++ b/sid/ping.py @@ -1,18 +1,6 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2014, 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2014, 2020 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later from .plugin import Plugin, botcmd diff --git a/sid/plugin.py b/sid/plugin.py index efc9a14..3f4e7da 100644 --- a/sid/plugin.py +++ b/sid/plugin.py @@ -1,19 +1,6 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2010, 2011 Anaël Verrier -# Copyright (C) 2014, 2020 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2010, 2011 Anaël Verrier +# SPDX-FileCopyrightText: 2014, 2020 kaliko from .sid import botcmd diff --git a/sid/sid.py b/sid/sid.py index 3e6715a..7d2f4b7 100644 --- a/sid/sid.py +++ b/sid/sid.py @@ -1,20 +1,8 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2007-2012 Thomas Perl -# Copyright (C) 2010, 2011 Anaël Verrier -# Copyright (C) 2014, 2015, 2020, 2023 kaliko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 only. - -# 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2007-2012 Thomas Perl +# SPDX-FileCopyrightText: 2010, 2011 Anaël Verrier +# SPDX-FileCopyrightText: 2014, 2015, 2020, 2023 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later import inspect -- 2.39.2