Modernize file headers

.dir-locals.el

@@ -2,6 +2,17 @@
 ; A list of (major-mode . ((var1 . value1) (var2 . value2)))
 ; Mode can be nil, which gives default values.
 
-((nil . ((indent-tabs-mode . nil)
-         (c-basic-offset . 4)))
-)
+; NOTE: If you update this file make sure to update .editorconfig too.
+
+((c-mode . ((fill-column . 109)
+            (c-basic-offset . 8)
+            (eval . (c-set-offset 'substatement-open 0))
+            (eval . (c-set-offset 'statement-case-open 0))
+            (eval . (c-set-offset 'case-label 0))
+            (eval . (c-set-offset 'arglist-intro '++))
+            (eval . (c-set-offset 'arglist-close 0))
+            (eval . (c-set-offset 'arglist-cont-nonempty '(c-lineup-gcc-asm-reg c-lineup-arglist)))))
+ (meson-mode . ((meson-indent-basic . 8)))
+ (nil . ((indent-tabs-mode . nil)
+         (tab-width . 8)
+         (fill-column . 79))) )

.gitattributes

@@ -0,0 +1,2 @@
+*.[ch] whitespace=tab-in-indent,trailing-space
+*.py whitespace=tab-in-indent,trailing-space

Makefile

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 PYTHON = python
 SED = sed
 ETAGS = etags

docs/conf.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 # -*- coding: utf-8 -*-
 #
 # python-systemd documentation build configuration file, created by

docs/daemon.rst

@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: LGPL-2.1-or-later
+
 `systemd.daemon` module
 =======================
 

docs/id128.rst

@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: LGPL-2.1-or-later
+
 `systemd.id128` module
 ======================
 

docs/index.rst

@@ -1,7 +1,7 @@
-.. python-systemd documentation master file, created by
+.. SPDX-License-Identifier: LGPL-2.1-or-later
+
+.. python-systemd documentation main file, created by
    sphinx-quickstart on Sat Feb  9 13:49:42 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
 
 .. _index:
 

docs/journal.rst

@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: LGPL-2.1-or-later
+
 `systemd.journal` module
 ========================
 

docs/login.rst

@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: LGPL-2.1-or-later
+
 `systemd.login` module
 =======================
 

meson.build

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 project(
         'python-systemd',
         'c',
@@ -18,5 +20,4 @@ common_c_args = [
         '-DLIBSYSTEMD_VERSION=@0@'.format(libsystemd_dep.version()),
 ]
 
-subdir('src')
-
+subdir('src/systemd')

pyproject.toml

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 [project]
 name = "systemd-python"
 dynamic = ["version"]

src/systemd/.gitattributes

@@ -0,0 +1,2 @@
+id128-constants.h generated
+id128-defines.h generated

src/systemd/__init__.py

@@ -1,17 +1,3 @@
-#  -*- Mode: python; indent-tabs-mode: nil -*- */
-#
+# SPDX-License-Identifier: LGPL-2.1-or-later
 #
 #  Copyright 2012 David Strauss
-#
-#  python-systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  python-systemd 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
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.

src/systemd/_daemon.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2013-2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #define PY_SSIZE_T_CLEAN

src/systemd/_journal.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2012 David Strauss <david@davidstrauss.net>
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <Python.h>

src/systemd/_reader.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2013 Steven Hiscocks, Zbigniew Jędrzejewski-Szmek
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #define PY_SSIZE_T_CLEAN

src/systemd/daemon.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 from socket import AF_UNSPEC as _AF_UNSPEC
 
 from ._daemon import (__version__,

src/systemd/id128.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <Python.h>

src/systemd/journal.py

@@ -1,24 +1,8 @@
-#  -*- Mode: python; coding:utf-8; indent-tabs-mode: nil -*- */
-#
+# SPDX-License-Identifier: LGPL-2.1-or-later
 #
 #  Copyright 2012 David Strauss <david@davidstrauss.net>
 #  Copyright 2012 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
 #  Copyright 2012 Marti Raudsepp <marti@juffo.org>
-#
-#  python-systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  python-systemd 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
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import division
 
 import sys as _sys
 import datetime as _datetime
@@ -480,7 +464,6 @@ def stream(identifier=None, priority=LOG_INFO, level_prefix=False):
 
     This interface can be used conveniently with the print function:
 
-    >>> from __future__ import print_function
     >>> stream = journal.stream()                              # doctest: +SKIP
     >>> print('message...', file=stream)                       # doctest: +SKIP
 

src/systemd/login.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #define PY_SSIZE_T_CLEAN

src/systemd/macro.h

@@ -1,23 +1,9 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #pragma once
 
 /***
-
   Copyright 2010 Lennart Poettering
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #define DISABLE_WARNING_MISSING_PROTOTYPES                              \

src/systemd/meson.build

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 # Build _journal extension module
 python.extension_module(
         '_journal',
@@ -49,7 +51,12 @@ python.extension_module(
 )
 
 # Install Python modules
-python.install_sources('__init__.py', 'journal.py', 'daemon.py', subdir: 'systemd')
+python.install_sources(
+        '__init__.py',
+        'journal.py',
+        'daemon.py',
+        subdir: 'systemd',
+)
 
 # Install test modules
 python.install_sources(

src/systemd/pyutil.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <Python.h>

src/systemd/pyutil.h

@@ -1,23 +1,9 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #pragma once
 
 /***
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifndef Py_TYPE

src/systemd/strv.c

@@ -1,21 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 /***
-
   Copyright 2010 Lennart Poettering
-
-  python-systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  python-systemd 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <stdlib.h>