Cleaning up header blocks, and making sure we use getLogger instead of creating a new one in each module

kepi/busby_1st/views/host_meta.py

@@ -1,9 +1,12 @@
-# views/host_meta.py
+# busby_1st/views/host_meta.py
 #
-# Part of kepi, an ActivityPub daemon.
-# Copyright (c) 2018-2019 Marnanel Thurman.
+# Part of kepi.
+# Copyright (c) 2018-2020 Marnanel Thurman.
 # Licensed under the GNU Public License v2.
 
+import logging
+logger = logging.getLogger(name='kepi')
+
 """
 Implements ".well-known/host-meta".
 See [https://tools.ietf.org/html/rfc6415](RFC 6415)
@@ -12,9 +15,6 @@ for the full details.
 
 import django.views
 from django.shortcuts import render
-import logging
-
-logger = logging.Logger('kepi')
 
 class HostMeta(django.views.View):
 

kepi/busby_1st/views/nodeinfo.py

@@ -1,9 +1,12 @@
-# views/nodeinfo.py
+# busby_1st/views/nodeinfo.py
 #
-# Part of kepi, an ActivityPub daemon.
-# Copyright (c) 2018-2019 Marnanel Thurman.
+# Part of kepi.
+# Copyright (c) 2018-2020 Marnanel Thurman.
 # Licensed under the GNU Public License v2.
 
+import logging
+logger = logging.getLogger(name='kepi')
+
 """
 Implements nodeinfo.
 See [http://nodeinfo.diaspora.software/protocol.html](Diaspora's site)
@@ -15,12 +18,9 @@ from django.conf import settings
 from django.shortcuts import render
 from django.http import HttpResponse
 from kepi import __version__
-import logging
 import re
 from kepi.bowler_pub.utils import as_json
 
-logger = logging.Logger('kepi')
-
 class NodeinfoPart1(django.views.View):
     """
     Nodeinfo support.

kepi/busby_1st/views/webfinger.py

@@ -1,9 +1,12 @@
 # busby_1st/views/webfinger.py
 #
-# Part of kepi, an ActivityPub daemon.
+# Part of kepi.
 # Copyright (c) 2018-2020 Marnanel Thurman.
 # Licensed under the GNU Public License v2.
 
+import logging
+logger = logging.getLogger(name='kepi')
+
 """
 Implements ".well-known/webfinger".
 See [https://tools.ietf.org/html/rfc7033](RFC 7033)
@@ -14,14 +17,11 @@ import django.views
 from django.conf import settings
 from django.shortcuts import render
 from django.http import HttpResponse
-import logging
 import re
 import json
 from kepi.bowler_pub.utils import as_json, configured_url
 import kepi.trilby_api.models as trilby_models
 
-logger = logging.Logger('kepi')
-
 class Webfinger(django.views.View):
     """
     RFC7033 webfinger support.

kepi/sombrero_sendpub/delivery.py

@@ -1,16 +1,13 @@
 # delivery.py
 #
-# Part of kepi, an ActivityPub daemon.
-# Copyright (c) 2018-2019 Marnanel Thurman.
+# Part of kepi.
+# Copyright (c) 2018-2020 Marnanel Thurman.
 # Licensed under the GNU Public License v2.
 
-"""
-This module contains deliver(), which delivers objects
-to their audiences.
-"""
+import logging
+logger = logging.getLogger(name='kepi')
 
 from celery import shared_task
-import logging
 import requests
 import json
 import httpsig
@@ -32,8 +29,6 @@ from httpsig.verify import HeaderVerifier
 from collections.abc import Iterable
 """ # FIXME
 
-logger = logging.getLogger(name='kepi')
-
 def _rfc822_datetime(when=None):
     """
     Formats a datetime to the RFC822 standard.

kepi/sombrero_sendpub/models.py

@@ -5,14 +5,14 @@
 # Licensed under the GNU Public License v2.
 
 import logging
+logger = logging.getLogger(name='kepi')
+
 from django.db import models
 from kepi.bowler_pub.utils import configured_url, as_json
 from django.db.models.constraints import UniqueConstraint
 import django.utils.timezone
 import json
 
-logger = logging.Logger("kepi")
-
 class OutgoingActivity(models.Model):
 
     content = models.TextField()

kepi/sombrero_sendpub/receivers.py

@@ -1,9 +1,15 @@
+# receivers.py
+#
+# Part of kepi.
+# Copyright (c) 2018-2020 Marnanel Thurman.
+# Licensed under the GNU Public License v2.
+
+import logging
+logger = logging.getLogger(name='kepi')
+
 import kepi.trilby_api.signals as kepi_signals
 from django.dispatch import receiver
 from kepi.sombrero_sendpub.delivery import deliver
-import logging
-
-logger = logging.Logger("kepi")
 
 @receiver(kepi_signals.followed)
 def on_follow(sender, **kwargs):

kepi/sombrero_sendpub/tests/test_send.py

@@ -4,6 +4,9 @@
 # Copyright (c) 2018-2020 Marnanel Thurman.
 # Licensed under the GNU Public License v2.
 
+import logging
+logger = logging.getLogger(name='kepi')
+
 from unittest import skip
 from django.test import TestCase
 from rest_framework.test import force_authenticate, APIClient
@@ -12,9 +15,6 @@ from kepi.sombrero_sendpub.delivery import deliver
 from kepi.trilby_api.models import RemotePerson
 from kepi.trilby_api.tests import create_local_person
 import httpretty
-import logging
-
-logger = logging.Logger("kepi")
 
 REMOTE_URL = 'https://remote.example.net/users/zachary'
 

kepi/sombrero_sendpub/tests/test_webfinger.py

@@ -4,15 +4,14 @@
 # Copyright (c) 2018-2020 Marnanel Thurman.
 # Licensed under the GNU Public License v2.
 
+import logging
+logger = logging.getLogger(name='kepi')
+
 from unittest import skip
 from django.test import TestCase
 from kepi.sombrero_sendpub.webfinger import get_webfinger
 from . import suppress_thread_exceptions
 import httpretty
-import logging
-import requests
-
-logger = logging.Logger("kepi")
 
 EXAMPLE_USERNAME = "wombat"
 EXAMPLE_HOSTNAME = "example.org"